Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui

7 years ago · a3ca13096b
3 changed files with 527 additions and 518 deletions
--- a/bi/base.js
+++ b/bi/base.js
@ -807,6 +807,9 @@ BI.BasicButton = BI.inherit(BI.Single, {

    _trigger: function () {
        var o = this.options;
+        if(!this.isEnabled()){
+            return;
+        }
        if (!this.isDisableSelected()) {
            this.isForceSelected() ? this.setSelected(true) :
                (this.isForceNotSelected() ? this.setSelected(false) :
--- a/docs/base.js
+++ b/docs/base.js
@ -807,6 +807,9 @@ BI.BasicButton = BI.inherit(BI.Single, {

    _trigger: function () {
        var o = this.options;
+        if(!this.isEnabled()){
+            return;
+        }
        if (!this.isDisableSelected()) {
            this.isForceSelected() ? this.setSelected(true) :
                (this.isForceNotSelected() ? this.setSelected(false) :
--- a/src/base/single/button/button.basic.js
+++ b/src/base/single/button/button.basic.js
@ -220,6 +220,9 @@ BI.BasicButton = BI.inherit(BI.Single, {

    _trigger: function () {
        var o = this.options;
+        if(!this.isEnabled()){
+            return;
+        }
        if (!this.isDisableSelected()) {
            this.isForceSelected() ? this.setSelected(true) :
                (this.isForceNotSelected() ? this.setSelected(false) :