minutesFormat now uses the last locale preference

Closes #40
indrimuska · Jun 24, 2016 · 7f4fce2 · 7f4fce2
1 parent f0575ff
commit 7f4fce2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-moment-picker",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "authors": [
     "Indri Muska <[email protected]>"
   ],

diff --git a/dist/angular-moment-picker.js b/dist/angular-moment-picker.js
@@ -15,7 +15,6 @@
 				monthsFormat:  'MMM',
 				daysFormat:    'D',
 				hoursFormat:   'HH:[00]',
-				minutesFormat: moment.localeData().longDateFormat('LT').replace(/[aA]/, ''),
 				secondsFormat: 'ss',
 				minutesStep:   5,
 				secondsStep:   1
@@ -405,7 +404,8 @@
 				minutes: [],
 				render: function () {
 					var i = 0,
-						minute = $scope.view.moment.clone().startOf('hour');
+						minute = $scope.view.moment.clone().startOf('hour'),
+						minutesFormat = momentPicker.minutesFormat || moment.localeData($scope.locale).longDateFormat('LT').replace(/[aA]/, '');
 
 					$scope.hourView.minutes = [];
 					for (var m = 0; m < 60; m += momentPicker.minutesStep) {
@@ -415,7 +415,7 @@
 						if (!$scope.hourView.minutes[index])
 							$scope.hourView.minutes[index] = [];
 						$scope.hourView.minutes[index].push({
-							label:  minute.format(momentPicker.minutesFormat),
+							label:  minute.format(minutesFormat),
 							year:   minute.year(),
 							month:  minute.month(),
 							date:   minute.date(),

diff --git a/dist/angular-moment-picker.min.js b/dist/angular-moment-picker.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-moment-picker",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "Angular Moment Picker is an AngularJS directive for date and time picker using Moment.js",
   "main": "dist/angular-moment-picker.js",
   "repository": {

diff --git a/src/angular-moment-picker.js b/src/angular-moment-picker.js
@@ -15,7 +15,6 @@
 				monthsFormat:  'MMM',
 				daysFormat:    'D',
 				hoursFormat:   'HH:[00]',
-				minutesFormat: moment.localeData().longDateFormat('LT').replace(/[aA]/, ''),
 				secondsFormat: 'ss',
 				minutesStep:   5,
 				secondsStep:   1
@@ -405,7 +404,8 @@
 				minutes: [],
 				render: function () {
 					var i = 0,
-						minute = $scope.view.moment.clone().startOf('hour');
+						minute = $scope.view.moment.clone().startOf('hour'),
+						minutesFormat = momentPicker.minutesFormat || moment.localeData($scope.locale).longDateFormat('LT').replace(/[aA]/, '');
 
 					$scope.hourView.minutes = [];
 					for (var m = 0; m < 60; m += momentPicker.minutesStep) {
@@ -415,7 +415,7 @@
 						if (!$scope.hourView.minutes[index])
 							$scope.hourView.minutes[index] = [];
 						$scope.hourView.minutes[index].push({
-							label:  minute.format(momentPicker.minutesFormat),
+							label:  minute.format(minutesFormat),
 							year:   minute.year(),
 							month:  minute.month(),
 							date:   minute.date(),