Browse Source

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

# Conflicts:
#	bi/core.js
#	docs/core.js
#	src/core/widget.js
es6
guy 8 years ago
parent
commit
b5364266df
  1. 2
      bi/case.js
  2. 2
      docs/case.js
  3. 2
      src/case/trigger/trigger.text.select.js

2
bi/case.js

@ -11346,10 +11346,8 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
});
if (result.length > 0) {
this.trigger.element.removeClass("bi-water-mark");
this.trigger.setText(result.join(","));
} else {
this.trigger.element.addClass("bi-water-mark");
this.trigger.setText(o.text);
}
},

2
docs/case.js

@ -11346,10 +11346,8 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
});
if (result.length > 0) {
this.trigger.element.removeClass("bi-water-mark");
this.trigger.setText(result.join(","));
} else {
this.trigger.element.addClass("bi-water-mark");
this.trigger.setText(o.text);
}
},

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

@ -40,10 +40,8 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
});
if (result.length > 0) {
this.trigger.element.removeClass("bi-water-mark");
this.trigger.setText(result.join(","));
} else {
this.trigger.element.addClass("bi-water-mark");
this.trigger.setText(o.text);
}
},

Loading…
Cancel
Save