Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js
es6
windy 7 years ago
parent
commit
94ccb0b854
  1. 48
      dist/bundle.js
  2. 48
      dist/widget.js
  3. 5
      src/widget/month/trigger.month.js
  4. 6
      src/widget/multiselect/trigger/button.checkselected.js
  5. 4
      src/widget/multiselect/trigger/editor.multiselect.js
  6. 6
      src/widget/multitree/trigger/multi.tree.button.checkselected.js
  7. 5
      src/widget/quarter/trigger.quarter.js
  8. 4
      src/widget/singleselect/trigger/editor.singleselect.js
  9. 6
      src/widget/year/trigger.year.js
  10. 6
      src/widget/yearmonth/trigger.yearmonth.js
  11. 6
      src/widget/yearquarter/trigger.yearquarter.js

48
dist/bundle.js vendored

@ -95067,8 +95067,7 @@ BI.shortcut("bi.month_popup", BI.MonthPopup);/**
BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
vgap: 2
},
_defaultConfig: function () {
@ -95092,7 +95091,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.MonthTrigger.EVENT_FOCUS);
@ -98550,10 +98549,6 @@ BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
*/
BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-check-selected-button bi-high-light",
@ -98582,7 +98577,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
this.numberCounter.element.hover(function () {
self.numberCounter.setTag(self.numberCounter.getText());
self.numberCounter.setText(self._const.checkSelected);
self.numberCounter.setText(BI.i18nText("BI-Check_Selected"));
}, function () {
self.numberCounter.setText(self.numberCounter.getTag());
});
@ -98629,10 +98624,6 @@ BI.shortcut("bi.multi_select_check_selected_button", BI.MultiSelectCheckSelected
*/
BI.MultiSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-editor",
@ -100420,10 +100411,6 @@ BI.shortcut("bi.multi_tree_search_pane", BI.MultiTreeSearchPane);/**
*/
BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiTreeCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-check-selected-button",
@ -100447,7 +100434,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
cls: "trigger-check-selected",
invisible: true,
hgap: 4,
text: this._const.checkSelected,
text: BI.i18nText("BI-Check_Selected"),
textAlign: "center",
textHeight: 15
});
@ -102045,8 +102032,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
textWidth: 40
},
_defaultConfig: function () {
@ -102070,7 +102056,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.QuarterTrigger.EVENT_FOCUS);
@ -104986,10 +104972,6 @@ BI.shortcut("bi.single_select_insert_list", BI.SingleSelectInsertList);
*/
BI.SingleSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-editor",
@ -108482,9 +108464,7 @@ BI.DynamicYearPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
_defaultConfig: function () {
@ -108512,7 +108492,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
}
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
@ -109192,9 +109172,7 @@ BI.DynamicYearMonthPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -109263,7 +109241,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
hgap: c.hgap,
vgap: c.vgap,
@ -110116,9 +110094,7 @@ BI.DynamicYearQuarterPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -110186,7 +110162,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
return false;
},
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,

48
dist/widget.js vendored

@ -7930,8 +7930,7 @@ BI.shortcut("bi.month_popup", BI.MonthPopup);/**
BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
vgap: 2
},
_defaultConfig: function () {
@ -7955,7 +7954,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.MonthTrigger.EVENT_FOCUS);
@ -11413,10 +11412,6 @@ BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
*/
BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-check-selected-button bi-high-light",
@ -11445,7 +11440,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
this.numberCounter.element.hover(function () {
self.numberCounter.setTag(self.numberCounter.getText());
self.numberCounter.setText(self._const.checkSelected);
self.numberCounter.setText(BI.i18nText("BI-Check_Selected"));
}, function () {
self.numberCounter.setText(self.numberCounter.getTag());
});
@ -11492,10 +11487,6 @@ BI.shortcut("bi.multi_select_check_selected_button", BI.MultiSelectCheckSelected
*/
BI.MultiSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-editor",
@ -13283,10 +13274,6 @@ BI.shortcut("bi.multi_tree_search_pane", BI.MultiTreeSearchPane);/**
*/
BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiTreeCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-check-selected-button",
@ -13310,7 +13297,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
cls: "trigger-check-selected",
invisible: true,
hgap: 4,
text: this._const.checkSelected,
text: BI.i18nText("BI-Check_Selected"),
textAlign: "center",
textHeight: 15
});
@ -14908,8 +14895,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
textWidth: 40
},
_defaultConfig: function () {
@ -14933,7 +14919,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.QuarterTrigger.EVENT_FOCUS);
@ -17849,10 +17835,6 @@ BI.shortcut("bi.single_select_insert_list", BI.SingleSelectInsertList);
*/
BI.SingleSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-editor",
@ -21345,9 +21327,7 @@ BI.DynamicYearPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
_defaultConfig: function () {
@ -21375,7 +21355,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
}
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
@ -22055,9 +22035,7 @@ BI.DynamicYearMonthPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -22126,7 +22104,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
hgap: c.hgap,
vgap: c.vgap,
@ -22979,9 +22957,7 @@ BI.DynamicYearQuarterPopup.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -23049,7 +23025,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
return false;
},
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,

