Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 426c67c

Browse files
Justin Hallpkozlowski-opensource
authored andcommitted
fix(timepicker): remove form so deep validation works
1 parent 88c452f commit 426c67c

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

src/timepicker/docs/demo.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div ng-controller="TimepickerDemoCtrl">
22

3-
<div ng-model="mytime" ng-change="changed()" class="well well-small" style="display:inline-block;">
3+
<div ng-model="mytime" ng-change="changed()" class="row" style="display:inline-block;">
44
<div class="row">
5-
<div class="col-lg-5">
5+
<div class="col-xs-5 col-lg-5">
66
<timepicker hour-step="hstep" minute-step="mstep" show-meridian="ismeridian"></timepicker>
77
</div>
88
</div>
@@ -12,11 +12,11 @@
1212
<pre class="alert alert-info">Time is: {{mytime | date:'shortTime' }}</pre>
1313

1414
<div class="row">
15-
<div class="col-lg-6">
15+
<div class="col-xs-6">
1616
Hours step is:
1717
<select class="form-control" ng-model="hstep" ng-options="opt for opt in options.hstep"></select>
1818
</div>
19-
<div class="col-lg-6">
19+
<div class="col-xs-6">
2020
Minutes step is:
2121
<select class="form-control" ng-model="mstep" ng-options="opt for opt in options.mstep"></select>
2222
</div>

template/timepicker/timepicker.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
<form class="form-inline">
1+
<span>
22
<div class="row">
3-
<div class="col-md-4 text-center">
3+
<div class="col-xs-4 text-center">
44
<a ng-click="incrementHours()" class="btn btn-link"><i class="glyphicon glyphicon-chevron-up"></i></a>
55
</div>
6-
<div class="col-md-6 text-center">
6+
<div class="col-xs-6 text-center">
77
<a ng-click="incrementMinutes()" class="btn btn-link"><i class="glyphicon glyphicon-chevron-up"></i></a>
88
</div>
9-
<div class="col-md-2"> </div>
9+
<div class="col-xs-2"> </div>
1010
</div>
1111

1212
<div class="row">
13-
<div class="col-md-4">
13+
<div class="col-xs-4">
1414
<div class="form-group" ng-class="{'has-error': invalidHours}" style="margin-bottom: 0px">
15-
<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2" />
15+
<input type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-mousewheel="incrementHours()" ng-readonly="readonlyInput" maxlength="2">
1616
</div>
1717
</div>
18-
<div class="col-md-6">
18+
<div class="col-xs-6">
1919
<div class="input-group" ng-class="{'has-error': invalidMinutes}">
2020
<span class="input-group-addon">:</span>
2121
<input type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">
2222
</div>
2323
</div>
24-
<div class="col-md-2">
24+
<div class="col-xs-2">
2525
<button ng-click="toggleMeridian()" class="btn btn-default text-center" ng-show="showMeridian">{{meridian}}</button>
2626
</div>
2727
</div>
2828

2929
<div class="row">
30-
<div class="col-md-4 text-center">
30+
<div class="col-xs-4 text-center">
3131
<a ng-click="decrementHours()" class="btn btn-link"><i class="glyphicon glyphicon-chevron-down"></i></a>
3232
</div>
33-
<div class="col-md-6 text-center">
33+
<div class="col-xs-6 text-center">
3434
<a ng-click="decrementMinutes()" class="btn btn-link"><i class="glyphicon glyphicon-chevron-down"></i></a>
3535
</div>
36-
<div class="col-md-2"> </div>
36+
<div class="col-xs-2"> </div>
3737
</div>
38-
</form>
38+
</span>

0 commit comments

Comments
 (0)