Merge pull request #7470 from samuele3hu/v3_hot_fix

Update bindings-generator submodule and fix some lua-tests errors
This commit is contained in:
minggo 2014-07-17 10:13:02 +08:00
commit 40392f5fd5
5 changed files with 6 additions and 4 deletions

View File

@ -492,3 +492,5 @@ ccui.LayoutType.linearVertical = ccui.LayoutType.VERTICAL
ccui.LayoutType.linearHorizontal = ccui.LayoutType.HORIZONTAL
ccui.LayoutType.relative = ccui.LayoutType.RELATIVE
ccui.ListViewEventType.onsSelectedItem = ccui.ListViewEventType.ONSELECTEDITEM_START

View File

@ -151,7 +151,8 @@ ccui.ListViewMoveDirection = {
}
ccui.ListViewEventType = {
onsSelectedItem = 0,
ONSELECTEDITEM_START = 0,
ONSELECTEDITEM_END = 1,
}
ccui.PageViewEventType = {

View File

@ -2425,7 +2425,7 @@ function UIListViewVerticalTest:initExtend()
end
local function listViewEvent(sender, eventType)
if eventType == ccui.ListViewEventType.onsSelectedItem then
if eventType == ccui.ListViewEventType.ONSELECTEDITEM_START then
print("select child index = ",sender:getCurSelectedIndex())
end
end

View File

@ -173,7 +173,6 @@ function SceneEditorTestLayer:createMenu()
end
if sceneEditorTestIdx == #SceneEditorTestLayer.title then
self:unscheduleUpdate()
ccs.TriggerMng.getInstance():removeAll()
end

@ -1 +1 @@
Subproject commit 132282d67aff8da7113f4a00596aac75e7b4528d
Subproject commit 56aaed8134d624cdbaa365dc44c5134f325957cc