5
src/widget/month/trigger.month.js

@ -8,8 +8,7 @@
BI.MonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
vgap: 2
},
_defaultConfig: function () {
@ -33,7 +32,7 @@ BI.MonthTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Month_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.MonthTrigger.EVENT_FOCUS);

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

@ -6,10 +6,6 @@
*/
BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
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 () {
self.numberCounter.setTag(self.numberCounter.getText());
self.numberCounter.setText(self._const.checkSelected);
self.numberCounter.setText(BI.i18nText("BI-Check_Selected"));
}, function () {
self.numberCounter.setText(self.numberCounter.getTag());
});

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

@ -6,10 +6,6 @@
*/
BI.MultiSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-select-editor",

6
src/widget/multitree/trigger/multi.tree.button.checkselected.js

@ -6,10 +6,6 @@
*/
BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.MultiTreeCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-multi-tree-check-selected-button",
@ -33,7 +29,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
cls: "trigger-check-selected",
invisible: true,
hgap: 4,
text: this._const.checkSelected,
text: BI.i18nText("BI-Check_Selected"),
textAlign: "center",
textHeight: 15
});

5
src/widget/quarter/trigger.quarter.js

@ -9,8 +9,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
textWidth: 40,
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
textWidth: 40
},
_defaultConfig: function () {
@ -34,7 +33,7 @@ BI.QuarterTrigger = BI.inherit(BI.Trigger, {
hgap: c.hgap,
vgap: c.vgap,
allowBlank: true,
errorText: c.errorText
errorText: BI.i18nText("BI-Quarter_Trigger_Error_Text")
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
self.fireEvent(BI.QuarterTrigger.EVENT_FOCUS);

4
src/widget/singleselect/trigger/editor.singleselect.js

@ -6,10 +6,6 @@
*/
BI.SingleSelectEditor = BI.inherit(BI.Widget, {
_const: {
checkSelected: BI.i18nText("BI-Check_Selected")
},
_defaultConfig: function () {
return BI.extend(BI.SingleSelectEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-single-select-editor",

6
src/widget/year/trigger.year.js

@ -1,9 +1,7 @@
BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
_defaultConfig: function () {
@ -31,7 +29,7 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
watermark: BI.i18nText("BI-Basic_Unrestricted"),
allowBlank: true,
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
}
});
this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {

6
src/widget/yearmonth/trigger.yearmonth.js

@ -1,9 +1,7 @@
BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -72,7 +70,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
hgap: c.hgap,
vgap: c.vgap,

6
src/widget/yearquarter/trigger.yearquarter.js

@ -1,9 +1,7 @@
BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_const: {
hgap: 4,
vgap: 2,
errorText: BI.i18nText("BI-Please_Input_Positive_Integer"),
errorTextInvalid: BI.i18nText("BI-Year_Trigger_Invalid_Text")
vgap: 2
},
props: {
@ -71,7 +69,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
return false;
},
errorText: function (v) {
return !BI.isPositiveInteger(v) ? c.errorText : c.errorTextInvalid;
return !BI.isPositiveInteger(v) ? BI.i18nText("BI-Please_Input_Positive_Integer") : BI.i18nText("BI-Year_Trigger_Invalid_Text");
},
watermark: BI.i18nText("BI-Basic_Unrestricted"),
hgap: c.hgap,

Loading…
Cancel
Save