Skip to content

Commit 22714d8

Browse files
g1ebg1eb
committed
Renamed setDate function to something more appropriate.
1 parent b37e0e0 commit 22714d8

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎src/date-input.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
'active': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).startOf('day').isSame(selected.clone().startOf('day')),
2929
'inactive': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month() !== calendar.month()
3030
}"
31-
ng-click="setDate(selected.clone().year(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).year()).month(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month()).date(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date()), true)">
31+
ng-click="udpate(selected.clone().year(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).year()).month(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month()).date(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date()), true)">
3232
{{ calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date() }}
3333
</span>
3434
</div>
3535
</div>
3636
</div>
3737
<div class="clear-button" ng-if="!!date">
38-
<div ng-click="setDate()">Clear</div>
38+
<div ng-click="udpate()">Clear</div>
3939
</div>
4040
</div>
4141
</div>

‎src/date-input.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ directive('dateInput', ['$document', function ($document) {
3333
};
3434

3535
// Update selected date
36-
scope.setDate = function (date, calendar_update) {
37-
if ( scope.selected.isSame(date) ) { return; }
38-
if ( !date ) {
36+
scope.update = function (datetime, calendar_update) {
37+
if ( scope.selected.isSame(datetime) ) { return; }
38+
if ( !datetime ) {
3939
scope.selected = scope.date = undefined;
4040
} else {
41-
scope.selected.year(date.year()).month(date.month()).date(date.date()).hours(date.hours()).minutes(date.minutes()).seconds(date.seconds());
41+
scope.selected.year(datetime.year()).month(datetime.month()).date(datetime.date()).hours(datetime.hours()).minutes(datetime.minutes()).seconds(datetime.seconds());
4242
if ( scope.selected.clone().startOf('week').month() !== scope.calendar.month() || calendar_update ) {
4343
scope.calendar = scope.selected.clone();
4444
}

‎src/datetime-input.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,33 +30,33 @@
3030
'active': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).startOf('day').isSame(selected.clone().startOf('day')),
3131
'inactive': calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month() !== calendar.month()
3232
}"
33-
ng-click="setDate(selected.clone().year(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).year()).month(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month()).date(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date()), true)">
33+
ng-click="update(selected.clone().year(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).year()).month(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).month()).date(calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date()), true)">
3434
{{ calendar.clone().startOf('month').add($parent.$index, 'weeks').weekday($index).date() }}
3535
</span>
3636
</div>
3737
</div>
3838
</div>
3939
<div class="timer">
4040
<div class="timer-hours">
41-
<div class="arrow arrow-up" ng-click="setDate(selected.clone().add(1, 'hours'))"></div>
41+
<div class="arrow arrow-up" ng-click="update(selected.clone().add(1, 'hours'))"></div>
4242
{{ selected.format('HH') }}
43-
<div class="arrow arrow-down" ng-click="setDate(selected.clone().subtract(1, 'hours'))"></div>
43+
<div class="arrow arrow-down" ng-click="update(selected.clone().subtract(1, 'hours'))"></div>
4444
</div>
4545
<div class="timer-divider">:</div>
4646
<div class="timer-minutes">
47-
<div class="arrow arrow-up" ng-click="setDate(selected.clone().add(1, 'minutes'))"></div>
47+
<div class="arrow arrow-up" ng-click="update(selected.clone().add(1, 'minutes'))"></div>
4848
{{ selected.format('mm') }}
49-
<div class="arrow arrow-down" ng-click="setDate(selected.clone().subtract(1, 'minutes'))"></div>
49+
<div class="arrow arrow-down" ng-click="update(selected.clone().subtract(1, 'minutes'))"></div>
5050
</div>
5151
<div class="timer-divider">:</div>
5252
<div class="timer-seconds">
53-
<div class="arrow arrow-up" ng-click="setDate(selected.clone().add(1, 'seconds'))"></div>
53+
<div class="arrow arrow-up" ng-click="update(selected.clone().add(1, 'seconds'))"></div>
5454
{{ selected.format('ss') }}
55-
<div class="arrow arrow-down" ng-click="setDate(selected.clone().subtract(1, 'seconds'))"></div>
55+
<div class="arrow arrow-down" ng-click="update(selected.clone().subtract(1, 'seconds'))"></div>
5656
</div>
5757
</div>
5858
<div class="clear-button" ng-if="!!datetime">
59-
<div ng-click="setDate()">Clear</div>
59+
<div ng-click="update()">Clear</div>
6060
</div>
6161
</div>
6262
</div>

‎src/datetime-input.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ directive('datetimeInput', ['$document', function ($document) {
3333
};
3434

3535
// Update selected date
36-
scope.setDate = function (date, calendar_update) {
37-
if ( scope.selected.isSame(date) ) { return; }
38-
if ( !date ) {
36+
scope.update = function (datetime, calendar_update) {
37+
if ( scope.selected.isSame(datetime) ) { return; }
38+
if ( !datetime ) {
3939
scope.selected = scope.datetime = undefined;
4040
} else {
41-
scope.selected.year(date.year()).month(date.month()).date(date.date()).hours(date.hours()).minutes(date.minutes()).seconds(date.seconds());
41+
scope.selected.year(datetime.year()).month(datetime.month()).date(datetime.date()).hours(datetime.hours()).minutes(datetime.minutes()).seconds(datetime.seconds());
4242
if ( (scope.selected.clone().startOf('week').month() !== scope.calendar.month() && scope.selected.clone().endOf('week').month() !== scope.calendar.month()) || calendar_update ) {
4343
scope.calendar = scope.selected.clone();
4444
}

‎src/time-input.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@
1111
</div>
1212
<div class="timer">
1313
<div class="timer-hours">
14-
<div class="arrow arrow-up" ng-click="setDate(selected.clone().add(1, 'hours'))"></div>
14+
<div class="arrow arrow-up" ng-click="update(selected.clone().add(1, 'hours'))"></div>
1515
{{ selected.format('HH') }}
16-
<div class="arrow arrow-down" ng-click="setDate(selected.clone().subtract(1, 'hours'))"></div>
16+
<div class="arrow arrow-down" ng-click="update(selected.clone().subtract(1, 'hours'))"></div>
1717
</div>
1818
<div class="timer-divider">:</div>
1919
<div class="timer-minutes">
20-
<div class="arrow arrow-up" ng-click="setDate(selected.clone().add(1, 'minutes'))"></div>
20+
<div class="arrow arrow-up" ng-click="update(selected.clone().add(1, 'minutes'))"></div>
2121
{{ selected.format('mm') }}
22-
<div class="arrow arrow-down" ng-click="setDate(selected.clone().subtract(1, 'minutes'))"></div>
22+
<div class="arrow arrow-down" ng-click="update(selected.clone().subtract(1, 'minutes'))"></div>
2323
</div>
2424
<div class="timer-divider">:</div>
2525
<div class="timer-seconds">
26-
<div class="arrow arrow-up" ng-click="setDate(selected.clone().add(1, 'seconds'))"></div>
26+
<div class="arrow arrow-up" ng-click="update(selected.clone().add(1, 'seconds'))"></div>
2727
{{ selected.format('ss') }}
28-
<div class="arrow arrow-down" ng-click="setDate(selected.clone().subtract(1, 'seconds'))"></div>
28+
<div class="arrow arrow-down" ng-click="update(selected.clone().subtract(1, 'seconds'))"></div>
2929
</div>
3030
</div>
3131
<div class="clear-button" ng-if="!!time">
32-
<div ng-click="setDate()">Clear</div>
32+
<div ng-click="update()">Clear</div>
3333
</div>
3434
</div>
3535
</div>

‎src/time-input.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ directive('timeInput', ['$document', function ($document) {
2929
};
3030

3131
// Update selected time
32-
scope.setDate = function (datetime, calendar_update) {
32+
scope.update = function (datetime, calendar_update) {
3333
if ( scope.selected.isSame(datetime) ) { return; }
3434
if ( !datetime ) {
3535
scope.selected = scope.time = undefined;

0 commit comments

Comments
 (0)