From bcf39efeafe641c7d49f12d5306105beba891de0 Mon Sep 17 00:00:00 2001
From: Tasos Bekos <tbekos@gmail.com>
Date: Wed, 8 Jan 2014 10:07:21 +0100
Subject: [PATCH] fix(timepicker): add correct type for meridian button

Closes #1541
---
 src/timepicker/test/timepicker.spec.js | 7 ++++++-
 template/timepicker/timepicker.html    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/timepicker/test/timepicker.spec.js b/src/timepicker/test/timepicker.spec.js
index 9ac300e66f..6cda1572a8 100644
--- 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
index 60614b286d..bef8e27f19 100644
--- 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>