tracer/x-editable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix incorrectly shown datepicker in jquery 1.7.1

Browse Source
This commit is contained in:
vitalets
2012-12-06 14:59:55 +04:00
parent 9d7b75d3d5
commit 34e3f1a277
3 changed files with 15 additions and 6 deletions
src
editable-form
editable-form.js
inputs
date
bootstrap-datepicker
js
bootstrap-datepicker.js
test/unit
date.js

3
src/editable-form/editable-form.js

@ -84,10 +84,9 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.
//append form to container //append form to container
this.$div.append(this.$form); this.$div.append(this.$form);
//attach 'cancel' handler //attach 'cancel' handler
this.$form.find('.editable-cancel').click($.proxy(this.cancel, this)); this.$form.find('.editable-cancel').click($.proxy(this.cancel, this));
// this.$form.find('.editable-buttons button').eq(1).click($.proxy(this.cancel, this));
if(this.input.error) { if(this.input.error) {
this.error(this.input.error); this.error(this.input.error);

14
src/inputs/date/bootstrap-datepicker/js/bootstrap-datepicker.js vendored

@ -655,7 +655,17 @@
if (dir) { if (dir) {
this.viewMode = Math.max(0, Math.min(2, this.viewMode + dir)); this.viewMode = Math.max(0, Math.min(2, this.viewMode + dir));
} }
this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show(); /*
vitalets: fixing bug of very special conditions:
jquery 1.7.1 + webkit + show inline datepicker in bootstrap popover.
Method show() does not set display css correctly and datepicker is not shown.
Changed to .css('display', 'block') solve the problem.
See https://github.com/vitalets/x-editable/issues/37
In jquery 1.7.2+ everything works fine.
*/
//this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).show();
this.picker.find('>div').hide().filter('.datepicker-'+DPGlobal.modes[this.viewMode].clsName).css('display', 'block');
this.updateNavArrows(); this.updateNavArrows();
} }
}; };
@ -773,7 +783,7 @@
val, filtered, part; val, filtered, part;
setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m']; setters_map['M'] = setters_map['MM'] = setters_map['mm'] = setters_map['m'];
setters_map['dd'] = setters_map['d']; setters_map['dd'] = setters_map['d'];
date = UTCDate(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate(), 0, 0, 0); date = UTCDate(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0);
if (parts.length == format.parts.length) { if (parts.length == format.parts.length) {
for (var i=0, cnt = format.parts.length; i < cnt; i++) { for (var i=0, cnt = format.parts.length; i < cnt; i++) {
val = parseInt(parts[i], 10); val = parseInt(parts[i], 10);

4
test/unit/date.js

@ -14,8 +14,6 @@ $(function () {
} }
asyncTest("container should contain datepicker with value and save new entered date", function () { asyncTest("container should contain datepicker with value and save new entered date", function () {
expect(9);
$.fn.editabletypes.date.defaults.datepicker.weekStart = 1; $.fn.editabletypes.date.defaults.datepicker.weekStart = 1;
var d = '15.05.1984', var d = '15.05.1984',
@ -39,8 +37,10 @@ $(function () {
e.click(); e.click();
var p = tip(e); var p = tip(e);
ok(p.find('.datepicker').is(':visible'), 'datepicker exists'); ok(p.find('.datepicker').is(':visible'), 'datepicker exists');
ok(p.find('.datepicker').find('.datepicker-days').is(':visible'), 'datepicker days visible');
equal(frmt(e.data('editable').value, f), d, 'day set correct'); equal(frmt(e.data('editable').value, f), d, 'day set correct');
ok(p.find('td.day.active').is(':visible'), 'active day is visible');
equal(p.find('td.day.active').text(), 15, 'day shown correct'); equal(p.find('td.day.active').text(), 15, 'day shown correct');
equal(p.find('th.dow').eq(0).text(), 'Mo', 'weekStart correct'); equal(p.find('th.dow').eq(0).text(), 'Mo', 'weekStart correct');