From 250970a4b8e5ba9324371c7c89e87ae3049ab51f Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Wed, 11 Nov 2015 02:48:16 -0500
Subject: [PATCH] Fix images being scaled incorrectly at low screen widths

fixes #2548
---
 app/assets/javascripts/posts.js               | 28 ++++++++++---------
 .../stylesheets/common/responsive.css.scss    |  4 ---
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js
index d279e3894..128f48081 100644
--- a/app/assets/javascripts/posts.js
+++ b/app/assets/javascripts/posts.js
@@ -323,7 +323,7 @@
       $notice.children().eq(0).hide();
       $notice.children().eq(1).show(); // Loading message
       Danbooru.Note.Box.scale_all();
-      $image.data("scale_factor", 1);
+      $image.data("scale-factor", 1);
       e.preventDefault();
     });
 
@@ -345,7 +345,7 @@
             $notice.show();
           });
           Danbooru.Note.Box.scale_all();
-          $image.data("scale_factor", 1);
+          $image.data("scale-factor", 1);
           e.preventDefault();
         }
       });
@@ -356,23 +356,25 @@
     $("#image-resize-to-window-link").click(function(e) {
       var $img = $("#image");
 
-      if (($img.data("scale_factor") === 1) || ($img.data("scale_factor") === undefined)) {
-        $img.data("original_width", $img.width());
-        $img.data("original_height", $img.height());
-        var client_width = $(window).width() - $("#sidebar").width() - 75;
+      if (($img.data("scale-factor") === 1) || ($img.data("scale-factor") === undefined)) {
+        if ($(window).width() > 660) {
+          var client_width = $(window).width() - $("#sidebar").width() - 75;
+        } else {
+          var client_width = $(window).width() - 30;
+        }
         var client_height = $(window).height();
 
         if ($img.width() > client_width) {
-          var ratio = client_width / $img.width();
-          $img.data("scale_factor", ratio);
-          $img.css("width", $img.data("original_width") * ratio);
-          $img.css("height", $img.data("original_height") * ratio);
+          var ratio = client_width / $img.data("original-width");
+          $img.data("scale-factor", ratio);
+          $img.css("width", $img.data("original-width") * ratio);
+          $img.css("height", $img.data("original-height") * ratio);
           Danbooru.Post.resize_ugoira_controls();
         }
       } else {
-        $img.data("scale_factor", 1);
-        $img.width($img.data("original_width"));
-        $img.height($img.data("original_height"));
+        $img.data("scale-factor", 1);
+        $img.width($img.data("original-width"));
+        $img.height($img.data("original-height"));
         Danbooru.Post.resize_ugoira_controls();
       }
 
diff --git a/app/assets/stylesheets/common/responsive.css.scss b/app/assets/stylesheets/common/responsive.css.scss
index 6f3f796ef..6af9ce529 100644
--- a/app/assets/stylesheets/common/responsive.css.scss
+++ b/app/assets/stylesheets/common/responsive.css.scss
@@ -175,10 +175,6 @@
     display: block;
   }
 
-  #image {
-    max-width: 400px;
-  }
-
   body {
     width: 100%;
   }