Browse Source

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

* commit '367aa61c8d95b41539b2f3780bf798dae4084a9a':
  static_combo
es6
windy 7 years ago
parent
commit
dafadea8d2
  1. 5
      dist/bundle.js
  2. 5
      dist/case.js
  3. 5
      dist/fineui.js
  4. 3
      src/case/combo/staticcombo/combo.static.js
  5. 2
      src/case/trigger/trigger.text.select.js

5
dist/bundle.js vendored

@ -68130,7 +68130,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
readonly: true
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_combo_popup", type: "bi.text_value_combo_popup",
@ -76482,7 +76483,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (vals) { setValue: function (vals) {
if (!this.isReadOnly()) {
this.trigger.setText(this._digest(vals, this.options.items)); this.trigger.setText(this._digest(vals, this.options.items));
}
}, },
populate: function (items) { populate: function (items) {

5
dist/case.js vendored

@ -5615,7 +5615,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
readonly: true
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_combo_popup", type: "bi.text_value_combo_popup",
@ -13967,7 +13968,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (vals) { setValue: function (vals) {
if (!this.isReadOnly()) {
this.trigger.setText(this._digest(vals, this.options.items)); this.trigger.setText(this._digest(vals, this.options.items));
}
}, },
populate: function (items) { populate: function (items) {

5
dist/fineui.js vendored

@ -69884,7 +69884,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
readonly: true
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_combo_popup", type: "bi.text_value_combo_popup",
@ -78236,7 +78237,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (vals) { setValue: function (vals) {
if (!this.isReadOnly()) {
this.trigger.setText(this._digest(vals, this.options.items)); this.trigger.setText(this._digest(vals, this.options.items));
}
}, },
populate: function (items) { populate: function (items) {

3
src/case/combo/staticcombo/combo.static.js

@ -23,7 +23,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
type: "bi.select_text_trigger", type: "bi.select_text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text text: o.text,
readonly: true
}); });
this.popup = BI.createWidget({ this.popup = BI.createWidget({
type: "bi.text_value_combo_popup", type: "bi.text_value_combo_popup",

2
src/case/trigger/trigger.text.select.js

@ -45,7 +45,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
}, },
setValue: function (vals) { setValue: function (vals) {
if (!this.isReadOnly()) {
this.trigger.setText(this._digest(vals, this.options.items)); this.trigger.setText(this._digest(vals, this.options.items));
}
}, },
populate: function (items) { populate: function (items) {

Loading…
Cancel
Save