diff --git a/dist/bundle.js b/dist/bundle.js index ddb59260b..10cff1c88 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -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", @@ -98686,7 +98677,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { return v[v.length - 1]; } return ""; - + }, getKeywords: function () { @@ -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", @@ -105043,7 +105025,7 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { return v[v.length - 1]; } return ""; - + }, getKeywords: function () { @@ -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 () { @@ -108586,7 +108566,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger this.editor.setValue(dateStr); this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, - + setValue: function (v) { var type, value; var date = BI.getDate(); @@ -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, diff --git a/dist/widget.js b/dist/widget.js index 7f2f1ff7c..6d0517996 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -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", @@ -11549,7 +11540,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { return v[v.length - 1]; } return ""; - + }, getKeywords: function () { @@ -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", @@ -17906,7 +17888,7 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { return v[v.length - 1]; } return ""; - + }, getKeywords: function () { @@ -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 () { @@ -21449,7 +21429,7 @@ BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);BI.DynamicYearTrigger this.editor.setValue(dateStr); this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, - + setValue: function (v) { var type, value; var date = BI.getDate(); @@ -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, diff --git a/src/widget/month/trigger.month.js b/src/widget/month/trigger.month.js index 4176fcb45..4fa800603 100644 --- a/src/widget/month/trigger.month.js +++ b/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); diff --git a/src/widget/multiselect/trigger/button.checkselected.js b/src/widget/multiselect/trigger/button.checkselected.js index d3b485127..1eb6f12f1 100644 --- a/src/widget/multiselect/trigger/button.checkselected.js +++ b/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()); }); diff --git a/src/widget/multiselect/trigger/editor.multiselect.js b/src/widget/multiselect/trigger/editor.multiselect.js index 19932b8af..04089eaf9 100644 --- a/src/widget/multiselect/trigger/editor.multiselect.js +++ b/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", @@ -63,7 +59,7 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, { return v[v.length - 1]; } return ""; - + }, getKeywords: function () { diff --git a/src/widget/multitree/trigger/multi.tree.button.checkselected.js b/src/widget/multitree/trigger/multi.tree.button.checkselected.js index e535f8b03..4ee85fa20 100644 --- a/src/widget/multitree/trigger/multi.tree.button.checkselected.js +++ b/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 }); diff --git a/src/widget/quarter/trigger.quarter.js b/src/widget/quarter/trigger.quarter.js index 3c6ac3b86..6afd8c49d 100644 --- a/src/widget/quarter/trigger.quarter.js +++ b/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); diff --git a/src/widget/singleselect/trigger/editor.singleselect.js b/src/widget/singleselect/trigger/editor.singleselect.js index 79dcf3c9b..43059ef65 100644 --- a/src/widget/singleselect/trigger/editor.singleselect.js +++ b/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", @@ -63,7 +59,7 @@ BI.SingleSelectEditor = BI.inherit(BI.Widget, { return v[v.length - 1]; } return ""; - + }, getKeywords: function () { diff --git a/src/widget/year/trigger.year.js b/src/widget/year/trigger.year.js index 550210988..ac30fedf1 100644 --- a/src/widget/year/trigger.year.js +++ b/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 () { @@ -105,7 +103,7 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, { this.editor.setValue(dateStr); this.setTitle(BI.isEmptyString(text) ? dateStr : (text + ":" + dateStr)); }, - + setValue: function (v) { var type, value; var date = BI.getDate(); diff --git a/src/widget/yearmonth/trigger.yearmonth.js b/src/widget/yearmonth/trigger.yearmonth.js index cb4673061..4b3892302 100644 --- a/src/widget/yearmonth/trigger.yearmonth.js +++ b/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, diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js index 9f9312916..edc0c20a0 100644 --- a/src/widget/yearquarter/trigger.yearquarter.js +++ b/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,