g5 merge 충돌 수정

2013-12-13 09:33:11 +09:00
parent b81c9089d6 6a344d1438
commit 791fb64d25
5 changed files with 51 additions and 36 deletions
--- a/js/viewimageresize.js
+++ b/js/viewimageresize.js
@ -21,16 +21,20 @@
            var width = $this.width();

            $img.each(function() {
-                $(this).removeAttr("width")
-                       .removeAttr("height")
-                       .css("width","")
-                       .css("height", "");
-
                if($(this).data("width") == undefined)
                    $(this).data("width", $(this).width());

                if($(this).data("width") > width) {
-                    $(this).css("width", "100%");
+                    $(this).removeAttr("width")
+                           .removeAttr("height")
+                           .css("width","")
+                           .css("height", "");
+
+                    if($(this).data("width") > width) {
+                        $(this).css("width", "100%");
+                    }
+                } else {
+                    $(this).attr("width", $(this).data("width"));
                }
            });
        }