Merge pull request #172 from keenondrums/master

Feature -> Callback On Set Date
g00fy- · Oct 13, 2015 · 19807ba · 19807ba
2 parents 2fca5c7 + 879ab82
commit 19807ba
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -76,6 +76,21 @@ Inject the dependency `angular.module('testApp', ['datePicker'])`
 <div date-picker="start" watch-direct-changes></div>
 ```
 
+##### Execute callback upon date set
+
+<p>Execute callback when a new date set in a highest resolution available, e.g. if you specify min-view="hour" the callback will be executed only when the user picks an hour, not just date, month or year. Alternatively, you can bind to a new event 'setMaxDate'.</p>
+
+<p>Within your controller</p>
+```js
+function callback() {
+  doStuff();
+}
+```
+<p>In your html</p>
+```html
+<div date-picker="start" on-set-date="callback"></div>
+```
+
 ##### input as datepicker
 
 ```html

diff --git a/app/scripts/datePicker.js b/app/scripts/datePicker.js
@@ -25,7 +25,7 @@ Module.filter('time',function () {
   };
 });
 
-Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', function datePickerDirective(datePickerConfig, datePickerUtils) {
+Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', 'lodash', function datePickerDirective(datePickerConfig, datePickerUtils, _) {
 
   //noinspection JSUnusedLocalSymbols
   return {
@@ -47,6 +47,7 @@ Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', function
       scope.now = new Date();
       scope.template = attrs.template || datePickerConfig.template;
       scope.watchDirectChanges = attrs.watchDirectChanges !== undefined;
+      scope.callbackOnSetDate = attrs.onSetDate ? _.get(scope.$parent, attrs.onSetDate) : undefined;
 
       var step = parseInt(attrs.step || datePickerConfig.step, 10);
       var partial = !!attrs.partial;
@@ -127,6 +128,16 @@ Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', function
           case 'year':
             scope.model.setFullYear(date.getFullYear());
           }
+
+          if (!nextView && scope.model) {
+            scope.$emit('setMaxDate', attrs.datePicker, scope.model, scope.view);
+
+            if (scope.callbackOnSetDate) {
+              scope.callbackOnSetDate();
+            }
+
+          }
+
           scope.$emit('setDate', scope.model, scope.view);
         }
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-datepicker",
   "license": "MIT",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "main": [
     "./dist/angular-datepicker.js",
     "./dist/angular-datepicker.css"
@@ -21,12 +21,14 @@
     "package.json"
   ],
   "dependencies": {
-    "angular": "1.2.14"
+    "angular": "1.2.14",
+    "lodash": "~3.10.1"
   },
   "devDependencies": {
     "angular": "1.2.14",
     "angular-mocks": "1.2.14",
     "angular-scenario": "1.2.14",
-    "angular-bootstrap": "~0.3.0"
+    "angular-bootstrap": "~0.3.0",
+    "lodash": "~3.10.1"
   }
 }
diff --git a/dist/angular-datepicker.js b/dist/angular-datepicker.js
@@ -25,7 +25,7 @@ Module.filter('time',function () {
   };
 });
 
-Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', function datePickerDirective(datePickerConfig, datePickerUtils) {
+Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', 'lodash', function datePickerDirective(datePickerConfig, datePickerUtils, _) {
 
   //noinspection JSUnusedLocalSymbols
   return {
@@ -47,6 +47,7 @@ Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', function
       scope.now = new Date();
       scope.template = attrs.template || datePickerConfig.template;
       scope.watchDirectChanges = attrs.watchDirectChanges !== undefined;
+      scope.callbackOnSetDate = attrs.onSetDate ? _.get(scope.$parent, attrs.onSetDate) : undefined;
 
       var step = parseInt(attrs.step || datePickerConfig.step, 10);
       var partial = !!attrs.partial;
@@ -127,6 +128,16 @@ Module.directive('datePicker', ['datePickerConfig', 'datePickerUtils', function
           case 'year':
             scope.model.setFullYear(date.getFullYear());
           }
+
+          if (!nextView && scope.model) {
+            scope.$emit('setMaxDate', attrs.datePicker, scope.model, scope.view);
+
+            if (scope.callbackOnSetDate) {
+              scope.callbackOnSetDate();
+            }
+
+          }
+
           scope.$emit('setDate', scope.model, scope.view);
         }
 

diff --git a/dist/angular-datepicker.min.js b/dist/angular-datepicker.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-datepicker",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "main": "dist/angular-datepicker.js",
   "repository": {
     "url": "https://github.com/g00fy-/angular-datepicker.git"