From a49cb1c105c933d882c4a1104f0ba3a878acf285 Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 26 Apr 2018 23:53:49 -0500 Subject: [PATCH] jquery: fix obsolete uses of `success` (#3548). --- app/assets/javascripts/artist_commentaries.js | 4 ++-- app/assets/javascripts/autocomplete.js.erb | 2 +- app/assets/javascripts/notes.js | 4 ++-- app/assets/javascripts/posts.js | 2 +- app/assets/javascripts/uploads.js | 13 +++++-------- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/artist_commentaries.js b/app/assets/javascripts/artist_commentaries.js index 472fbdc51..9e17bfb40 100644 --- a/app/assets/javascripts/artist_commentaries.js +++ b/app/assets/javascripts/artist_commentaries.js @@ -73,10 +73,10 @@ var commentary = Danbooru.ArtistCommentary.from_post_id(id); } - commentary.then(Danbooru.ArtistCommentary.fill_commentary).done(function (success) { + commentary.then(Danbooru.ArtistCommentary.fill_commentary).then(function (success) { var message = success ? "Artist commentary copied." : "Artist commentary copied; conflicting fields ignored."; Danbooru.notice(message); - }).fail(function () { + }).catch(function () { Danbooru.notice("Fetching artist commentary failed."); }); diff --git a/app/assets/javascripts/autocomplete.js.erb b/app/assets/javascripts/autocomplete.js.erb index 159dea0ef..b8051a7ce 100644 --- a/app/assets/javascripts/autocomplete.js.erb +++ b/app/assets/javascripts/autocomplete.js.erb @@ -530,7 +530,7 @@ } Danbooru.Autocomplete.saved_search_source = function(term, resp) { - return Danbooru.SavedSearch.labels(term).success(function(labels) { + return Danbooru.SavedSearch.labels(term).then(function(labels) { resp(labels.map(function(label) { return { label: label.replace(/_/g, " "), diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 42a848a02..a16c4f1e1 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -485,7 +485,7 @@ Danbooru.Note = { var text = $textarea.val(); $note_body.data("original-body", text); Danbooru.Note.Body.set_text($note_body, $note_box, "Loading..."); - $.get("/note_previews.json", {body: text}).success(function(data) { + $.get("/note_previews.json", {body: text}).then(function(data) { Danbooru.Note.Body.set_text($note_body, $note_box, data.body); Danbooru.Note.Box.resize_inner_border($note_box); $note_body.show(); @@ -518,7 +518,7 @@ Danbooru.Note = { var $note_box = Danbooru.Note.Box.find(id); $note_box.find(".note-box-inner-border").addClass("unsaved"); Danbooru.Note.Body.set_text($note_body, $note_box, "Loading..."); - $.get("/note_previews.json", {body: text}).success(function(data) { + $.get("/note_previews.json", {body: text}).then(function(data) { Danbooru.Note.Body.set_text($note_body, $note_box, data.body); $note_body.show(); }); diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 8413f4cd1..80de085cb 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -577,7 +577,7 @@ Danbooru.Post.initialize_saved_searches = function() { $("#saved_search_labels").autocomplete({ source: function(req, resp) { - Danbooru.SavedSearch.labels(req.term).success(function(labels) { + Danbooru.SavedSearch.labels(req.term).then(function(labels) { resp(labels.map(function(label) { return { label: label.replace(/_/g, " "), diff --git a/app/assets/javascripts/uploads.js b/app/assets/javascripts/uploads.js index 1df58ffb6..89f081b9e 100644 --- a/app/assets/javascripts/uploads.js +++ b/app/assets/javascripts/uploads.js @@ -101,14 +101,11 @@ } Danbooru.Upload.fetch_source_data = function(url, referer_url) { - var xhr = $.getJSON("/source.json", { url: url, ref: referer_url }); - - xhr.success(Danbooru.Upload.fill_source_info); - xhr.fail(function(data) { - $("#source-info span#loading-data").html("Error: " + data.responseJSON["message"]) - }); - - return xhr; + return $.getJSON("/source.json", { url: url, ref: referer_url }) + .then(Danbooru.Upload.fill_source_info) + .catch(function(data) { + $("#source-info span#loading-data").html("Error: " + data.responseJSON["message"]) + }); } Danbooru.Upload.fill_source_info = function(data) {