🐛 fixed #34

akira-cn · akira-cn · commit 7dce76930114 · 2018-10-09T12:03:52.000+08:00
diff --git a/README.md b/README.md
@@ -11,5 +11,5 @@ Platform-independent canvas render object model api.
 ## CDN
 
 ```html
-<script src="https://s0.ssl.qhres.com/!27f9d761/sprite-core.min.js"></script>
+<script src="https://s1.ssl.qhres.com/!f2761d1f/sprite-core.min.js"></script>
 ```
diff --git a/dist/sprite-core.es6.js b/dist/sprite-core.es6.js
@@ -5935,7 +5935,8 @@ let BaseSprite = (_dec = Object(_utils__WEBPACK_IMPORTED_MODULE_2__["deprecate"]
 
       if (width !== '') {
         width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);
-      }if (width !== '') {
+      }
+      if (height !== '') {
         height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);
       }
     }
diff --git a/dist/sprite-core.es6.min.js b/dist/sprite-core.es6.min.js
diff --git a/dist/sprite-core.js b/dist/sprite-core.js
@@ -8847,7 +8847,8 @@ var BaseSprite = (_dec = (0, _utils.deprecate)('Instead use sprite.cache = null'
 
         if (width !== '') {
           width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);
-        }if (width !== '') {
+        }
+        if (height !== '') {
           height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);
         }
       }
diff --git a/dist/sprite-core.min.js b/dist/sprite-core.min.js
diff --git a/lib/basesprite.js b/lib/basesprite.js
@@ -1422,7 +1422,8 @@ var BaseSprite = (_dec = (0, _utils.deprecate)('Instead use sprite.cache = null'
 
         if (width !== '') {
           width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);
-        }if (width !== '') {
+        }
+        if (height !== '') {
           height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);
         }
       }
diff --git a/src/basesprite.js b/src/basesprite.js
@@ -469,7 +469,8 @@ export default class BaseSprite extends BaseNode {
 
       if(width !== '') {
         width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);
-      } if(width !== '') {
+      }
+      if(height !== '') {
         height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -5935,7 +5935,8 @@ let BaseSprite = (_dec = Object(_utils__WEBPACK_IMPORTED_MODULE_2__["deprecate"]`
`5935`	`5935`
`5936`	`5936`	`if (width !== '') {`
`5937`	`5937`	`width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);`
`5938`		`- }if (width !== '') {`
	`5938`	`+ }`
	`5939`	`+ if (height !== '') {`
`5939`	`5940`	`height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);`
`5940`	`5941`	`}`
`5941`	`5942`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8847,7 +8847,8 @@ var BaseSprite = (_dec = (0, _utils.deprecate)('Instead use sprite.cache = null'`
`8847`	`8847`
`8848`	`8848`	`if (width !== '') {`
`8849`	`8849`	`width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);`
`8850`		`- }if (width !== '') {`
	`8850`	`+ }`
	`8851`	`+ if (height !== '') {`
`8851`	`8852`	`height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);`
`8852`	`8853`	`}`
`8853`	`8854`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1422,7 +1422,8 @@ var BaseSprite = (_dec = (0, _utils.deprecate)('Instead use sprite.cache = null'`
`1422`	`1422`
`1423`	`1423`	`if (width !== '') {`
`1424`	`1424`	`width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);`
`1425`		`- }if (width !== '') {`
	`1425`	`+ }`
	`1426`	`+ if (height !== '') {`
`1426`	`1427`	`height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);`
`1427`	`1428`	`}`
`1428`	`1429`	`}`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,8 @@ export default class BaseSprite extends BaseNode {`
`469`	`469`
`470`	`470`	`if(width !== '') {`
`471`	`471`	`width = Math.max(0, width - 2 * borderWidth - paddingLeft - paddingRight);`
`472`		`- } if(width !== '') {`
	`472`	`+ }`
	`473`	`+ if(height !== '') {`
`473`	`474`	`height = Math.max(0, height - 2 * borderWidth - paddingTop - paddingBottom);`
`474`	`475`	`}`
`475`	`476`	`}`