diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5
index 213b869c19..7924408107 160000
--- a/frameworks/cocos2d-html5
+++ b/frameworks/cocos2d-html5
@@ -1 +1 @@
-Subproject commit 213b869c19daeb138b46944886514e2acea7b25c
+Subproject commit 7924408107f2cd52df65256420da2a2caa0ff455
diff --git a/frameworks/js-bindings/bindings/script/ccui/jsb_ccui_property_impls.js b/frameworks/js-bindings/bindings/script/ccui/jsb_ccui_property_impls.js
index 17ec7140b2..9750969e29 100644
--- a/frameworks/js-bindings/bindings/script/ccui/jsb_ccui_property_impls.js
+++ b/frameworks/js-bindings/bindings/script/ccui/jsb_ccui_property_impls.js
@@ -125,19 +125,19 @@ _safeExtend(ccui.TextField.prototype, {
 
 _safeExtend(ccui.ScrollView.prototype, {
     _getInnerWidth: function() {
-        return this.getInnerContainerSize().width;
+        return this.getInnerContentSize().width;
     },
     _getInnerHeight: function() {
-        return this.getInnerContainerSize().height;
+        return this.getInnerContentSize().height;
     },
 
     _setInnerWidth: function(w) {
-        var size = cc.size(w, this.getInnerContainerSize().height);
-        this.setInnerContainerSize(size);
+        var size = cc.size(w, this.getInnerContentSize().height);
+        this.setInnerContentSize(size);
     },
     _setInnerHeight: function(h) {
-        var size = cc.size(this.getInnerContainerSize().width, h);
-        this.setInnerContainerSize(size);
+        var size = cc.size(this.getInnerContentSize().width, h);
+        this.setInnerContentSize(size);
     }
 });
 
diff --git a/frameworks/js-bindings/bindings/script/jsb_property_apis.js b/frameworks/js-bindings/bindings/script/jsb_property_apis.js
index c50f4b9f87..02bac9f47b 100644
--- a/frameworks/js-bindings/bindings/script/jsb_property_apis.js
+++ b/frameworks/js-bindings/bindings/script/jsb_property_apis.js
@@ -156,6 +156,7 @@ 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);
 
diff --git a/frameworks/js-bindings/cocos2d-x b/frameworks/js-bindings/cocos2d-x
index 5d33292f10..853346fe01 160000
--- a/frameworks/js-bindings/cocos2d-x
+++ b/frameworks/js-bindings/cocos2d-x
@@ -1 +1 @@
-Subproject commit 5d33292f107ede90dc4c961968b4c3727d07d929
+Subproject commit 853346fe0189c9c0b49567b4dbea122e38ca66f7