Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

es6
guy 8 years ago
parent
7daa9b1102 c2f4c32e72
commit
51def4d312
3 changed files with 30 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      bi/widget.js
  2. 20
      docs/widget.js
  3. 20
      src/widget/multitree/multi.tree.combo.js

20
bi/widget.js
Unescape View File

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

20
docs/widget.js
Unescape View File

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

20
src/widget/multitree/multi.tree.combo.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save