Merge pull request #1242 from pandamicro/develop

Fix property API issues

Author: pandamicro

frameworks/cocos2d-html5

@@ -125,19 +125,19 @@ _safeExtend(ccui.TextField.prototype, {
 
 _safeExtend(ccui.ScrollView.prototype, {
     _getInnerWidth: function() {
-        return this.getInnerContentSize().width;
+        return this.getInnerContainerSize().width;
     },
     _getInnerHeight: function() {
-        return this.getInnerContentSize().height;
+        return this.getInnerContainerSize().height;
     },
 
     _setInnerWidth: function(w) {
-        var size = cc.size(w, this.getInnerContentSize().height);
-        this.setInnerContentSize(size);
+        var size = cc.size(w, this.getInnerContainerSize().height);
+        this.setInnerContainerSize(size);
     },
     _setInnerHeight: function(h) {
-        var size = cc.size(this.getInnerContentSize().width, h);
-        this.setInnerContentSize(size);
+        var size = cc.size(this.getInnerContainerSize().width, h);
+        this.setInnerContainerSize(size);
     }
 });
 

frameworks/js-bindings/bindings/script/ccui/jsb_ccui_property_impls.js

@@ -156,7 +156,6 @@ cc.defineGetterSetter(_proto, "scheduler", _proto.getScheduler, _proto.setSchedu
 cc.defineGetterSetter(_proto, "shaderProgram", _proto.getShaderProgram, _proto.setShaderProgram);
 cc.defineGetterSetter(_proto, "glServerState", _proto.getGLServerState, _proto.setGLServerState);
 cc.defineGetterSetter(_proto, "tag", _proto.getTag, _proto.setTag);
-cc.defineGetterSetter(_proto, "userData", _proto.getUserData, _proto.setUserData);
 cc.defineGetterSetter(_proto, "userObject", _proto.getUserObject, _proto.setUserObject);
 cc.defineGetterSetter(_proto, "arrivalOrder", _proto.getArrivalOrder, _proto.setArrivalOrder);