diff --git a/src/widget/dynamicdate/dynamicdate.card.js b/src/widget/dynamicdate/dynamicdate.card.js index 41598d7aa..acc9b6afe 100644 --- a/src/widget/dynamicdate/dynamicdate.card.js +++ b/src/widget/dynamicdate/dynamicdate.card.js @@ -389,6 +389,10 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, { return this.checkValidation() ? this._getValue() : {}; }, + getInputValue: function () { + return this._getValue(); + }, + checkValidation: function (show) { var buttons = this.resultPane.getAllButtons(); var errorText; diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js index 3ec959b0e..0c4052e0c 100644 --- a/src/widget/dynamicdate/dynamicdate.popup.js +++ b/src/widget/dynamicdate/dynamicdate.popup.js @@ -178,7 +178,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, { this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today")); this.todayButton.setEnable(!this._checkTodayValid()); } else { - var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue()); + var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getInputValue()); date = BI.print(date, "%Y-%X-%d"); this.todayButton.setValue(date); this.todayButton.setEnable(false); diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js index f38528f36..701320eb3 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js @@ -181,7 +181,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, { this.todayButton.setValue(BI.i18nText("BI-Multi_Date_Today")); this.todayButton.setEnable(!this._checkTodayValid()); } else { - var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getValue()); + var date = BI.DynamicDateHelper.getCalculation(this.dynamicPane.getInputValue()); date = BI.print(date, "%Y-%X-%d"); this.todayButton.setValue(date); this.todayButton.setEnable(false);