Added support for minDate and maxDate

davidlgj · davidlgj · commit 69be5e6805bf · 2014-06-23T13:48:35.000+02:00
diff --git a/lib/pickadate/translations/sv_SE.js b/lib/pickadate/translations/sv_SE.js
diff --git a/src/bootstrap-example.html b/src/bootstrap-example.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="test">
 <head>
+  <meta charset="utf-8">
   <title>Boostrap Schema Form example</title>
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
   <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css">
@@ -65,7 +66,7 @@ <h3>Schema</h3>
 angular.module('test',['schemaForm','ui.ace']);
 
 function TestCtrl($scope){
-  $scope.person = { favorite: 'NaN', date: '2014-06-03' };
+  $scope.person = { favorite: 'NaN' };
 
   $scope.schema =  {
     "type": "object",
@@ -170,7 +171,7 @@ <h3>Schema</h3>
         { key: "soulserial", placeholder: "ex. 666" }
       ]
     },
-    "date",
+    { key: "date", minDate: "2014-06-20" },
     { key: "radio", type: "radios" },
     { key: "radiobuttons", type: "radiobuttons" },
     {
diff --git a/src/directives/angular-pickdate.js b/src/directives/angular-pickdate.js
@@ -1,4 +1,18 @@
 angular.module('ng').directive('pickADate', function () {
+
+  //String dates for min and max is not supported
+  //https://github.com/amsul/pickadate.js/issues/439
+  //So strings we create dates from
+  var formatDate = function(value) {
+    //Strings or timestamps we make a date of
+    if (angular.isString(value) || angular.isNumber(value)) {
+      return new Date(value);
+    }
+    return value; //We hope it's a date object
+  }
+
+
+
   return {
     restrict: "A",
     require: 'ngModel',
@@ -51,14 +65,11 @@ angular.module('ng').directive('pickADate', function () {
         return picker.get('select',attrs.format || defaultFormat);
       });
 
-      picker.set('min', scope.minDate ? scope.minDate : false);
-      picker.set('max', scope.maxDate ? scope.maxDate : false);
-
       //bind once.
       if (angular.isDefined(attrs.minDate)) {
         var onceMin = scope.$watch('minDate', function (value) {
           if (value) {
-            picker.set('min', value);
+            picker.set('min', formatDate(value));
             onceMin();
           }
         }, true);
@@ -67,7 +78,7 @@ angular.module('ng').directive('pickADate', function () {
       if (angular.isDefined(attrs.maxDate)) {
         var onceMax = scope.$watch('maxDate', function (value) {
           if (value) {
-            picker.set('max', value);
+            picker.set('max', formatDate(value));
             onceMax();
           }
         }, true);
diff --git a/src/directives/decorators/bootstrap/datepicker.html b/src/directives/decorators/bootstrap/datepicker.html
@@ -8,7 +8,9 @@
          ng-required="form.required"
          schema-validate="form.schema"
          ng-model="$$value$$"
-         pick-a-date />
+         pick-a-date
+         min-date="form.minDate"
+         max-date="form.maxDate" />
 
   <span class="help-block">{{ (hasError() && errorMessage(schemaError())) || form.description}}</span>
 </div>
