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

datetimefield test ready

Browse Source
This commit is contained in:
vitalets 2013-04-02 13:55:49 +04:00
parent 2778630c7b
commit a2b5f4140d
5 changed files with 139 additions and 8 deletions

10
grunt.js

@ -16,13 +16,15 @@ function getFiles() {
inputs+'date/datefield.js',
inputs+'date/bootstrap-datepicker/js/bootstrap-datepicker.js',
inputs+'datetime/datetime.js',
inputs+'datetime/datetimefield.js',
inputs+'datetime/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js',
inputs+'datetime/datetimefield.js',
//don't build datetime lib, should be included manually
//inputs+'datetime/bootstrap-datetimepicker/js/bootstrap-datetimepicker.js',
inputs+'typeahead.js'
],
css: [
inputs+'date/bootstrap-datepicker/css/datepicker.css',
inputs+'datetime/bootstrap-datetimepicker/css/datetimepicker.css'
inputs+'date/bootstrap-datepicker/css/datepicker.css'
//don't build datetime lib, should be included manually
//inputs+'datetime/bootstrap-datetimepicker/css/datetimepicker.css'
]
},
jqueryui: {

2
package.json

@ -2,7 +2,7 @@
"name": "X-editable",
"title": "X-editable",
"description": "In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery",
"version": "1.4.3",
"version": "1.4.4",
"homepage": "http://github.com/vitalets/x-editable",
"author": {
"name": "Vitaliy Potapov",

3
src/inputs/datetime/datetime.js

@ -7,8 +7,9 @@ and set `language` option.
@class datetime
@extends abstractinput
@final
@since 1.4.4
@example
<a href="#" id="last_seen" data-type="datetime" data-pk="1" data-url="/post" data-original-title="Select date & time">15/03/2013 12:45</a>
<a href="#" id="last_seen" data-type="datetime" data-pk="1" data-url="/post" title="Select date & time">15/03/2013 12:45</a>
<script>
$(function(){
$('#last_seen').editable({

4
src/inputs/datetime/datetimefield.js

@ -1,5 +1,5 @@
/**
Bootstrap datetimefield input - modification for inline mode.
Bootstrap datetimefield input - datetime input for inline mode.
Shows normal <input type="text"> and binds popup datetimepicker.
Automatically shown in inline mode.
@ -60,7 +60,7 @@ Automatically shown in inline mode.
tpl:'<div class="input-append date"><input type="text"/><span class="add-on"><i class="icon-th"></i></span></div>',
/**
@property inputclass
@default 'input-small'
@default 'input-medium'
**/
inputclass: 'input-medium',

128
test/unit/datetimefield.js Normal file

@ -0,0 +1,128 @@
$(function () {
var dpg, f = 'dd.mm.yyyy hh:ii', mode;
module("datetimefield", {
setup: function(){
fx = $('#async-fixture');
dpg = $.fn.datetimepicker.DPGlobal;
$.support.transition = false;
mode = $.fn.editable.defaults.mode;
$.fn.editable.defaults.mode = 'inline';
},
teardown: function() {
//restore mode
$.fn.editable.defaults.mode = mode;
}
});
function frmt(date, format) {
//convert to utc
date = $.fn.editabletypes.datetime.prototype.toUTC(date);
return dpg.formatDate(date, dpg.parseFormat(format, 'standard'), 'en', 'standard');
}
asyncTest("container should contain datetimepicker with value and save new entered date", function () {
$.fn.editabletypes.datetimefield.defaults.datetimepicker.weekStart = 1;
var d = '15.05.1984 20:30',
e = $('<a href="#" data-type="datetime" data-pk="1" data-url="post-datetimefield">'+d+'</a>').appendTo(fx).editable({
format: f,
datetimepicker: {
}
}),
nextD = '16.05.1984 21:35';
$.mockjax({
url: 'post-datetimefield',
response: function(settings) {
equal(settings.data.value, nextD, 'submitted value correct');
}
});
//testing func, run twice!
var func = function() {
var df = $.Deferred();
equal(frmt(e.data('editable').value, 'dd.mm.yyyy hh:ii'), d, 'value correct');
e.click();
var cont = tip(e);
//check input
ok(cont.find('input[type="text"]').is(':visible'), 'input exists');
equal(cont.find('input').val(), d, 'value set correct');
//open picker
cont.find('span.add-on').click();
var p = cont.find('span.add-on').parent().data().datetimepicker.picker;
//check date in picker
ok(p.is(':visible'), 'datetimepicker exists');
equal(p.length, 1, 'datetimepicker single');
ok(p.find('.datetimepicker-days').is(':visible'), 'datetimepicker days visible');
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('th.dow').eq(0).text(), 'Mo', 'weekStart correct');
//set new day
p.find('.day.active').next().click();
//hours appeared?
ok(p.find('.datetimepicker-hours').is(':visible'), 'datetimepicker hours visible');
//set hours 21
p.find('.hour.active').next().click();
//minutes appeared?
ok(p.find('.datetimepicker-minutes').is(':visible'), 'datetimepicker minutes visible');
//set minutes 21:35
p.find('.minute.active').next().click();
//submit
cont.find('form').submit();
setTimeout(function() {
ok(!cont.is(':visible'), 'popover closed');
equal(frmt(e.data('editable').value, f), nextD, 'new date saved to value');
equal(e.text(), nextD, 'new text shown');
df.resolve();
}, timeout);
return df.promise();
};
$.when(func()).then(function() {
e.editable('setValue', d, true);
$.when(func()).then(function() {
e.remove();
start();
});
});
});
test("viewformat, init by text", function () {
var dview = '15/05/1984 11:50',
d = '1984-05-15 11:50',
e = $('<a href="#" data-type="datetime" data-pk="1">'+dview+'</a>').appendTo('#qunit-fixture').editable({
format: 'yyyy-mm-dd hh:ii',
viewformat: 'dd/mm/yyyy hh:ii',
datetimepicker: {
}
});
equal(frmt(e.data('editable').value, 'yyyy-mm-dd hh:ii'), d, 'value correct');
});
test("viewformat, init by value", function () {
var dview = '15/05/1984 15:45',
d = '1984-05-15 15:45',
e = $('<a href="#" data-type="datetime" data-pk="1" data-format="yyyy-mm-dd hh:ii" data-viewformat="dd/mm/yyyy hh:ii" data-value="'+d+'"></a>').appendTo('#qunit-fixture').editable();
equal(frmt(e.data('editable').value, 'yyyy-mm-dd hh:ii'), d, 'value correct');
equal(e.text(), dview, 'text correct');
});
});