diff --git a/app/controllers/sources_controller.rb b/app/controllers/sources_controller.rb index a452134e3..91c5b2c9b 100644 --- a/app/controllers/sources_controller.rb +++ b/app/controllers/sources_controller.rb @@ -1,5 +1,5 @@ class SourcesController < ApplicationController - respond_to :json, :xml + respond_to :js, :json, :xml def show @source = Sources::Strategies.find(params[:url], params[:ref]) diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index d42e1e7da..b0332e120 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -40,6 +40,7 @@ export { default as PostModeMenu } from '../src/javascripts/post_mode_menu.js'; export { default as PostTooltip } from '../src/javascripts/post_tooltips.js'; export { default as RelatedTag } from '../src/javascripts/related_tag.js.erb'; export { default as Shortcuts } from '../src/javascripts/shortcuts.js'; +export { default as Upload } from '../src/javascripts/uploads.js'; export { default as Utility } from '../src/javascripts/utility.js'; export { default as Ugoira } from '../src/javascripts/ugoira.js'; diff --git a/app/javascript/src/javascripts/uploads.js b/app/javascript/src/javascripts/uploads.js index 4d1664061..087d0ca25 100644 --- a/app/javascript/src/javascripts/uploads.js +++ b/app/javascript/src/javascripts/uploads.js @@ -1,12 +1,11 @@ import Post from './posts.js.erb' -import RelatedTag from './related_tag.js.erb' let Upload = {}; Upload.initialize_all = function() { if ($("#c-uploads,#c-posts").length) { this.initialize_enter_on_tags(); - this.initialize_info_manual(); + $(document).on("click.danbooru", "#fetch-data-manual", Upload.fetch_data_manual); } if ($("#c-uploads").length) { @@ -79,80 +78,10 @@ Upload.initialize_similar = function() { } Upload.initialize_info_bookmarklet = function() { - $("#upload_source").on("change.danbooru", function (e) { - $("#fetch-data-manual").click(); - }); - + $("#upload_source").on("change.danbooru", Upload.fetch_data_manual); $("#fetch-data-manual").click(); } -Upload.initialize_info_manual = function() { - $("#fetch-data-manual").on("click.danbooru", function(e) { - var source = $("#upload_source,#post_source").val(); - var referer = $("#upload_referer_url").val(); - - if (/^https?:\/\//.test(source)) { - $("#source-info span#loading-data").show(); - Upload.fetch_source_data(source, referer); - } - - e.preventDefault(); - }); -} - -Upload.fetch_source_data = function(url, referer_url) { - return $.getJSON("/source.json", { url: url, ref: referer_url }) - .then(Upload.fill_source_info) - .catch(function(data) { - $("#source-info span#loading-data").html("Error: " + data.responseJSON.message) - }); -} - -Upload.fill_source_info = function(data) { - $("#source-tags").empty(); - $.each(data.tags, function(i, v) { - $("").attr("href", v[1]).text(v[0]).appendTo("#source-tags"); - }); - - $("#source-artist-profile").attr("href", data.profile_url).text(data.artist_name); - - RelatedTag.process_artist(data.artists); - RelatedTag.translated_tags = data.translated_tags; - RelatedTag.build_all(); - - if (data.artists.length === 0) { - var new_artist_params = $.param({ - artist: { - name: data.unique_id, - other_names: data.artist_name, - url_string: $.uniqueSort([data.profile_url, data.normalized_for_artist_finder_url]).join("\n") - } - }); - - var link = $("").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 $('').attr("href", "/artists/" + artist.id).text(artist.name); - }); - - $("#source-danbooru-artists").html(artistLinks) - } - - if (data.image_urls.length > 1) { - $("#gallery-warning").show(); - } else { - $("#gallery-warning").hide(); - } - - $("#upload_artist_commentary_title").val(data.artist_commentary.dtext_title); - $("#upload_artist_commentary_desc").val(data.artist_commentary.dtext_description); - Upload.toggle_commentary(); - - $("#source-info span#loading-data").hide(); - $("#source-info ul").show(); -} - Upload.update_scale = function() { var $image = $("#image"); var ratio = $image.data("scale-factor"); @@ -163,6 +92,18 @@ Upload.update_scale = function() { } } +Upload.fetch_data_manual = function(e) { + var url = $("#upload_source,#post_source").val(); + var ref = $("#upload_referer_url").val(); + + if (/^https?:\/\//.test(url)) { + $("#source-info").addClass("loading"); + $.get("/source.js", { url: url, ref: ref }).always(resp => $("#source-info").removeClass("loading")); + } + + e.preventDefault(); +} + Upload.initialize_image = function() { var $image = $("#image"); if (!$image.length) { diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss index e82b222ba..35d8ac5c9 100644 --- a/app/javascript/src/styles/specific/posts.scss +++ b/app/javascript/src/styles/specific/posts.scss @@ -445,18 +445,20 @@ div#c-posts, div#c-uploads { padding: 1em; border: 1px solid #666; - p { - margin: 0; + &:not(.loading) #source-info-loading { display: none; } + &.loading #source-info-content { display: none; } + &.loading #fetch-data-manual { display: none; } + + ul { + display: inline-block; } - > ul { - display: none; + dt, dd, li { + display: inline; + } - .source-tags { - a { - margin-right: 1em; - } - } + dt, #source-info-tags li { + margin-right: 1em; } } } diff --git a/app/views/sources/_info.html.erb b/app/views/sources/_info.html.erb index 8dfb9ed0f..da23706df 100644 --- a/app/views/sources/_info.html.erb +++ b/app/views/sources/_info.html.erb @@ -1,11 +1,50 @@ -
-

<%= link_to "Fetch source data", source_path(:format => "json"), :id => "fetch-data-manual" %>

-

<%= content_tag "span", "Loading source data...", :id => "loading-data", :style => "display: none;" %>

- - +<%# source %> - +
+ <%= link_to "Fetch source data", source_path, id: "fetch-data-manual" %> + + + <% if @source.present? %> +
+
+
Artist
+
+ <% if @source.artist_name.blank? %> + None + <% else %> + <%= link_to @source.artist_name, @source.profile_url, id: "source-info-artist-profile" %> + + <% if @source.artists.empty? %> + (<%= link_to "Create new artist", new_artist_path(artist: { name: @source.unique_id, other_names: @source.artist_name, url_string: [@source.profile_url, @source.normalize_for_artist_finder].uniq.sort.join("\n") }), id: "source-info-create-new-artist" %>) + <% else %> + (
    + <% @source.artists.each do |artist| %> +
  • <%= link_to artist.name, artist_path(artist), class: "tag-type-#{artist.category_name}" %>
    • + <% end %> +
) + <% end %> + <% end %> +
+
+ +
+
Tags
+
+ <% if @source.tags.empty? %> + None + <% else %> +
    + <% @source.tags.each do |tag, href| %> +
  • <%= link_to tag, href, rel: :nofollow %>
    • + <% end %> +
+ + <% if @source.image_urls.length > 1 %> + + <% end %> + <% end %> +
+ +
+ <% end %>
diff --git a/app/views/sources/show.js.erb b/app/views/sources/show.js.erb new file mode 100644 index 000000000..518fa65ca --- /dev/null +++ b/app/views/sources/show.js.erb @@ -0,0 +1,11 @@ +$("#source-info").replaceWith("<%= j render "info", source: @source %>"); + +Danbooru.RelatedTag.recent_artists = <%= raw @source.artists.to_json(include: :sorted_urls) %>; +Danbooru.RelatedTag.translated_tags = <%= raw @source.translated_tags.to_json %>; +Danbooru.RelatedTag.build_all(); + +if ($("#c-uploads #a-new").length) { + $("#upload_artist_commentary_title").val(<%= raw @source.dtext_artist_commentary_title.to_json %>); + $("#upload_artist_commentary_desc").val(<%= raw @source.dtext_artist_commentary_desc.to_json %>); + Danbooru.Upload.toggle_commentary(); +}