refine

DebugInfos.js

@@ -241,9 +241,9 @@ if (CC_DEBUG) {
         "3116": "WebGLRenderingContext.CLAMP_TO_EDGE should be used in NPOT textures", //setTexParameters
         "3117": "Mimpap texture only works in POT textures", //generateMipmap
         //RectWidth: 3300
-        "3300": "Rect width exceeds maximum margin: %s", //RectWidth
+        "3300": "Rect width exceeds maximum margin: %s, max x: %s, texture width: %s", //RectWidth
         //RectHeight: 3400
-        "3400": "Rect height exceeds maximum margin: %s", //RectHeight
+        "3400": "Rect height exceeds maximum margin: %s, max y: %s, texture height: %s", //RectHeight
         //EventManager: 3500
         "3500": "0 priority is forbidden for fixed priority since it's used for scene graph based priority.", //addListener
         "3501": "Invalid listener type!", //removeListeners

cocos2d/core/sprites/CCSpriteFrame.js

@@ -452,11 +452,11 @@ var SpriteFrame = cc.Class(/** @lends cc.SpriteFrame# */{
             maxX += rect.width;
             maxY += rect.height;
         }
-        if (maxX > texture.getPixelWidth()) {
-            cc.errorID(3300, texture.url + '/' + this.name);
+        if (maxX > texture.width) {
+            cc.errorID(3300, texture.url + '/' + this.name, maxX, texture.width);
         }
-        if (maxY > texture.getPixelHeight()) {
-            cc.errorID(3400, texture.url + '/' + this.name);
+        if (maxY > texture.height) {
+            cc.errorID(3400, texture.url + '/' + this.name, maxY, texture.height);
         }
     },
 

jsb/jsb-tex-sprite-frame.js

@@ -331,4 +331,5 @@ prototype.clone = function () {
     return cloned;
 };
 
+cc.js.getset(prototype, 'texture', prototype.getTexture, prototype.setTexture);
 cc.js.addon(prototype, WebSpriteFrame.prototype);

package.json

@@ -44,7 +44,6 @@
     "jshint-stylish": "2.1.0",
     "multipipe": "0.3.0",
     "persistify": "^1.1.1",
-    "require-dir": "0.3.0",
     "uglify-es": "^3.0.26",
     "vinyl": "1.1.0",
     "vinyl-buffer": "1.0.0",