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

clear date & datetime when showbuttons=false, fix

Browse Source
This commit is contained in:
vitalets 2013-04-02 21:32:29 +04:00
parent ca14bed8e3
commit 21a6148f8d
5 changed files with 96 additions and 3 deletions

3
CHANGELOG.txt

@ -4,7 +4,8 @@ X-editable changelog
Version 1.4.4 wip
----------------------------
[bug #166] clear button forinput type = number (vitalets)
[bug #171] clear in date & datetime when showbuttons=false (vitalets)
[bug #166] clear button for input type=number (vitalets)
[bug] checklist don't show checked for single value (vitalets)
[enh #188] added bootstrap datetime (adeg, vitalets)
[bug] editable-poshytip on inline mode tries to write in $.Poshytip (vitalets)

3
src/inputs/date/date.js

@ -108,6 +108,9 @@ $(function(){
clear: function() {
this.$input.data('datepicker').date = null;
this.$input.find('.active').removeClass('active');
if(!this.options.showbuttons) {
this.$input.closest('form').submit();
}
},
autosubmit: function() {

3
src/inputs/datetime/datetime.js

@ -132,6 +132,9 @@ $(function(){
clear: function() {
this.$input.data('datetimepicker').date = null;
this.$input.find('.active').removeClass('active');
if(!this.options.showbuttons) {
this.$input.closest('form').submit();
}
},
autosubmit: function() {

43
test/unit/date.js

@ -148,7 +148,7 @@ $(function () {
ok(!p.is(':visible'), 'popover closed');
});
asyncTest("clear button", function () {
asyncTest("clear button (showbuttons: true)", function () {
var d = '15.05.1984',
e = $('<a href="#" data-type="date" data-pk="1" data-url="post-date-clear.php">'+d+'</a>').appendTo(fx).editable({
format: f,
@ -189,5 +189,46 @@ $(function () {
}, timeout);
});
asyncTest("clear button (showbuttons: false)", function () {
var d = '15.05.1984',
e = $('<a href="#" data-type="date" data-pk="1" data-url="post-date-clear1.php">'+d+'</a>').appendTo(fx).editable({
format: f,
clear: 'abc',
showbuttons: false
});
$.mockjax({
url: 'post-date-clear1.php',
response: function(settings) {
equal(settings.data.value, '', 'submitted value correct');
}
});
equal(frmt(e.data('editable').value, 'dd.mm.yyyy'), d, 'value correct');
e.click();
var p = tip(e);
ok(p.find('.datepicker').is(':visible'), 'datepicker exists');
equal(frmt(e.data('editable').value, f), d, 'day set correct');
equal(p.find('td.day.active').text(), 15, 'day shown correct');
var clear = p.find('.editable-clear a');
equal(clear.text(), 'abc', 'clear link shown');
//click clear
clear.click();
setTimeout(function() {
ok(!p.is(':visible'), 'popover closed');
equal(e.data('editable').value, null, 'null saved to value');
equal(e.text(), e.data('editable').options.emptytext, 'empty text shown');
e.remove();
start();
}, timeout);
});
});

47
test/unit/datetime.js

@ -162,7 +162,7 @@ $(function () {
ok(!p.is(':visible'), 'popover closed');
});
asyncTest("clear button", function () {
asyncTest("clear button (showbuttons: true)", function () {
var d = '15.05.1984 16:40',
e = $('<a href="#" data-type="datetime" data-pk="1" data-url="post-datetime-clear.php">'+d+'</a>').appendTo(fx).editable({
format: f,
@ -210,4 +210,49 @@ $(function () {
});
asyncTest("clear button (showbuttons: false)", function () {
var d = '15.05.1984 16:40',
e = $('<a href="#" data-type="datetime" data-pk="1" data-url="post-datetime-clear1.php">'+d+'</a>').appendTo(fx).editable({
format: f,
clear: 'abc'
});
$.mockjax({
url: 'post-datetime-clear1.php',
response: function(settings) {
equal(settings.data.value, '', 'submitted value correct');
}
});
equal(frmt(e.data('editable').value, 'dd.mm.yyyy hh:ii'), d, 'value correct');
e.click();
var p = tip(e);
ok(p.find('.datetimepicker').is(':visible'), 'datetimepicker exists');
equal(frmt(e.data('editable').value, f), d, 'day set correct');
equal(p.find('td.day.active').text(), 15, 'day shown correct');
var clear = p.find('.editable-clear a');
equal(clear.text(), 'abc', 'clear link shown');
//click clear
clear.click();
setTimeout(function() {
ok(!p.is(':visible'), 'popover closed');
equal(e.data('editable').value, null, 'null saved to value');
equal(e.text(), e.data('editable').options.emptytext, 'empty text shown');
//reopen popover
e.click();
p = tip(e);
ok(p.find('.datetimepicker').is(':visible'), 'datetimepicker exists');
e.remove();
start();
}, timeout);
});
});