Browse Source

Merge pull request #274 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '90ea74e9bb1ea49b559a6378f711cee62792d709':
  icon_text_value_combo
es6
windy 7 years ago
parent
commit
57e6831ac7
  1. 9
      dist/bundle.js
  2. 8
      dist/bundle.min.js
  3. 9
      dist/case.js
  4. 3
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  5. 6
      src/case/trigger/trigger.icon.text.select.js

9
dist/bundle.js vendored

@ -67582,7 +67582,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger", type: "bi.select_icon_text_trigger",
items: o.items, items: o.items,
height: o.height height: o.height,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup", type: "bi.icon_text_value_combo_popup",
@ -75838,8 +75839,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
element: this, element: this,
height: o.height height: o.height
}); });
if (BI.isKey(o.text)) { if (BI.isKey(o.value)) {
this.setValue(o.text); this.setValue(o.value);
} }
}, },
@ -75862,7 +75863,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
this.trigger.setText(result.text); this.trigger.setText(result.text);
this.trigger.setIcon(result.iconClass); this.trigger.setIcon(result.iconClass);
} else { } else {
this.trigger.setText(o.text); this.trigger.setText(o.value);
this.trigger.setIcon(""); this.trigger.setIcon("");
} }
}, },

8
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/case.js vendored

@ -5473,7 +5473,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger", type: "bi.select_icon_text_trigger",
items: o.items, items: o.items,
height: o.height height: o.height,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup", type: "bi.icon_text_value_combo_popup",
@ -13729,8 +13730,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
element: this, element: this,
height: o.height height: o.height
}); });
if (BI.isKey(o.text)) { if (BI.isKey(o.value)) {
this.setValue(o.text); this.setValue(o.value);
} }
}, },
@ -13753,7 +13754,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
this.trigger.setText(result.text); this.trigger.setText(result.text);
this.trigger.setIcon(result.iconClass); this.trigger.setIcon(result.iconClass);
} else { } else {
this.trigger.setText(o.text); this.trigger.setText(o.value);
this.trigger.setIcon(""); this.trigger.setIcon("");
} }
}, },

3
src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@ -18,7 +18,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
this.trigger = BI.createWidget(o.el, { this.trigger = BI.createWidget(o.el, {
type: "bi.select_icon_text_trigger", type: "bi.select_icon_text_trigger",
items: o.items, items: o.items,
height: o.height height: o.height,
value: o.value
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.icon_text_value_combo_popup", type: "bi.icon_text_value_combo_popup",

6
src/case/trigger/trigger.icon.text.select.js

@ -19,8 +19,8 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
element: this, element: this,
height: o.height height: o.height
}); });
if (BI.isKey(o.text)) { if (BI.isKey(o.value)) {
this.setValue(o.text); this.setValue(o.value);
} }
}, },
@ -43,7 +43,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
this.trigger.setText(result.text); this.trigger.setText(result.text);
this.trigger.setIcon(result.iconClass); this.trigger.setIcon(result.iconClass);
} else { } else {
this.trigger.setText(o.text); this.trigger.setText(o.value);
this.trigger.setIcon(""); this.trigger.setIcon("");
} }
}, },

Loading…
Cancel
Save