fix(timepicker): add correct type for meridian button

Closes #1541
angular-ui · Jan 8, 2014 · bcf39ef · bcf39ef
1 parent 1933488
commit bcf39ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/timepicker/test/timepicker.spec.js b/src/timepicker/test/timepicker.spec.js
@@ -136,8 +136,13 @@ describe('timepicker directive', function () {
     expect(getTimeState()).toEqual(['02', '39', 'PM']);
     expect(getModelState()).toEqual([14, 39]);
   });
+
+  it('meridian button has correct type', function() {
+    var button = getMeridianButton();
+    expect(button.attr('type')).toBe('button');
+  });
 
-  it('toggles meridian when arrows are clicked', function() {
+  it('toggles meridian when button is clicked', function() {
     var button = getMeridianButton();
 
     doClick(button);

diff --git a/template/timepicker/timepicker.html b/template/timepicker/timepicker.html
@@ -14,7 +14,7 @@
 			<td style="width:50px;" class="form-group" ng-class="{'has-error': invalidMinutes}">
 				<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">
 			</td>
-			<td ng-show="showMeridian"><button class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>
+			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>
 		</tr>
 		<tr class="text-center">
 			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>