diff --git a/cocos2d/core/components/CCToggle.js b/cocos2d/core/components/CCToggle.js index 941d6e48c4..a791d9d546 100644 --- a/cocos2d/core/components/CCToggle.js +++ b/cocos2d/core/components/CCToggle.js @@ -108,7 +108,7 @@ var Toggle = cc.Class({ if(!CC_EDITOR) { this._registerToggleEvent(); } - if(this.toggleGroup) { + if(this.toggleGroup && this.toggleGroup.enabled) { this.toggleGroup.addToggle(this); } }, @@ -118,14 +118,14 @@ var Toggle = cc.Class({ if(!CC_EDITOR) { this._unregisterToggleEvent(); } - if(this.toggleGroup) { + if(this.toggleGroup && this.toggleGroup.enabled) { this.toggleGroup.removeToggle(this); } }, _updateCheckMark: function () { if(this.checkMark) { - this.checkMark.enabled = !!this.isChecked; + this.checkMark.node.active = !!this.isChecked; } }, @@ -151,7 +151,7 @@ var Toggle = cc.Class({ }, toggle: function (event) { - if(this.toggleGroup && this.isChecked) { + if(this.toggleGroup && this.toggleGroup.enabled && this.isChecked) { if(!this.toggleGroup.allowSwitchOff) { return; } @@ -160,11 +160,12 @@ var Toggle = cc.Class({ this._updateCheckMark(); - this._emitToggleEvents(event); - if(this.toggleGroup) { + if(this.toggleGroup && this.toggleGroup.enabled) { this.toggleGroup.updateToggles(this); } + + this._emitToggleEvents(event); }, _emitToggleEvents: function () { @@ -180,18 +181,19 @@ var Toggle = cc.Class({ * @method check */ check: function () { - if(this.toggleGroup && this.isChecked) { + if(this.toggleGroup && this.toggleGroup.enabled && this.isChecked) { if(!this.toggleGroup.allowSwitchOff) { return; } } this.isChecked = true; - this._emitToggleEvents(); - if(this.toggleGroup) { + if(this.toggleGroup && this.toggleGroup.enabled) { this.toggleGroup.updateToggles(this); } + + this._emitToggleEvents(); }, /** @@ -200,7 +202,7 @@ var Toggle = cc.Class({ * @method uncheck */ uncheck: function () { - if(this.toggleGroup && this.isChecked) { + if(this.toggleGroup && this.toggleGroup.enabled && this.isChecked) { if(!this.toggleGroup.allowSwitchOff) { return; } diff --git a/cocos2d/core/components/CCToggleGroup.js b/cocos2d/core/components/CCToggleGroup.js index 1026a8c0d4..d738f1b4c5 100644 --- a/cocos2d/core/components/CCToggleGroup.js +++ b/cocos2d/core/components/CCToggleGroup.js @@ -53,6 +53,17 @@ var ToggleGroup = cc.Class({ allowSwitchOff: { tooltip: CC_DEV && 'i18n:COMPONENT.toggle_group.allowSwitchOff', default: false + }, + + /** + * !#en Read only property, return the toggle items array reference managed by toggleGroup. + * !#zh 只读属性,返回 toggleGroup 管理的 toggle 数组引用 + * @property {Array} toggleItems + */ + toggleItems: { + get: function (){ + return this._toggleItems; + } } },