Merge branch 'release/0.3.3' into develop

Author: dalelotts

README.md

@@ -1,4 +1,4 @@
-# Angular bootstrap date & time picker  v0.3.2
+# Angular bootstrap date & time picker  v0.3.3
 ================================
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "This directive allows you to add a datetime-picker to your form.",
   "author": "https://github.com/dalelotts/angular-bootstrap-datetimepicker/graphs/contributors",
   "license": "MIT",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "This directive allows you to add a datetime-picker to your form elements.",
   "author": "https://github.com/dalelotts/ng-bootstrap-datetimepicker/graphs/contributors",
   "license": "MIT",

src/css/datetimepicker.css

@@ -1,5 +1,5 @@
 /**
- * @license angular-bootstrap-datetimepicker  v0.3.2
+ * @license angular-bootstrap-datetimepicker  v0.3.3
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */

src/js/datetimepicker.js

@@ -2,7 +2,7 @@
 /*jslint vars:true */
 
 /**
- * @license angular-bootstrap-datetimepicker  v0.3.2
+ * @license angular-bootstrap-datetimepicker  v0.3.3
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */
@@ -20,7 +20,7 @@ angular.module('ui.bootstrap.datetimepicker', [])
     minView: 'minute',
     startView: 'day'
   })
-  .directive('datetimepicker', ['dateTimePickerConfig', function (defaultConfig) {
+  .directive('datetimepicker', ['$log', 'dateTimePickerConfig', function ($log, defaultConfig) {
     "use strict";
 
     function DateObject() {
@@ -31,6 +31,7 @@ angular.module('ui.bootstrap.datetimepicker', [])
       var validProperties = ['dateValue', 'display', 'active', 'selectable', 'past', 'future'];
 
       for (var prop in arguments[0]) {
+        /* istanbul ignore else */
         //noinspection JSUnfilteredForInLoop
         if (validProperties.indexOf(prop) >= 0) {
           //noinspection JSUnfilteredForInLoop
@@ -305,7 +306,14 @@ angular.module('ui.bootstrap.datetimepicker', [])
             scope.ngModel = newDate;
 
             if (configuration.dropdownSelector) {
-              jQuery(configuration.dropdownSelector).dropdown('toggle');
+
+              /* istanbul ignore else */
+              if (typeof jQuery !== 'undefined') {
+                jQuery(configuration.dropdownSelector).dropdown('toggle');
+              } else {
+                $log.error("Please DO NOT specify the dropdownSelector option unless you are using jQuery. " +
+                  "Please include jQuery or write code to close the dropdown in the on-set-time callback. ");
+              }
             }
 
             scope.onSetTime({ newDate: scope.ngModel, oldDate: oldDate });