Skip to content

Commit f5391dc

Browse files
committed
build(1.0.2)
1 parent a65e549 commit f5391dc

File tree

4 files changed

+33
-26
lines changed

4 files changed

+33
-26
lines changed

app/index.html

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,69 +20,85 @@ <h2>Calendar</h2>
2020
<h3>default views</h3>
2121

2222
<h5>year</h5>
23+
2324
<div date-picker="start" view="year"></div>
2425

2526
<h5>month</h5>
27+
2628
<div date-picker="start" view="month"></div>
2729

2830
<h5>date</h5>
31+
2932
<div date-picker="start" view="date"></div>
3033

3134
<h5>hours</h5>
35+
3236
<div date-picker="start" view="hours"></div>
3337

3438
<h5>minutes</h5>
39+
3540
<div date-picker="start" view="minutes"></div>
3641
</div>
3742

3843

39-
4044
<div>
4145
<h3>min views</h3>
4246

4347
<h5>year</h5>
48+
4449
<div date-picker="start" min-view="year"></div>
4550

4651
<h5>month</h5>
52+
4753
<div date-picker="start" min-view="month"></div>
4854

4955
<h5>date</h5>
56+
5057
<div date-picker="start" min-view="date"></div>
5158

5259
<h5>hours</h5>
60+
5361
<div date-picker="start" min-view="hours"></div>
5462

5563
<h5>minutes</h5>
64+
5665
<div date-picker="start" min-view="minutes"></div>
5766
</div>
58-
59-
67+
68+
6069
<div>
6170
<h3>max views</h3>
6271

6372
<h5>year</h5>
73+
6474
<div date-picker="start" max-view="year"></div>
6575

6676
<h5>month</h5>
77+
6778
<div date-picker="start" max-view="month"></div>
6879

6980
<h5>date</h5>
81+
7082
<div date-picker="start" max-view="date"></div>
7183

7284
<h5>hours</h5>
85+
7386
<div date-picker="start" max-view="hours"></div>
7487

7588
<h5>maxutes</h5>
89+
7690
<div date-picker="start" max-view="minutes"></div>
7791
</div>
7892

7993
<div>
8094
<h3>max & min views</h3>
8195

8296
<h5>time</h5>
97+
8398
<div date-picker="start" max-view="hours" min-view="minutes"></div>
8499

85100
<h5>date</h5>
101+
86102
<div date-picker="start" max-view="year" min-view="date"></div>
87103

88104
</div>
@@ -94,8 +110,7 @@ <h5>date</h5>
94110
<div class="span6">
95111
<h3>Input</h3>
96112
<h5>default</h5>
97-
<pre></pre>
98-
<input type="text" date-time ng-model="start" required="true" view="hours" position="absolute">
113+
<input type="text" date-time ng-model="start" required="true" view="hours">
99114

100115
<h3>Input with append</h3>
101116
<h5>default</h5>
@@ -110,7 +125,7 @@ <h5>default</h5>
110125

111126
<div class="input-prepend" date-time-append>
112127
<span class="add-on"><i class="icon-calendar"></i></span>
113-
<input type="text" date-time ng-model="start" required="true" view="hours" position="absolute">
128+
<input type="text" date-time ng-model="start" required="true" view="hours">
114129
</div>
115130

116131
<h5>Input format</h5>
@@ -128,9 +143,8 @@ <h5>A button</h5>
128143
</div>
129144

130145

131-
132146
<h5>Date range</h5>
133-
<pre>&lt;div date-range start="start" end="end" &gt;&lt;/div&gt; </pre>
147+
134148
<div date-range start="a" end="b" style="position: relative; z-index:0"></div>
135149
<h5>Date range button</h5>
136150

@@ -146,9 +160,8 @@ <h5>Date range button</h5>
146160
</div>
147161
</div>
148162

149-
<script src="components/jquery/jquery.js"></script>
150-
<script src="components/angular/angular.js"></script>
151-
<script src="components/angular-bootstrap/ui-bootstrap.js"></script>
163+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular.min.js"></script>
164+
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.6.0/ui-bootstrap-tpls.min.js"></script>
152165
<!-- build:js module.min.js -->
153166
<script src="scripts/datePicker.js"></script>
154167
<script src="scripts/dateRange.js"></script>

app/scripts/datePicker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Module.directive('datePicker', function datePickerDirective(datePickerConfig) {
123123
scope.views.indexOf(attrs.minView || 'minutes')+1
124124
);
125125

126-
if (scope.views.length === 1 || scope.views.indexOf(scope.view)==-1) {
126+
if (scope.views.length === 1 || scope.views.indexOf(scope.view)===-1) {
127127
scope.view = scope.views[0];
128128
}
129129

dist/index.js

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,14 @@ Module.directive('datePicker', function datePickerDirective(datePickerConfig) {
118118
scope.template = attrs.template || datePickerConfig.template;
119119

120120
var step = parseInt(attrs.step || datePickerConfig.step, 10);
121-
var index;
122121

123-
/** @namespace attrs.minView */
124-
if (attrs.minView) {
125-
index = scope.views.indexOf(attrs.minView);
126-
scope.views.splice(0, index);
127-
}
128-
/** @namespace attrs.maxView */
129-
if (attrs.maxView) {
130-
index = scope.views.indexOf(attrs.maxView);
131-
scope.views.splice(index + 1);
132-
}
122+
/** @namespace attrs.minView, attrs.maxView */
123+
scope.views =scope.views.slice(
124+
scope.views.indexOf(attrs.maxView || 'year'),
125+
scope.views.indexOf(attrs.minView || 'minutes')+1
126+
);
133127

134-
if (scope.views.length === 1) {
128+
if (scope.views.length === 1 || scope.views.indexOf(scope.view)===-1) {
135129
scope.view = scope.views[0];
136130
}
137131

@@ -340,7 +334,7 @@ Module.directive('dateTimeAppend', function () {
340334
return {
341335
link: function (scope, element) {
342336
element.bind('click', function () {
343-
element.find('input').focus();
337+
element.find('input')[0].focus();
344338
});
345339
}
346340
};

0 commit comments

Comments
 (0)