Browse Source

Merging in latest from upstream (FUI/fineui:refs/heads/master)

* commit '474654ba301b13981fe5b16b2be0a39c8ebc040c':
  update
es6
kary 7 years ago
parent
commit
aaa30b8e54
  1. 6
      dist/bundle.js
  2. 2
      dist/bundle.min.js
  3. 6
      dist/case.js
  4. 6
      dist/fineui.js
  5. 2
      dist/fineui.min.js
  6. 6
      src/case/combo/staticcombo/combo.static.js

6
dist/bundle.js vendored

@ -68127,7 +68127,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
BI.StaticCombo.superclass._init.apply(this, arguments); BI.StaticCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text, text: o.text,
@ -68159,11 +68159,11 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
}, },
populate: function (items) { populate: function (items) {
this.popup.populate(items); this.combo.populate(items);
}, },
setValue: function (v) { setValue: function (v) {
this.popup.setValue(v); this.combo.setValue(v);
}, },
getValue: function () { getValue: function () {

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/case.js vendored

@ -5612,7 +5612,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
BI.StaticCombo.superclass._init.apply(this, arguments); BI.StaticCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text, text: o.text,
@ -5644,11 +5644,11 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
}, },
populate: function (items) { populate: function (items) {
this.popup.populate(items); this.combo.populate(items);
}, },
setValue: function (v) { setValue: function (v) {
this.popup.setValue(v); this.combo.setValue(v);
}, },
getValue: function () { getValue: function () {

6
dist/fineui.js vendored

@ -69881,7 +69881,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
BI.StaticCombo.superclass._init.apply(this, arguments); BI.StaticCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text, text: o.text,
@ -69913,11 +69913,11 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
}, },
populate: function (items) { populate: function (items) {
this.popup.populate(items); this.combo.populate(items);
}, },
setValue: function (v) { setValue: function (v) {
this.popup.setValue(v); this.combo.setValue(v);
}, },
getValue: function () { getValue: function () {

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

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

@ -20,7 +20,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
BI.StaticCombo.superclass._init.apply(this, arguments); BI.StaticCombo.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
this.trigger = BI.createWidget({ this.trigger = BI.createWidget({
type: "bi.select_text_trigger", type: "bi.text_trigger",
items: o.items, items: o.items,
height: o.height, height: o.height,
text: o.text, text: o.text,
@ -52,11 +52,11 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
}, },
populate: function (items) { populate: function (items) {
this.popup.populate(items); this.combo.populate(items);
}, },
setValue: function (v) { setValue: function (v) {
this.popup.setValue(v); this.combo.setValue(v);
}, },
getValue: function () { getValue: function () {

Loading…
Cancel
Save