Merge branch 'master' of github.com:mycolorway/simditor

shawjia · Apr 14, 2014 · a8ab937 · a8ab937
2 parents 972b58b + 9e003f9
commit a8ab937
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/lib/simditor-all.js b/lib/simditor-all.js
diff --git a/lib/simditor.js b/lib/simditor.js
diff --git a/site/assets/scripts/simditor-all.js b/site/assets/scripts/simditor-all.js
diff --git a/site/assets/scripts/simditor-all.min.js b/site/assets/scripts/simditor-all.min.js
diff --git a/src/buttons/image.coffee b/src/buttons/image.coffee
@@ -208,6 +208,7 @@ class ImageButton extends Button
     return if $wrapper.length > 0
 
     $wrapper = $(@_wrapperTpl)
+      .width($img.width())
       .insertBefore($img)
       .prepend($img)
 
@@ -235,6 +236,7 @@ class ImageButton extends Button
       $img.attr({
         src: src,
         width: width,
+        height: height,
         'data-origin-src': src,
         'data-origin-name': '图片',
         'data-origin-size': img.width + ',' + img.height

diff --git a/src/simditor.coffee b/src/simditor.coffee
@@ -2668,6 +2668,7 @@ class ImageButton extends Button
     return if $wrapper.length > 0
 
     $wrapper = $(@_wrapperTpl)
+      .width($img.width())
       .insertBefore($img)
       .prepend($img)
 
@@ -2695,6 +2696,7 @@ class ImageButton extends Button
       $img.attr({
         src: src,
         width: width,
+        height: height,
         'data-origin-src': src,
         'data-origin-name': '图片',
         'data-origin-size': img.width + ',' + img.height