Merge pull request #1589 from zilongshanren/improve-toggle-component

Improve toggle component
This commit is contained in:
Wang Nan
2017-04-18 10:33:01 +08:00
committed by GitHub
2 changed files with 23 additions and 10 deletions
+12 -10
View File
@@ -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;
}
+11
View File
@@ -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;
}
}
},