Merge pull request #969 from marmelab/fix_datepicker

[RFR] Fix Datepicker JS error
marmelab · Mar 21, 2016 · b8cb1b9 · b8cb1b9
2 parents d40ab91 + 88e9493
commit b8cb1b9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 32 deletions.
diff --git a/src/javascripts/ng-admin/Crud/CrudModule.js b/src/javascripts/ng-admin/Crud/CrudModule.js
@@ -21,7 +21,6 @@ CrudModule.service('RestWrapper', require('./misc/RestWrapper'));
 
 CrudModule.directive('maJsonValidator', require('./validator/maJsonValidator'));
 
-CrudModule.directive('uibDatepickerPopup', require('./field/datepickerPopup'));
 CrudModule.directive('maField', require('./field/maField'));
 CrudModule.directive('maButtonField', require('./field/maButtonField'));
 CrudModule.directive('maChoiceField', require('./field/maChoiceField'));

diff --git a/src/javascripts/ng-admin/Crud/field/datepickerPopup.js b/src/javascripts/ng-admin/Crud/field/datepickerPopup.js
diff --git a/src/javascripts/ng-admin/Crud/field/maDateField.js b/src/javascripts/ng-admin/Crud/field/maDateField.js
@@ -13,7 +13,7 @@ export default function maDateField() {
         link: function(scope, element) {
             var field = scope.field();
             scope.name = field.name();
-            scope.rawValue = scope.value;
+            scope.rawValue = scope.value == null ? new Date() : (scope.value instanceof Date ? scope.value : new Date(scope.value));
             scope.$watch('rawValue', function(rawValue) {
                 scope.value = field.parse()(rawValue);
             });

diff --git a/src/javascripts/test/unit/Crud/field/maDateFieldSpec.js b/src/javascripts/test/unit/Crud/field/maDateFieldSpec.js
@@ -3,12 +3,10 @@ describe('directive: date-field', function() {
     'use strict';
 
     var dateDirective = require('../../../../ng-admin/Crud/field/maDateField');
-    var datepickerPopupDirective = require('../../../../ng-admin/Crud/field/datepickerPopup');
     var DateField = require('admin-config/lib/Field/DateField');
 
     angular.module('testapp_DateField', ['ui.bootstrap', 'ui.bootstrap.tpls'])
-        .directive('maDateField', dateDirective)
-        .directive('datepickerPopup', datepickerPopupDirective);
+        .directive('maDateField', dateDirective);
 
     var $compile,
         scope,