Fixed #153

Gillardo · Jan 19, 2017 · 71d4c62 · 71d4c62
1 parent 50e4eda
commit 71d4c62
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/datetime-picker.js b/datetime-picker.js
@@ -113,6 +113,7 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                 }
 
                 // popup element used to display calendar
+                var timezone = null;
                 var popupEl = angular.element('' +
                     '<div date-picker-wrap>' +
                     '<div uib-datepicker></div>' +
@@ -131,8 +132,6 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                     }
 
                     popupEl.attr('ng-model-options', 'ngModelOptions');
-                } else {
-                    timezone = null;
                 }
 
                 // get attributes from directive
@@ -167,7 +166,9 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                 var timepickerEl = angular.element(popupEl.children()[1]);
 
                 if (!$scope.timepickerOptions)
-                    $scope.timepickerOptions = {};
+                    $scope.timepickerOptions = {
+                        showMeridian: true
+                    };
 
                 for (var key in $scope.timepickerOptions) {
                     timepickerEl.attr(cameltoDash(key), 'timepickerOptions.' + key);

diff --git a/dist/datetime-picker.js b/dist/datetime-picker.js
@@ -116,6 +116,7 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                 }
 
                 // popup element used to display calendar
+                var timezone = null;
                 var popupEl = angular.element('' +
                     '<div date-picker-wrap>' +
                     '<div uib-datepicker></div>' +
@@ -134,8 +135,6 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                     }
 
                     popupEl.attr('ng-model-options', 'ngModelOptions');
-                } else {
-                    timezone = null;
                 }
 
                 // get attributes from directive
@@ -170,7 +169,9 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
                 var timepickerEl = angular.element(popupEl.children()[1]);
 
                 if (!$scope.timepickerOptions)
-                    $scope.timepickerOptions = {};
+                    $scope.timepickerOptions = {
+                        showMeridian: true
+                    };
 
                 for (var key in $scope.timepickerOptions) {
                     timepickerEl.attr(cameltoDash(key), 'timepickerOptions.' + key);