jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #2385

Browse Source
This commit is contained in:
r888888888
2015-05-21 12:45:09 -07:00
parent 82fb3bd109
commit 622f12cfec
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/uploads.js
View File

@@ -46,7 +46,11 @@
Danbooru.Upload.initialize_info_bookmarklet = function() {
$("#source-info ul").hide();
$("#fetch-data-bookmarklet").click(function(e) {
$.get(e.target.href).success(Danbooru.Upload.fill_source_info);
var xhr = $.get(e.target.href);
xhr.success(Danbooru.Upload.fill_source_info);
xhr.fail(function(data) {
$("#source-info span#loading-data").html("Error: " + data.responseJSON["message"])
});
e.preventDefault();
});
$("#fetch-data-bookmarklet").trigger("click");
@@ -63,7 +67,11 @@
Danbooru.error("Error: Source is not a URL");
} else {
$("#source-info span#loading-data").show();
$.get("/source.json?url=" + encodeURIComponent(source)).success(Danbooru.Upload.fill_source_info);
var xhr = $.get("/source.json?url=" + encodeURIComponent(source));
xhr.success(Danbooru.Upload.fill_source_info);
xhr.fail(function(data) {
$("#source-info span#loading-data").html("Error: " + data.responseJSON["message"])
});
}
e.preventDefault();
});

10
app/controllers/sources_controller.rb
View File

@@ -12,4 +12,14 @@ class SourcesController < ApplicationController
end
end
end
private
def rescue_exception(exception)
respond_with do |format|
format.json do
render :json => {:message => exception.to_s}, :status => :error
end
end
end
end