Browse Source

Merge pull request #382 in FUI/fineui from ~WINDY/fui:master to master

* commit '57f463ae6481fbd7808004a47530675ce9c8858c':
  update
  BI-19889
  update
es6
guy 7 years ago
parent
commit
565072e987
  1. 28
      dist/_fineui.min.js
  2. 7
      dist/bundle.js
  3. 28
      dist/bundle.min.js
  4. 7
      dist/fineui.js
  5. 28
      dist/fineui.min.js
  6. 7
      dist/widget.js
  7. 1
      src/widget/datepane/card.static.datepane.js
  8. 2
      src/widget/datetimepane/card.static.datetimepane.js
  9. 2
      src/widget/yearmonth/trigger.yearmonth.js
  10. 2
      src/widget/yearquarter/trigger.yearquarter.js

28
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/bundle.js vendored

@ -88599,6 +88599,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
};
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({
@ -89322,7 +89323,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
});
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
self.fireEvent("EVENT_CHANGE");
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({
@ -109478,7 +109479,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearMonthTrigger.EVENT_CONFIRM);
@ -110418,7 +110419,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.quarterEditor.focus();

28
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/fineui.js vendored

@ -88842,6 +88842,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
};
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({
@ -89565,7 +89566,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
});
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
self.fireEvent("EVENT_CHANGE");
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({
@ -109721,7 +109722,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearMonthTrigger.EVENT_CONFIRM);
@ -110661,7 +110662,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.quarterEditor.focus();

28
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

7
dist/widget.js vendored

@ -1132,6 +1132,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
};
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({
@ -1855,7 +1856,7 @@ BI.shortcut("bi.date_time_trigger", BI.DateTimeTrigger);BI.StaticDateTimePaneCar
});
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
self.fireEvent("EVENT_CHANGE");
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({
@ -22011,7 +22012,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearMonthTrigger.EVENT_CONFIRM);
@ -22951,7 +22952,7 @@ BI.shortcut("bi.dynamic_year_quarter_popup", BI.DynamicYearQuarterPopup);BI.Dyna
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.quarterEditor.focus();

1
src/widget/datepane/card.static.datepane.js

@ -43,6 +43,7 @@ BI.StaticDatePaneCard = BI.inherit(BI.Widget, {
};
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({

2
src/widget/datetimepane/card.static.datetimepane.js

@ -40,7 +40,7 @@ BI.StaticDateTimePaneCard = BI.inherit(BI.Widget, {
});
self.calendar.setSelect(BI.Calendar.getPageByDateJSON(self.selectedTime));
self.calendar.setValue(self.selectedTime);
self.fireEvent("EVENT_CHANGE");
day !== 0 && self.fireEvent(BI.DateCalendarPopup.EVENT_CHANGE);
});
this.calendar = BI.createWidget({

2
src/widget/yearmonth/trigger.yearmonth.js

@ -167,7 +167,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.fireEvent(BI.DynamicYearMonthTrigger.EVENT_CONFIRM);

2
src/widget/yearquarter/trigger.yearquarter.js

@ -133,7 +133,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
_autoSwitch: function (editor) {
var v = editor.getValue();
if (BI.checkDateLegal(v)) {
if (BI.isNotEmptyString(v) && BI.checkDateLegal(v)) {
if (v.length === 4 && this._yearCheck(v)) {
this._doEditorConfirm(editor);
this.quarterEditor.focus();

Loading…
Cancel
Save