jingrow/air-datepicker
1
0
Fork 0
mirror of https://github.com/frappe/air-datepicker.git synced 2026-01-14 11:01:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed firstDay option, add destroy method

Browse Source
This commit is contained in:
t1m0n 2015-12-17 14:30:00 +03:00
parent 49452a4820
commit df9bb895db
3 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dist/js/datepicker.js vendored
View File

@ -172,16 +172,16 @@ var Datepicker;
}, },
_bindEvents : function () { _bindEvents : function () {
this.$el.on(this.opts.showEvent, this._onShowEvent.bind(this)); this.$el.on(this.opts.showEvent + '.adp', this._onShowEvent.bind(this));
this.$el.on('blur', this._onBlur.bind(this)); this.$el.on('blur.adp', this._onBlur.bind(this));
this.$el.on('input', this._onInput.bind(this)); this.$el.on('input.adp', this._onInput.bind(this));
$(window).on('resize', this._onResize.bind(this)); $(window).on('resize.adp', this._onResize.bind(this));
}, },
_bindKeyboardEvents: function () { _bindKeyboardEvents: function () {
this.$el.on('keydown', this._onKeyDown.bind(this)); this.$el.on('keydown.adp', this._onKeyDown.bind(this));
this.$el.on('keyup', this._onKeyUp.bind(this)); this.$el.on('keyup.adp', this._onKeyUp.bind(this));
this.$el.on('hotKey', this._onHotKey.bind(this)); this.$el.on('hotKey.adp', this._onHotKey.bind(this));
}, },
isWeekend: function (day) { isWeekend: function (day) {
@ -205,7 +205,7 @@ var Datepicker;
this.loc.dateFormat = this.opts.dateFormat this.loc.dateFormat = this.opts.dateFormat
} }
if (this.opts.firstDay != undefined) { if (this.opts.firstDay !== '') {
this.loc.firstDay = this.opts.firstDay this.loc.firstDay = this.opts.firstDay
} }
}, },
@ -511,14 +511,15 @@ var Datepicker;
_setInputValue: function () { _setInputValue: function () {
var _this = this, var _this = this,
format = this.loc.dateFormat, opts = _this.opts,
altFormat = this.opts.altFieldDateFormat, format = _this.loc.dateFormat,
value = this.selectedDates.map(function (date) { altFormat = opts.altFieldDateFormat,
value = _this.selectedDates.map(function (date) {
return _this.formatDate(format, date) return _this.formatDate(format, date)
}), }),
altValues; altValues;
if (this.$altField) { if (opts.altField && _this.$altField.length) {
altValues = this.selectedDates.map(function (date) { altValues = this.selectedDates.map(function (date) {
return _this.formatDate(altFormat, date) return _this.formatDate(altFormat, date)
}); });
@ -885,6 +886,26 @@ var Datepicker;
return $cell.length ? $cell : ''; return $cell.length ? $cell : '';
}, },
destroy: function () {
var _this = this;
_this.$el
.off('.adp')
.data('datepicker', '');
_this.selectedDates = [];
_this.focused = '';
_this.views = {};
_this.keys = [];
_this.minRange = '';
_this.maxRange = '';
if (_this.opts.inline || !_this.elIsInput) {
_this.$datepicker.closest('.datepicker-inline').remove();
} else {
_this.$datepicker.remove();
}
},
_onShowEvent: function () { _onShowEvent: function () {
if (!this.visible) { if (!this.visible) {
this.show(); this.show();
@ -922,7 +943,6 @@ var Datepicker;
_onKeyDown: function (e) { _onKeyDown: function (e) {
var code = e.which; var code = e.which;
this._registerKey(code); this._registerKey(code);
// Arrows // Arrows

2
dist/js/datepicker.min.js vendored
View File

File diff suppressed because one or more lines are too long

46
src/js/datepicker.js
View File

@ -172,16 +172,16 @@ var Datepicker;
}, },
_bindEvents : function () { _bindEvents : function () {
this.$el.on(this.opts.showEvent, this._onShowEvent.bind(this)); this.$el.on(this.opts.showEvent + '.adp', this._onShowEvent.bind(this));
this.$el.on('blur', this._onBlur.bind(this)); this.$el.on('blur.adp', this._onBlur.bind(this));
this.$el.on('input', this._onInput.bind(this)); this.$el.on('input.adp', this._onInput.bind(this));
$(window).on('resize', this._onResize.bind(this)); $(window).on('resize.adp', this._onResize.bind(this));
}, },
_bindKeyboardEvents: function () { _bindKeyboardEvents: function () {
this.$el.on('keydown', this._onKeyDown.bind(this)); this.$el.on('keydown.adp', this._onKeyDown.bind(this));
this.$el.on('keyup', this._onKeyUp.bind(this)); this.$el.on('keyup.adp', this._onKeyUp.bind(this));
this.$el.on('hotKey', this._onHotKey.bind(this)); this.$el.on('hotKey.adp', this._onHotKey.bind(this));
}, },
isWeekend: function (day) { isWeekend: function (day) {
@ -205,7 +205,7 @@ var Datepicker;
this.loc.dateFormat = this.opts.dateFormat this.loc.dateFormat = this.opts.dateFormat
} }
if (this.opts.firstDay != undefined) { if (this.opts.firstDay !== '') {
this.loc.firstDay = this.opts.firstDay this.loc.firstDay = this.opts.firstDay
} }
}, },
@ -511,14 +511,15 @@ var Datepicker;
_setInputValue: function () { _setInputValue: function () {
var _this = this, var _this = this,
format = this.loc.dateFormat, opts = _this.opts,
altFormat = this.opts.altFieldDateFormat, format = _this.loc.dateFormat,
value = this.selectedDates.map(function (date) { altFormat = opts.altFieldDateFormat,
value = _this.selectedDates.map(function (date) {
return _this.formatDate(format, date) return _this.formatDate(format, date)
}), }),
altValues; altValues;
if (this.$altField) { if (opts.altField && _this.$altField.length) {
altValues = this.selectedDates.map(function (date) { altValues = this.selectedDates.map(function (date) {
return _this.formatDate(altFormat, date) return _this.formatDate(altFormat, date)
}); });
@ -885,6 +886,26 @@ var Datepicker;
return $cell.length ? $cell : ''; return $cell.length ? $cell : '';
}, },
destroy: function () {
var _this = this;
_this.$el
.off('.adp')
.data('datepicker', '');
_this.selectedDates = [];
_this.focused = '';
_this.views = {};
_this.keys = [];
_this.minRange = '';
_this.maxRange = '';
if (_this.opts.inline || !_this.elIsInput) {
_this.$datepicker.closest('.datepicker-inline').remove();
} else {
_this.$datepicker.remove();
}
},
_onShowEvent: function () { _onShowEvent: function () {
if (!this.visible) { if (!this.visible) {
this.show(); this.show();
@ -922,7 +943,6 @@ var Datepicker;
_onKeyDown: function (e) { _onKeyDown: function (e) {
var code = e.which; var code = e.which;
this._registerKey(code); this._registerKey(code);
// Arrows // Arrows