Merge branch 'master' of https://github.com/r888888888/danbooru

2013-07-05 10:33:59 -04:00
parent afdc61c31a 423c1991db
commit 1b077dbc02
18 changed files with 133 additions and 30 deletions
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -341,9 +341,11 @@
    $("#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.width($image.data("original-width"));
-      $image.height($image.data("original-height"));
+      $image.height($image.data("original-height"));        
      Danbooru.Note.Box.scale_all();
      $("#image-resize-notice").hide();
      $image.data("scale_factor", 1);