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

7 years ago · 51def4d312
3 changed files with 30 additions and 30 deletions
--- a/bi/widget.js
+++ b/bi/widget.js
@ -11828,18 +11828,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
            if (isSearching()) {
                self.trigger.stopEditing();
                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
            }
+            clear = false;
+            change = false;
        });

        var triggerBtn = BI.createWidget({
--- a/docs/widget.js
+++ b/docs/widget.js
@ -11828,18 +11828,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
            if (isSearching()) {
                self.trigger.stopEditing();
                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
            }
+            clear = false;
+            change = false;
        });

        var triggerBtn = BI.createWidget({
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@ -188,18 +188,18 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
            if (isSearching()) {
                self.trigger.stopEditing();
                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
-                return;
-            }
-            if (isPopupView()) {
-                self.trigger.stopEditing();
-                self.storeValue = {value: self.combo.getValue()};
-                if (clear === true) {
-                    self.storeValue = {value: {}};
-                    clear = false;
-                    change = false;
+            }else{
+                if (isPopupView()) {
+                    self.trigger.stopEditing();
+                    self.storeValue = {value: self.combo.getValue()};
+                    if (clear === true) {
+                        self.storeValue = {value: {}};
+                    }
+                    self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
                }
-                self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
            }
+            clear = false;
+            change = false;
        });

        var triggerBtn = BI.createWidget({