Skip to content

Commit 311c4e8

Browse files
Merge pull request #3 from mschlitz-trux/timepicker-meridian-btn-class
Add meridianBtnClass to uibTimepicker
2 parents 870e84a + 3b94b79 commit 311c4e8

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

dist/ui-bootstrap-tpls.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6260,6 +6260,7 @@ angular.module('ui.bootstrap.timepicker', [])
62606260
mousewheel: true,
62616261
arrowkeys: true,
62626262
showSpinners: true,
6263+
meridianBtnClass: 'btn-secondary',
62636264
templateUrl: 'uib/template/timepicker/timepicker.html'
62646265
})
62656266

@@ -6274,6 +6275,8 @@ angular.module('ui.bootstrap.timepicker', [])
62746275
$scope.tabindex = angular.isDefined($attrs.tabindex) ? $attrs.tabindex : 0;
62756276
$element.removeAttr('tabindex');
62766277

6278+
$scope.meridianBtnClass = angular.isDefined($attrs.meridianBtnClass) ? $scope.$parent.$eval($attrs.meridianBtnClass) : timepickerConfig.meridianBtnClass;
6279+
62776280
this.init = function(ngModelCtrl_, inputs) {
62786281
ngModelCtrl = ngModelCtrl_;
62796282
ngModelCtrl.$render = this.render;
@@ -7924,7 +7927,7 @@ angular.module("uib/template/timepicker/timepicker.html", []).run(["$templateCac
79247927
" <td class=\"form-group uib-time seconds\" ng-class=\"{'has-error': invalidSeconds}\" ng-show=\"showSeconds\">\n" +
79257928
" <input type=\"text\" placeholder=\"SS\" ng-model=\"seconds\" ng-change=\"updateSeconds()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\" tabindex=\"{{::tabindex}}\" ng-disabled=\"noIncrementSeconds()\" ng-blur=\"blur()\">\n" +
79267929
" </td>\n" +
7927-
" <td ng-show=\"showMeridian\" class=\"uib-time am-pm\"><button type=\"button\" ng-class=\"{disabled: noToggleMeridian()}\" class=\"btn btn-secondary text-center\" ng-click=\"toggleMeridian()\" ng-disabled=\"noToggleMeridian()\" tabindex=\"{{::tabindex}}\">{{meridian}}</button></td>\n" +
7930+
" <td ng-show=\"showMeridian\" class=\"uib-time am-pm\"><button type=\"button\" ng-class=\"[meridianBtnClass, {disabled: noToggleMeridian()}]\" class=\"btn btn-secondary text-center\" ng-click=\"toggleMeridian()\" ng-disabled=\"noToggleMeridian()\" tabindex=\"{{::tabindex}}\">{{meridian}}</button></td>\n" +
79287931
" </tr>\n" +
79297932
" <tr class=\"text-center\" ng-show=\"::showSpinners\">\n" +
79307933
" <td class=\"uib-decrement hours\">\n" +

src/timepicker/timepicker.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ angular.module('ui.bootstrap.timepicker', [])
1111
mousewheel: true,
1212
arrowkeys: true,
1313
showSpinners: true,
14+
meridianBtnClass: 'btn-secondary',
1415
templateUrl: 'uib/template/timepicker/timepicker.html'
1516
})
1617

@@ -25,6 +26,8 @@ angular.module('ui.bootstrap.timepicker', [])
2526
$scope.tabindex = angular.isDefined($attrs.tabindex) ? $attrs.tabindex : 0;
2627
$element.removeAttr('tabindex');
2728

29+
$scope.meridianBtnClass = angular.isDefined($attrs.meridianBtnClass) ? $scope.$parent.$eval($attrs.meridianBtnClass) : timepickerConfig.meridianBtnClass;
30+
2831
this.init = function(ngModelCtrl_, inputs) {
2932
ngModelCtrl = ngModelCtrl_;
3033
ngModelCtrl.$render = this.render;

template/timepicker/timepicker.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<td class="form-group uib-time seconds" ng-class="{'has-error': invalidSeconds}" ng-show="showSeconds">
3939
<input type="text" placeholder="SS" ng-model="seconds" ng-change="updateSeconds()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2" tabindex="{{::tabindex}}" ng-disabled="noIncrementSeconds()" ng-blur="blur()">
4040
</td>
41-
<td ng-show="showMeridian" class="uib-time am-pm"><button type="button" ng-class="{disabled: noToggleMeridian()}" class="btn btn-secondary text-center" ng-click="toggleMeridian()" ng-disabled="noToggleMeridian()" tabindex="{{::tabindex}}">{{meridian}}</button></td>
41+
<td ng-show="showMeridian" class="uib-time am-pm"><button type="button" ng-class="[meridianBtnClass, {disabled: noToggleMeridian()}]" class="btn btn-secondary text-center" ng-click="toggleMeridian()" ng-disabled="noToggleMeridian()" tabindex="{{::tabindex}}">{{meridian}}</button></td>
4242
</tr>
4343
<tr class="text-center" ng-show="::showSpinners">
4444
<td class="uib-decrement hours">

0 commit comments

Comments
 (0)