combodate ready

test/loader.js

@@ -31,6 +31,7 @@ define(function () {
                         loadCss(require.toUrl("./editable-element.css")); 
                     }                         
                 },
+                //default inputs
                 'editable-form/editable-form': {
                     deps: ['require',
                     'inputs/text',
@@ -38,6 +39,7 @@ define(function () {
                     'inputs/select',
                     'inputs/checklist',
                     'inputs/html5types',
+                    'inputs/combodate/combodate',
                     'inputs-ext/address/address'],
                     init: function(require) {
                         loadCss(require.toUrl("./editable-form.css")); 
@@ -49,7 +51,8 @@ define(function () {
                 'inputs/text': ['inputs/abstract'],
                 'inputs/textarea': ['inputs/abstract'],
                 'inputs/abstract': ['editable-form/editable-form-utils'],   
-                'inputs/html5types': ['inputs/text'],   
+                'inputs/html5types': ['inputs/text'], 
+                'inputs/combodate/combodate': ['inputs/abstract', 'inputs/combodate/lib/combodate', 'inputs/combodate/lib/moment.min'],  
 
                 /*
                  bootstrap

test/main.js

@@ -44,7 +44,8 @@ require(["loader", jqurl], function(loader) {
             'test/unit/text',
             'test/unit/textarea',
             'test/unit/select',
-            'test/unit/checklist'
+            'test/unit/checklist',
+            'test/unit/combodate'
        ];
        tests = tests.concat(custom);
        tests.push('test/unit/api');

test/unit/combodate.js

@@ -0,0 +1,107 @@
+$(function () {         
+   
+   //formats
+   var 
+     fd = 'DD.MM.YYYY', vfd = 'DD-MM-YYYY', vd = '15-05-1984',
+     fdt = 'DD-MM-YYYY hh:mm:ss A', vfdt = 'DD MMM YYYY h:m:s a', vdt = '15-05-1984 08:20:30 PM';
+
+   
+   module("combodate", {
+        setup: function(){
+            fx = $('#async-fixture');
+            $.support.transition = false;
+        }        
+    });
+    
+    asyncTest("container should contain combodate and save new value (date)", function () {
+        
+        var  e = $('<a href="#" data-type="combodate" data-pk="1" data-url="/combodate">'+vd+'</a>').appendTo(fx).editable({
+                format: fd,
+                viewformat: vfd,
+                template: fd
+            }),
+            m = moment(vd, vfd);
+        
+          $.mockjax({
+              url: '/combodate',
+              response: function(settings) {
+                  equal(settings.data.value, m.format(fd), 'submitted value correct');            
+              }
+          });
+       
+        equal(e.data('editable').value.format(fd), m.format(fd), 'init value correct');
+            
+        e.click();
+        var p = tip(e);
+        ok(p.find('.combodate').is(':visible'), 'combodate exists');
+        equal(p.find('.day, .month, .year, .hour, .minute').length, 3, 'combos correct');        
+        
+        equal(p.find('.day').val(), m.date(), 'day set correct');
+        equal(p.find('.month').val(), m.month(), 'month set correct');
+        equal(p.find('.year').val(), m.year(), 'year set correct');
+
+        //set new day
+        p.find('.day').val(16).trigger('change');
+        m.date(16);
+        p.find('form').submit();
+    
+        setTimeout(function() {          
+           ok(!p.is(':visible'), 'container closed');
+           equal(e.data('editable').value.format(fd), m.format(fd), 'new value correct');
+           equal(e.text(), m.format(vfd), 'new text correct');            
+           e.remove();    
+           start();  
+        }, timeout); 
+        
+     });  
+     
+    asyncTest("container should contain combodate and save new value (datetime)", function () {
+        
+        var  e = $('<a href="#" data-type="combodate" data-pk="1" data-url="/combodate-dt" data-value="'+vdt+'"></a>').appendTo(fx).editable({
+                format: fdt,
+                viewformat: vfdt,
+                template: fdt
+            }),
+            m = moment(vdt, fdt);
+
+          $.mockjax({
+              url: '/combodate-dt',
+              response: function(settings) {
+                  equal(settings.data.value, m.format(fdt), 'submitted value correct');            
+              }
+          });
+       
+        equal(e.data('editable').value.format(fdt), m.format(fdt), 'init value correct');
+        equal(e.text(), m.format(vfdt), 'init text correct');            
+            
+        e.click();
+        var p = tip(e);
+        ok(p.find('.combodate').is(':visible'), 'combodate exists');
+        equal(p.find('.day, .month, .year, .hour, .minute, .second, .ampm').length, 7, 'combos correct');        
+        
+        equal(p.find('.day').val(), m.date(), 'day set correct');
+        equal(p.find('.month').val(), m.month(), 'month set correct');
+        equal(p.find('.year').val(), m.year(), 'year set correct');
+        equal(p.find('.hour').val(), m.hours()-12, 'hour set correct');
+        equal(p.find('.minute').val(), m.minutes(), 'minute set correct');
+        equal(p.find('.second').val(), m.seconds(), 'second set correct');
+        equal(p.find('.ampm').val(), 'pm', 'ampm set correct');
+
+        //set new day
+        p.find('.day').val(16).trigger('change');
+        p.find('.hour').val(9).trigger('change');
+        m.date(16);
+        m.hours(21);
+        p.find('form').submit();
+    
+        setTimeout(function() {          
+           ok(!p.is(':visible'), 'container closed');
+           equal(e.data('editable').value.format(fdt), m.format(fdt), 'new value correct');
+           equal(e.text(), m.format(vfdt), 'new text correct');            
+           e.remove();    
+           start();  
+        }, timeout); 
+        
+     });       
+
+});