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

Merge pull request #3373 from evazion/fix-3368

Browse Source 
Fix #3368: "Fetch source data" on /uploads/new doesn't fetch artist tag
This commit is contained in:
Albert Yi
2017-11-15 10:58:52 -08:00
committed by GitHub
parent f34d09a465 514d4f9c2e
commit 18c8892a74
10 changed files with 83 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,6 @@
this.initialize_similar();
this.initialize_shortcuts();
$("#related-tags-button").trigger("click");
$("#find-artist-button").trigger("click");
$("#toggle-artist-commentary").click(function(e) {
Danbooru.Upload.toggle_commentary();
@@ -59,56 +58,66 @@
}
Danbooru.Upload.initialize_info_bookmarklet = function() {
$("#source-info ul").hide();
$("#fetch-data-bookmarklet").click(function(e) {
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();
$("#upload_source").change(function (e) {
$("#fetch-data-manual").click();
});
$("#fetch-data-bookmarklet").trigger("click");
$("#fetch-data-manual").click();
}
Danbooru.Upload.initialize_info_manual = function() {
$("#source-info ul").hide();
$("#fetch-data-manual").click(function(e) {
var source = $("#upload_source,#post_source").val();
if (!/\S/.test(source)) {
Danbooru.error("Error: You must enter a URL into the source field to get its data");
} else if (!/^https?:\/\//.test(source)) {
Danbooru.error("Error: Source is not a URL");
} else {
var referer = $("#upload_referer_url").val();
if (/^https?:\/\//.test(source)) {
$("#source-info span#loading-data").show();
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"])
});
Danbooru.Upload.fetch_source_data(source, referer);
}
e.preventDefault();
});
}
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;
}
Danbooru.Upload.fill_source_info = function(data) {
$("#source-tags").empty();
$.each(data.tags, function(i, v) {
$("<a>").attr("href", v[1]).text(v[0]).appendTo("#source-tags");
});
$("#source-artist").html($("<a>").attr("href", data.profile_url).text(data.artist_name));
$("#source-artist-profile").attr("href", data.profile_url).text(data.artist_name);
Danbooru.RelatedTag.process_artist(data.artists);
Danbooru.RelatedTag.translated_tags = data.translated_tags;
Danbooru.RelatedTag.build_all();
var new_artist_href = "/artists/new?other_names="
+ encodeURIComponent(data.artist_name)
+ "&urls="
+ encodeURIComponent($.unique([data.profile_url, data.normalized_for_artist_finder_url]).join("\n"));
if (data.artists.length === 0) {
var new_artist_params = $.param({
name: data.unique_id,
other_names: data.artist_name,
urls: $.unique([data.profile_url, data.normalized_for_artist_finder_url]).join("\n")
});
$("#source-record").html($("<a>").attr("href", new_artist_href).text("Create New"));
var link = $("<a>").attr("href", "/artists/new?" + new_artist_params).text("Create new artist");
$("#source-danbooru-artists").html(link);
} else {
var artistLinks = data.artists.map(function (artist) {
return $('<a class="tag-type-1">').attr("href", "/artists/" + artist.id).text(artist.name);
});
$("#source-danbooru-artists").html(artistLinks)
}
if (data.image_urls.length > 1) {
$("#gallery-warning").show();