From 89695f1e183109b8ec6334aee3f9a68fdbdc31c6 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 5 Jul 2013 19:40:05 -0700 Subject: [PATCH 1/6] cache intro page --- app/views/explore/posts/intro.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 %> From 64a873add58185fa587deb3e91c23b6ec3040072 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 5 Jul 2013 19:41:57 -0700 Subject: [PATCH 2/6] potential fix for #1818 --- app/assets/javascripts/posts.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index b7e1aa757..ddd0cac64 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -341,8 +341,7 @@ $("#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", "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==") $image.attr("src", $link.attr("href")); $image.width($image.data("original-width")); $image.height($image.data("original-height")); From 73588fca41b7293f1c082b121a86b0e2dfd8e0b6 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 5 Jul 2013 19:49:51 -0700 Subject: [PATCH 3/6] potential fix for #1818 --- app/assets/javascripts/posts.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index ddd0cac64..a45007c88 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -341,10 +341,13 @@ $("#image-resize-link").click(function(e) { var $link = $(e.target); var $image = $("#image"); - $image.attr("src", "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==") $image.attr("src", $link.attr("href")); + $image.css("opacity", "50%"); $image.width($image.data("original-width")); $image.height($image.data("original-height")); + $image.on("load", function() { + $image.css("opacity", "100%"); + }) Danbooru.Note.Box.scale_all(); $("#image-resize-notice").hide(); $image.data("scale_factor", 1); From 364b256300dbb570ea735f3cb59a386ea92c7b7d Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 5 Jul 2013 19:52:38 -0700 Subject: [PATCH 4/6] potential fix for #1818 --- app/assets/javascripts/posts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index a45007c88..d9d118228 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -342,11 +342,11 @@ var $link = $(e.target); var $image = $("#image"); $image.attr("src", $link.attr("href")); - $image.css("opacity", "50%"); + $image.css("opacity", "0.25"); $image.width($image.data("original-width")); $image.height($image.data("original-height")); $image.on("load", function() { - $image.css("opacity", "100%"); + $image.css("opacity", "1"); }) Danbooru.Note.Box.scale_all(); $("#image-resize-notice").hide(); From 054ec63634d451f08a2237f51a1ddcbb904eef1f Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 5 Jul 2013 19:55:33 -0700 Subject: [PATCH 5/6] potential fix for #1818 --- app/assets/javascripts/posts.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index d9d118228..b84b15d43 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -347,9 +347,10 @@ $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(); }); From 5342555cd837a9a1bb0dac74cd99f239718e871b Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 5 Jul 2013 19:58:48 -0700 Subject: [PATCH 6/6] update version --- config/danbooru_default_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.