Browse Source

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

* commit '04d9ab307aefd840ef343de179fd9660e6b882ee':
  update
  update
master
fay 7 years ago
parent
commit
d88e007738
  1. 16
      dist/_fineui.min.js
  2. 12
      dist/bundle.js
  3. 16
      dist/bundle.min.js
  4. 16
      dist/fineui.min.js
  5. 12
      dist/widget.js
  6. 6
      src/widget/multiselect/trigger/button.checkselected.js
  7. 6
      src/widget/multiselect/trigger/editor.multiselect.js

16
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/bundle.js vendored

@ -98543,10 +98543,6 @@ BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
*/ */
BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, { BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-check-selected-button bi-high-light", baseCls: "bi-multi-select-check-selected-button bi-high-light",
@ -98575,7 +98571,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
this.numberCounter.element.hover(function () { this.numberCounter.element.hover(function () {
self.numberCounter.setTag(self.numberCounter.getText()); self.numberCounter.setTag(self.numberCounter.getText());
self.numberCounter.setText(self._const.checkSelected); self.numberCounter.setText(BI.i18nText("BI-Check_Selected"));
}, function () { }, function () {
self.numberCounter.setText(self.numberCounter.getTag()); self.numberCounter.setText(self.numberCounter.getTag());
}); });
@ -98622,10 +98618,6 @@ BI.shortcut("bi.multi_select_check_selected_button", BI.MultiSelectCheckSelected
*/ */
BI.MultiSelectEditor = BI.inherit(BI.Widget, { BI.MultiSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-editor", baseCls: "bi-multi-select-editor",
@ -98679,7 +98671,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, {
return v[v.length - 1]; return v[v.length - 1];
} }
return ""; return "";
}, },
getKeywords: function () { getKeywords: function () {

16
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

12
dist/widget.js vendored

@ -11406,10 +11406,6 @@ BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
*/ */
BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, { BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-check-selected-button bi-high-light", baseCls: "bi-multi-select-check-selected-button bi-high-light",
@ -11438,7 +11434,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
this.numberCounter.element.hover(function () { this.numberCounter.element.hover(function () {
self.numberCounter.setTag(self.numberCounter.getText()); self.numberCounter.setTag(self.numberCounter.getText());
self.numberCounter.setText(self._const.checkSelected); self.numberCounter.setText(BI.i18nText("BI-Check_Selected"));
}, function () { }, function () {
self.numberCounter.setText(self.numberCounter.getTag()); self.numberCounter.setText(self.numberCounter.getTag());
}); });
@ -11485,10 +11481,6 @@ BI.shortcut("bi.multi_select_check_selected_button", BI.MultiSelectCheckSelected
*/ */
BI.MultiSelectEditor = BI.inherit(BI.Widget, { BI.MultiSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-editor", baseCls: "bi-multi-select-editor",
@ -11542,7 +11534,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, {
return v[v.length - 1]; return v[v.length - 1];
} }
return ""; return "";
}, },
getKeywords: function () { getKeywords: function () {

6
src/widget/multiselect/trigger/button.checkselected.js

@ -6,10 +6,6 @@
*/ */
BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, { BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-check-selected-button bi-high-light", baseCls: "bi-multi-select-check-selected-button bi-high-light",
@ -38,7 +34,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
this.numberCounter.element.hover(function () { this.numberCounter.element.hover(function () {
self.numberCounter.setTag(self.numberCounter.getText()); self.numberCounter.setTag(self.numberCounter.getText());
self.numberCounter.setText(self._const.checkSelected); self.numberCounter.setText(BI.i18nText("BI-Check_Selected"));
}, function () { }, function () {
self.numberCounter.setText(self.numberCounter.getTag()); self.numberCounter.setText(self.numberCounter.getTag());
}); });

6
src/widget/multiselect/trigger/editor.multiselect.js

@ -6,10 +6,6 @@
*/ */
BI.MultiSelectEditor = BI.inherit(BI.Widget, { BI.MultiSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-editor", baseCls: "bi-multi-select-editor",
@ -63,7 +59,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, {
return v[v.length - 1]; return v[v.length - 1];
} }
return ""; return "";
}, },
getKeywords: function () { getKeywords: function () {

Loading…
Cancel
Save