From f6021d502dcef6335b3a5123cefd884a6d81bcb3 Mon Sep 17 00:00:00 2001 From: XiaoFeng Date: Sat, 19 Dec 2015 13:12:32 +0800 Subject: [PATCH 1/2] Fix pageViewTest Horizontal scroll won't work in Lua-test --- .../CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua b/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua index 237c35d62b..e5d876470e 100644 --- a/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua +++ b/tests/lua-tests/src/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua @@ -1722,13 +1722,11 @@ add_new_testcase(function() local pageView = ccui.PageView:create() pageView:setTouchEnabled(true) pageView:setContentSize(cc.size(240, 130)) - pageView:setDirection(ccui.PageViewDirection.HORIZONTAL) local backgroundSize = background:getContentSize() pageView:setPosition(cc.p((widgetSize.width - backgroundSize.width) / 2 + (backgroundSize.width - pageView:getContentSize().width) / 2, (widgetSize.height - backgroundSize.height) / 2 + (backgroundSize.height - pageView:getContentSize().height) / 2)) - for i = 1 , 3 do local layout = ccui.Layout:create() layout:setContentSize(cc.size(240, 130)) @@ -1788,7 +1786,7 @@ add_new_testcase(function() local pageView = ccui.PageView:create() pageView:setTouchEnabled(true) - pageView:setDirection(ccui.PageViewDirection.VERTICAL) + pageView:setDirection(ccui.ScrollViewDir.vertical) pageView:setContentSize(cc.size(240, 130)) local backgroundSize = background:getContentSize() pageView:setPosition(cc.p((widgetSize.width - backgroundSize.width) / 2 + From a13922161857ba36a79ac4c9b12a1e23db3920dc Mon Sep 17 00:00:00 2001 From: XiaoFeng Date: Sat, 19 Dec 2015 13:56:12 +0800 Subject: [PATCH 2/2] Synchronize parser match modify from h5 engine Update h5 engine ref --- cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js | 1 + .../js-bindings/script/studio/parsers/timelineParser-1.x.js | 1 + web | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js b/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js index b03e849210..4b4bacff60 100644 --- a/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js +++ b/cocos/scripting/js-bindings/script/studio/parsers/action-1.x.js @@ -233,6 +233,7 @@ }); }); + load.registerParser("action", "0.*", parser); load.registerParser("action", "1.*", parser); })(ccs._load, ccs._parser); diff --git a/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-1.x.js b/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-1.x.js index 2aa5de29b6..61a04a2fbf 100644 --- a/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-1.x.js +++ b/cocos/scripting/js-bindings/script/studio/parsers/timelineParser-1.x.js @@ -287,6 +287,7 @@ }); }); + load.registerParser("timeline", "0.*", parser); load.registerParser("timeline", "1.*", parser); })(ccs._load, ccs._parser); diff --git a/web b/web index f91d7a39e7..8586470e65 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit f91d7a39e72c271e6e87ea269e2428c00f3c07cc +Subproject commit 8586470e65d43f60b06d2846bde72b384e884e5d