This is an automated email from the ASF dual-hosted git repository. gcruz pushed a commit to branch gc/8449 in repository https://gitbox.apache.org/repos/asf/allura.git
commit 94d642535153f53e9dbb8eb0a4607f74d91817ec Author: Guillermo Cruz <[email protected]> AuthorDate: Fri Aug 5 10:38:35 2022 -0600 Revert "[#8449] updated $.ajax method names" This reverts commit 6abe3e70d03f9a519a98ff3e08368c64554dadd0. --- Allura/allura/lib/widgets/form_fields.py | 4 ++-- Allura/allura/lib/widgets/resources/js/post.js | 8 ++++---- Allura/allura/lib/widgets/resources/js/reactions.js | 2 +- Allura/allura/lib/widgets/resources/js/vote.js | 2 +- Allura/allura/public/nf/js/allura-base.js | 2 +- Allura/allura/public/nf/js/navbar.es6.js | 4 ++-- Allura/allura/templates/app_admin_permissions.html | 2 +- Allura/allura/templates/jinja_master/master.html | 1 + Allura/allura/templates/site_admin_site_notifications_list.html | 2 +- .../forgefeedback/templates/feedback/common_feedback.html | 2 +- ForgeTracker/forgetracker/tracker_main.py | 4 ++-- ForgeWiki/forgewiki/templates/wiki/page_edit.html | 4 ++-- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py index ab83cd558..c1a73d30a 100644 --- a/Allura/allura/lib/widgets/form_fields.py +++ b/Allura/allura/lib/widgets/form_fields.py @@ -134,7 +134,7 @@ class ProjectUserSelect(ew.InputField): data: { term: request.term }, - done: function (data) { + success: function (data) { response(data.users); } }); @@ -198,7 +198,7 @@ class NeighborhoodProjectSelect(ew.InputField): data: { term: request.term }, - done: function (data) { + success: function (data) { response(data.projects); } }); diff --git a/Allura/allura/lib/widgets/resources/js/post.js b/Allura/allura/lib/widgets/resources/js/post.js index 1ca75c063..1da44aa7d 100644 --- a/Allura/allura/lib/widgets/resources/js/post.js +++ b/Allura/allura/lib/widgets/resources/js/post.js @@ -37,7 +37,7 @@ type: 'POST', url: this.parentNode.action, data: jQuery(this.parentNode).serialize(), - done: function() { + success: function() { if (mod === 'Delete'){ $(post).remove(); } @@ -52,7 +52,7 @@ spam_block_display($(post), 'hide_spam'); } }, - fail: function() { + error: function() { flash('Oops, something went wrong.', 'error') }, }); @@ -70,7 +70,7 @@ perm: 'post', '_session_id': cval }, - done: function (data, textStatus, jqxhr) { + success: function (data, textStatus, jqxhr) { if (data.error) { flash(data.error, 'error'); } else if (data.username) { @@ -84,7 +84,7 @@ flash('Error. Make sure you are logged in still.', 'error'); } }, - fail: function() { + error: function() { flash('Oops, something went wrong.', 'error') }, }); diff --git a/Allura/allura/lib/widgets/resources/js/reactions.js b/Allura/allura/lib/widgets/resources/js/reactions.js index d884f07a9..b45aad047 100644 --- a/Allura/allura/lib/widgets/resources/js/reactions.js +++ b/Allura/allura/lib/widgets/resources/js/reactions.js @@ -93,7 +93,7 @@ function reactComment(btn, r) { 'r': r, '_session_id': $.cookie('_session_id') }, - done: function (res) { + success: function (res) { var react_html = ''; for (var i in res.counts) { diff --git a/Allura/allura/lib/widgets/resources/js/vote.js b/Allura/allura/lib/widgets/resources/js/vote.js index 1c8492c57..282624a1a 100644 --- a/Allura/allura/lib/widgets/resources/js/vote.js +++ b/Allura/allura/lib/widgets/resources/js/vote.js @@ -30,7 +30,7 @@ $(document).ready(function() { vote: vote, _session_id: _session_id }, - done: function(data) { + success: function(data) { if (data.status == 'ok') { $('#vote .votes-up').text(data.votes_up); $('#vote .votes-down').text(data.votes_down); diff --git a/Allura/allura/public/nf/js/allura-base.js b/Allura/allura/public/nf/js/allura-base.js index 8997a745c..6d0171eb6 100644 --- a/Allura/allura/public/nf/js/allura-base.js +++ b/Allura/allura/public/nf/js/allura-base.js @@ -260,7 +260,7 @@ $(function(){ 'text' : markdown, '_session_id' : $.cookie('_session_id') }, - done: callback + success: callback }); }); }); diff --git a/Allura/allura/public/nf/js/navbar.es6.js b/Allura/allura/public/nf/js/navbar.es6.js index 2de217cc1..5a5f3e15b 100644 --- a/Allura/allura/public/nf/js/navbar.es6.js +++ b/Allura/allura/public/nf/js/navbar.es6.js @@ -522,7 +522,7 @@ var Main = React.createClass({ type: 'POST', url: url, data: params, - done: function() { + success: function() { $('#messages').notify('Tool order updated', { status: 'confirm', @@ -532,7 +532,7 @@ var Main = React.createClass({ _this.getNavJson(); }, - fail: function() { + error: function() { $('#messages').notify('Error saving tool order.', { status: 'error' diff --git a/Allura/allura/templates/app_admin_permissions.html b/Allura/allura/templates/app_admin_permissions.html index 6a4ae5334..7433edec4 100644 --- a/Allura/allura/templates/app_admin_permissions.html +++ b/Allura/allura/templates/app_admin_permissions.html @@ -130,7 +130,7 @@ data: form.serialize(), type: form.attr('method'), url: form.attr('action'), - done: callback + success: callback }); return false; }); diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html index d78839a83..0e3149ba0 100644 --- a/Allura/allura/templates/jinja_master/master.html +++ b/Allura/allura/templates/jinja_master/master.html @@ -22,6 +22,7 @@ {% if g.theme.jinja_macros %} {% import g.theme.jinja_macros as theme_macros with context %} {% endif %} +{ {% do g.register_forge_js('js/jquery-3.6.0.min.js', location='head_js') %} {% do g.register_forge_js('js/jquery-migrate-3.4.0.js', location='head_js') %} {% do g.register_forge_js('js/jquery.cookie-1.4.1.js', location='head_js') %} diff --git a/Allura/allura/templates/site_admin_site_notifications_list.html b/Allura/allura/templates/site_admin_site_notifications_list.html index 9e4ba1005..b289c355c 100644 --- a/Allura/allura/templates/site_admin_site_notifications_list.html +++ b/Allura/allura/templates/site_admin_site_notifications_list.html @@ -83,7 +83,7 @@ data: { '_session_id': $.cookie('_session_id') }, - done: function(data) { + success: function(data) { $(elem).parent().parent().remove(); } }); diff --git a/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html b/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html index 2d28abeda..6bd6634a2 100755 --- a/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html +++ b/ForgeFeedback/forgefeedback/templates/feedback/common_feedback.html @@ -69,7 +69,7 @@ function manage() url:'{{url}}feedback_check', type:'GET', data: {'description':description}, - done: function(status){ + success: function(status){ if (status == 'true'){ $('#button').attr('disabled', true); $('#status_msg').show(); diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py index ff3ba311a..9a49feca7 100644 --- a/ForgeTracker/forgetracker/tracker_main.py +++ b/ForgeTracker/forgetracker/tracker_main.py @@ -399,7 +399,7 @@ class ForgeTrackerApp(Application): $(function() { $.ajax({ url:'%(app_url)sbin_counts', - done: function(data) { + success: function(data) { var $spans = $('.search_bin > span'); $.each(data.bin_counts, function(i, item) { $spans.each(function() { @@ -413,7 +413,7 @@ class ForgeTrackerApp(Application): if ($('.milestones').length > 0) { $.ajax({ url: '%(app_url)smilestone_counts', - done: function(data) { + success: function(data) { var $spans = $('.milestones > span'); $.each(data.milestone_counts, function(i, item) { $spans.each(function() { diff --git a/ForgeWiki/forgewiki/templates/wiki/page_edit.html b/ForgeWiki/forgewiki/templates/wiki/page_edit.html index 07cb4af64..b14caba76 100644 --- a/ForgeWiki/forgewiki/templates/wiki/page_edit.html +++ b/ForgeWiki/forgewiki/templates/wiki/page_edit.html @@ -147,7 +147,7 @@ data: new FormData($('#attachment_form')[0]), processData: false, contentType: false, - done: function() { + success: function() { var i; for (i = 0; i < $("#file_info")[0].files.length; i++){ var attachment_name = $("#file_info")[0].files[i].name; @@ -166,7 +166,7 @@ type: "POST", url: attr_url, data: elem.serialize() +"&_session_id=" + $.cookie('_session_id'), - done: function() {; + success: function() {; elem.parent().remove(); } });
