Merge pull request #42 from frabnt/MH-2781

Add watcher on timepicker configuration options

Author: timmipetit

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-jquery-timepicker",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "homepage": "https://github.com/Recras/angular-jquery-timepicker",
   "description": "An AngularJS directive for jQuery Timepicker",
   "main": "./src/timepickerdirective.js",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-jquery-timepicker",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "description": "An AngularJS directive for jQuery Timepicker",
   "main": "./src/timepickerdirective.js",
   "devDependencies": {

src/timepickerdirective.js

@@ -58,6 +58,18 @@ m.directive('uiTimepicker', ['uiTimepickerConfig', '$parse', '$window', function
                 ngModel.$render();
             }, true);
 
+            scope.$watch('uiTimepicker', function() {
+                element.timepicker(
+                    'option',
+                    angular.extend(
+                        config, scope.uiTimepicker ?
+                        scope.uiTimepicker :
+                        {}
+                    )
+                );
+                ngModel.$render();
+            }, true);
+
             config.appendTo = config.appendTo || element.parent();
 
             element.timepicker(

src/timepickerdirective.min.js

@@ -187,6 +187,31 @@ describe('uiTimepicker', function() {
                 expect(element.val()).toEqual('14:15');
             });
         });
+
+        it('should update the custom options when they change', function() {
+            inject(function($compile, $rootScope) {
+                var element, aDate, opts;
+                aDate = new Date(2010, 12, 1, 14, 15);
+                opts = {
+                   timeFormat: 'H:i'
+                };
+                element = $compile("<input ui-timepicker='opts' ng-model='x'/>")($rootScope);
+                $rootScope.$apply(function() {
+                    $rootScope.opts = opts;
+                });
+                $rootScope.$apply(function() {
+                    $rootScope.x = aDate;
+                });
+                expect(element.val()).toEqual('14:15');
+                opts = {
+                    timeFormat: 'H:i A'
+                };
+                $rootScope.$apply(function() {
+                    $rootScope.opts = opts;
+                });
+                expect(element.val()).toEqual('14:15 PM');
+            });
+        });
     });
 
     describe('using required', function() {