Fix defect where configuration on scope (in the form of a function or property) were not being picked up. Updated demo page to show how to get configuration from the scope.

Author: dalelotts

demo/demo-controller.js

@@ -58,5 +58,15 @@ angular.module('demo.demoController', [])
         console.log(index);
         $dates[index].selectable = false;
       };
+
+      $scope.config = {
+        datetimePicker: {
+          startView: 'year'
+        }
+      };
+
+      $scope.configFunction = function configFunction() {
+        return {startView: 'month'};
+      };
     }
   ]);

demo/index.html

@@ -214,8 +214,6 @@ <h3>Show / hide with check box</h3>
 </div>
 
 <div class="row">
-
-
     <div class="col-sm-6">
         <h3>Embedded calendar</h3>
 
@@ -258,6 +256,35 @@ <h3>Embedded calendar form integration</h3>
     </div>
 </div>
 
+
+<div class="row">
+        <div class="col-sm-6">
+            <h3>Embedded calendar with property configuration</h3>
+
+            <p><code>data-datetimepicker-config="config.datetimePicker"</code></p>
+            <p>which returns <code>{ startView: 'year' }</code></p>
+
+            <div class="well">
+                <p>Formatted Date: {{ data.embeddedPropertyConfig | date:'yyyy-MM-dd h:mm a' }}</p>
+
+                <datetimepicker data-ng-model="data.embeddedPropertyConfig" data-datetimepicker-config="config.datetimePicker" ></datetimepicker>
+            </div>
+        </div>
+    <div class="col-sm-6">
+        <h3>Embedded calendar with function configuration</h3>
+
+        <p><code>data-datetimepicker-config="configFunction()"</code></p>
+        <p>which returns <code>{ startView: 'month' }</code></p>
+
+        <div class="well">
+            <p>Formatted Date: {{ data.embeddedFunctionConfig | date:'yyyy-MM-dd h:mm a' }}</p>
+
+            <datetimepicker data-ng-model="data.embeddedFunctionConfig" data-datetimepicker-config="configFunction()" ></datetimepicker>
+        </div>
+    </div>
+
+    </div>
+
 <div class="row">
     <div class="col-sm-6">
         <h3>ng-repeat with drop-down using text link</h3>

src/js/datetimepicker.js

@@ -127,7 +127,7 @@ angular.module('ui.bootstrap.datetimepicker', [])
         var directiveConfig = {};
 
         if (attrs.datetimepickerConfig) {
-          directiveConfig = scope.$eval(attrs.datetimepickerConfig);
+          directiveConfig = scope.$parent.$eval(attrs.datetimepickerConfig);
         }
 
         var configuration = {};

test/configuration/beforeRender.spec.js

@@ -2,14 +2,14 @@
 
 /**
  * @license angular-bootstrap-datetimepicker
- * (c) 2013 Knight Rider Consulting, Inc. http://www.knightrider.com
+ * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
 
 /**
  *
  *    @author        Dale "Ducky" Lotts
- *    @since        11/8/2013
+ *    @since        11/8/2014
  */
 describe('beforeRender', function () {
   'use strict';

test/configuration/datetimepickerConfig.spec.js

@@ -0,0 +1,64 @@
+/*globals ddescribe, describe, beforeEach, it, expect, module, inject, jQuery, moment, spyOn */
+
+/**
+ * @license angular-bootstrap-datetimepicker
+ * (c) 2014 Knight Rider Consulting, Inc. http://www.knightrider.com
+ * License: MIT
+ */
+
+/**
+ *
+ *    @author        Dale "Ducky" Lotts
+ *    @since        11/15/2014
+ */
+
+describe('dateimePickerConfig', function () {
+  'use strict';
+  var $rootScope, $compile;
+
+  beforeEach(module('ui.bootstrap.datetimepicker'));
+
+  beforeEach(inject(function (_$compile_, _$rootScope_) {
+    moment.locale('en');
+    $compile = _$compile_;
+    $rootScope = _$rootScope_;
+  }));
+
+
+  describe('retrieves information from', function () {
+    it('function on scope', function () {
+
+      var $scope = $rootScope.$new();
+      $scope.date = moment('2014-11-15T00:00:00.000').toDate();
+      $scope.configFunction = function configFunction() {
+        return {startView: 'month'};
+      };
+
+      spyOn($scope, 'configFunction').and.callThrough();
+
+      var element = $compile('<datetimepicker data-ng-model="date" data-datetimepicker-config="configFunction()" ></datetimepicker>')($scope);
+      $scope.$digest();
+
+      expect(jQuery('.switch', element).text()).toBe('2014');
+      expect($scope.configFunction).toHaveBeenCalled();
+    });
+
+    it('property on scope', function () {
+
+      var $scope = $rootScope.$new();
+      $scope.date = moment('2014-11-15T00:00:00.000').toDate();
+      $scope.config = {
+        datetimePicker: {
+          startView: 'year'
+        }
+      };
+
+      spyOn($scope, 'config').and.callThrough();
+
+      var element = $compile('<datetimepicker data-ng-model="date" data-datetimepicker-config="config.datetimePicker" ></datetimepicker>')($scope);
+      $scope.$digest();
+
+      expect(jQuery('.switch', element).text()).toBe('2010-2019');
+    });
+  });
+});