diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index b7e1aa757..b84b15d43 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -341,13 +341,16 @@ $("#image-resize-link").click(function(e) { var $link = $(e.target); var $image = $("#image"); - $image.removeAttr("src"); - $image.attr("src", "https://www.google.com") $image.attr("src", $link.attr("href")); + $image.css("opacity", "0.25"); $image.width($image.data("original-width")); $image.height($image.data("original-height")); + $image.on("load", function() { + $image.css("opacity", "1"); + $("#image-resize-notice").hide(); + }); + $("#image-resize-notice").html("Loading..."); Danbooru.Note.Box.scale_all(); - $("#image-resize-notice").hide(); $image.data("scale_factor", 1); e.preventDefault(); }); diff --git a/app/views/explore/posts/intro.html.erb b/app/views/explore/posts/intro.html.erb index 52b33da98..d2308f757 100644 --- a/app/views/explore/posts/intro.html.erb +++ b/app/views/explore/posts/intro.html.erb @@ -12,12 +12,14 @@

Type in your favorite anime, manga, or character (last name first). Here are some examples:

- <% @presenter.each do |tag, post_set| %> -
-

<%= link_to tag, posts_path(:tags => tag) %>

- <%= post_set.presenter.post_previews_html(self) %> -
-
+ <% cache("intro-page", :expires_in => 1.hour) do %> + <% @presenter.each do |tag, post_set| %> +
+

<%= link_to tag, posts_path(:tags => tag) %>

+ <%= post_set.presenter.post_previews_html(self) %> +
+
+ <% end %> <% end %> diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index 01f619052..cd6da364c 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -4,7 +4,7 @@ module Danbooru class Configuration # The version of this Danbooru. def version - "2.23.0" + "2.23.1" end # The name of this Danbooru.