Skip to content

Commit c8c7060

Browse files
committed
Merge branch 'refs/heads/pr/6' into gh-pages
# Conflicts: # dist/angular-material-datetimepicker.min.js.map
2 parents 28020e7 + e9a8759 commit c8c7060

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

js/angular-material-datetimepicker.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
+ ' <div class="dtp-picker-datetime" ng-cloak ng-if="picker.currentView !== picker.VIEWS.DATE">'
4343
+ ' <div class="dtp-actual-meridien">'
4444
+ ' <div class="left p20">'
45-
+ ' <a href="#" mdc-dtp-noclick class="dtp-meridien-am" ng-class="{selected: picker.meridien == \'AM\'}" ng-click="picker.selectAM()">{{picker.params.amText}}</a>'
45+
+ ' <a id="time-periods-am" href="#" mdc-dtp-noclick class="dtp-meridien-am" ng-class="{selected: picker.meridien == \'AM\'}" ng-click="picker.selectAM()">{{picker.params.amText}}</a>'
4646
+ ' </div>'
4747
+ ' <div ng-show="!picker.timeMode" class="dtp-actual-time p60">{{picker.currentNearest5Minute().format(picker.params.shortTime ? "hh:mm" : "HH:mm")}}</div>'
4848
+ ' <div class="right p20">'
49-
+ ' <a href="#" mdc-dtp-noclick class="dtp-meridien-pm" ng-class="{selected: picker.meridien == \'PM\'}" ng-click="picker.selectPM()">{{picker.params.pmText}}</a>'
49+
+ ' <a id="time-periods-pm" href="#" mdc-dtp-noclick class="dtp-meridien-pm" ng-class="{selected: picker.meridien == \'PM\'}" ng-click="picker.selectPM()">{{picker.params.pmText}}</a>'
5050
+ ' </div>'
5151
+ ' <div class="clearfix"></div>'
5252
+ ' </div>'
@@ -746,7 +746,7 @@
746746
//build a
747747
var scopeRef = 'month[\'days\'][' + i + '][' + j + ']';
748748

749-
tbodyHtml.push('<a href="#" mdc-dtp-noclick class="dtp-select-day" ng-class="{selected: cal.isSelectedDay(' + scopeRef + '), hilite: cal.isDateOfTheDay(' + scopeRef + ')}" ng-click="cal.selectDate(' + scopeRef + ')">');
749+
tbodyHtml.push('<a id="date-' + weekDay.format('YYYY-MM-DD') + '" href="#" mdc-dtp-noclick class="dtp-select-day" ng-class="{selected: cal.isSelectedDay(' + scopeRef + '), hilite: cal.isDateOfTheDay(' + scopeRef + ')}" ng-click="cal.selectDate(' + scopeRef + ')">');
750750
tbodyHtml.push(weekDay.format('D'));
751751
tbodyHtml.push('</a>');
752752
} else {
@@ -814,7 +814,7 @@
814814

815815
var template = '<div class="dtp-picker-clock"><span ng-if="!points || points.length < 1">&nbsp;</span>'
816816
+ '<div ng-repeat="point in points" class="dtp-picker-time" ng-style="point.style">'
817-
+ ' <a href="#" mdc-dtp-noclick ng-class="{selected: point.value===currentValue}" class="dtp-select-hour" ng-click="setTime(point.value)" ng-if="pointAvailable(point)">{{point.display}}</a>'
817+
+ ' <a href="#" id="time-{{mode}}-{{point.display}}" mdc-dtp-noclick ng-class="{selected: point.value===currentValue}" class="dtp-select-hour" ng-click="setTime(point.value)" ng-if="pointAvailable(point)">{{point.display}}</a>'
818818
+ ' <a href="#" mdc-dtp-noclick class="disabled dtp-select-hour" ng-if="!pointAvailable(point)">{{point.display}}</a>'
819819
+ '</div>'
820820
+ '<div class="dtp-hand dtp-hour-hand"></div>'
@@ -882,6 +882,7 @@
882882
}
883883

884884
scope.points = points;
885+
scope.mode = attrs.mode;
885886
setCurrentValue();
886887
clock.css('height', clockWidth + 'px');
887888
//picker.initHands(true);

0 commit comments

Comments
 (0)