Skip to content

Commit ec7af71

Browse files
committed
v2.0.3
1 parent 38b681c commit ec7af71

File tree

7 files changed

+53
-11
lines changed

7 files changed

+53
-11
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
# 2.0.3
4+
* Bugfix: show calendar and clock icons in Firefox - #114
5+
36
## 2.0.2
47
* Bugfix: fire `change` and `change:time` events when the selected time changes - bf5d62095e9e4faa9b948a3a53fda9898b1d1810
58
* Bugfix: do not reset time to 00:00 when clicking on the selected date - bbdc188c5508afed73ad3cb60ec43f2991d3c48f

dist/material-datetime-picker.css

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@
121121
.c-datepicker__header-date__time > span {
122122
display: inline-block; }
123123

124-
.c-datepicker--show-time:checked ~ .c-datepicker__header .c-datepicker__header-date__time {
124+
.c-datepicker--show-time.is-selected ~ .c-datepicker__header .c-datepicker__header-date__time {
125125
opacity: 1; }
126126

127-
.c-datepicker--show-calendar:checked ~ .c-datepicker__header .c-datepicker__header-date__month, .c-datepicker--show-calendar:checked ~ .c-datepicker__header .c-datepicker__header-date__day {
127+
.c-datepicker--show-calendar.is-selected ~ .c-datepicker__header .c-datepicker__header-date__month, .c-datepicker--show-calendar.is-selected ~ .c-datepicker__header .c-datepicker__header-date__day {
128128
opacity: 1; }
129129

130130
.modal-btns {
@@ -208,7 +208,8 @@
208208

209209
.c-datepicker__toggle {
210210
top: 170px;
211-
width: 23px;
211+
width: 36px;
212+
height: 30px;
212213
visibility: hidden;
213214
opacity: 0.5;
214215
z-index: 1;
@@ -220,13 +221,13 @@
220221
.c-datepicker__toggle--left {
221222
left: 10px; }
222223

223-
.c-datepicker__toggle:checked {
224+
.c-datepicker__toggle.is-selected {
224225
opacity: 1; }
225226

226-
.c-datepicker--show-time:checked ~ .c-datepicker__calendar {
227+
.c-datepicker--show-time.is-selected ~ .c-datepicker__calendar {
227228
display: none; }
228229

229-
.c-datepicker--show-calendar:checked ~ .c-datepicker__clock {
230+
.c-datepicker--show-calendar.is-selected ~ .c-datepicker__clock {
230231
display: none; }
231232

232233
.c-datepicker__clock {

dist/material-datetime-picker.js

Lines changed: 20 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/material-datetime-picker.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/material-datetime-picker.mjs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import rome from 'rome';
22
import moment from 'moment';
33

44
var popupTemplate = (function () {
5-
return "\n<div class=\"c-datepicker\">\n <input class=\"c-datepicker__toggle c-datepicker__toggle--right c-datepicker--show-time\" type=\"radio\" name=\"date-toggle\" value=\"time\" >\n\n <input class=\"c-datepicker__toggle c-datepicker__toggle--left c-datepicker--show-calendar\" type=\"radio\" name=\"date-toggle\" value=\"calendar\" checked>\n\n <div class=\"c-datepicker__header\">\n <div class=\"c-datepicker__header-day\">\n <span class=\"js-day\">Monday</span>\n </div>\n <div class=\"c-datepicker__header-date\">\n <span class=\"c-datepicker__header-date__month js-date-month\"></span>\n <span class=\"c-datepicker__header-date__day js-date-day\"></span>\n <span class=\"c-datepicker__header-date__time js-date-time\">\n <span class=\"c-datepicker__header-date__hours js-date-hours\">09</span>:<span class=\"c-datepicker__header-date__minutes js-date-minutes\">00</span>\n </span>\n </div>\n </div>\n\n <div class=\"c-datepicker__calendar\"></div>\n <div class=\"c-datepicker__clock\">\n <div class=\"c-datepicker__clock__am-pm-toggle\">\n <label class=\"c-datepicker__toggle--checked\">\n <input checked=\"checked\" class=\"c-datepicker__toggle c-datepicker__toggle--right c-datepicker__clock--am\" type=\"radio\" name=\"time-date-toggle\" value=\"AM\" />\n AM\n </label>\n\n <label>\n <input class=\"c-datepicker__toggle c-datepicker__toggle--right c-datepicker__clock--pm\" type=\"radio\" name=\"time-date-toggle\" value=\"PM\" />\n PM\n </label>\n </div>\n <div class=\"c-datepicker__mask\"></div>\n <div class=\"c-datepicker__clock__hours\">\n <div class=\"c-datepicker__clock__num\" data-number=\"3\">3</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"4\">4</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"5\">5</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"6\">6</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"7\">7</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"8\">8</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"9\">9</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"10\">10</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"11\">11</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"0\">12</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"1\">1</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"2\">2</div>\n <div class=\"c-datepicker__clock-hands\">\n <div class=\"c-datepicker__hour-hand\"></div>\n </div>\n </div>\n <div class=\"c-datepicker__clock__minutes\">\n <div class=\"c-datepicker__clock__num\" data-number=\"15\">15</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"20\">20</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"25\">25</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"30\">30</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"35\">35</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"40\">40</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"45\">45</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"50\">50</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"55\">55</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"0\">0</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"5\">5</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"10\">10</div>\n <div class=\"c-datepicker__clock-hands\">\n <div class=\"c-datepicker__hour-hand\"></div>\n </div>\n </div>\n </div>\n <div class=\"modal-btns\">\n <a class=\"c-btn c-btn--flat js-cancel\">Cancel</a>\n <a class=\"c-btn c-btn--flat js-ok\">OK</a>\n </div>\n</div>\n";
5+
return "\n<div class=\"c-datepicker\">\n <a class=\"c-datepicker__toggle c-datepicker__toggle--right c-datepicker--show-time js-show-clock\" title=\"show time picker\">\n </a>\n\n <a class=\"c-datepicker__toggle c-datepicker__toggle--left c-datepicker--show-calendar is-selected js-show-calendar\" title=\"show date picker\">\n </a>\n\n <div class=\"c-datepicker__header\">\n <div class=\"c-datepicker__header-day\">\n <span class=\"js-day\">Monday</span>\n </div>\n <div class=\"c-datepicker__header-date\">\n <span class=\"c-datepicker__header-date__month js-date-month\"></span>\n <span class=\"c-datepicker__header-date__day js-date-day\"></span>\n <span class=\"c-datepicker__header-date__time js-date-time\">\n <span class=\"c-datepicker__header-date__hours js-date-hours\">09</span>:<span class=\"c-datepicker__header-date__minutes js-date-minutes\">00</span>\n </span>\n </div>\n </div>\n\n <div class=\"c-datepicker__calendar\"></div>\n <div class=\"c-datepicker__clock\">\n <div class=\"c-datepicker__clock__am-pm-toggle\">\n <label class=\"c-datepicker__toggle--checked\">\n <input checked=\"checked\" class=\"c-datepicker__toggle c-datepicker__toggle--right c-datepicker__clock--am\" type=\"radio\" name=\"time-date-toggle\" value=\"AM\" />\n AM\n </label>\n\n <label>\n <input class=\"c-datepicker__toggle c-datepicker__toggle--right c-datepicker__clock--pm\" type=\"radio\" name=\"time-date-toggle\" value=\"PM\" />\n PM\n </label>\n </div>\n <div class=\"c-datepicker__mask\"></div>\n <div class=\"c-datepicker__clock__hours\">\n <div class=\"c-datepicker__clock__num\" data-number=\"3\">3</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"4\">4</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"5\">5</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"6\">6</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"7\">7</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"8\">8</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"9\">9</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"10\">10</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"11\">11</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"0\">12</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"1\">1</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"2\">2</div>\n <div class=\"c-datepicker__clock-hands\">\n <div class=\"c-datepicker__hour-hand\"></div>\n </div>\n </div>\n <div class=\"c-datepicker__clock__minutes\">\n <div class=\"c-datepicker__clock__num\" data-number=\"15\">15</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"20\">20</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"25\">25</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"30\">30</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"35\">35</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"40\">40</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"45\">45</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"50\">50</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"55\">55</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"0\">0</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"5\">5</div>\n <div class=\"c-datepicker__clock__num\" data-number=\"10\">10</div>\n <div class=\"c-datepicker__clock-hands\">\n <div class=\"c-datepicker__hour-hand\"></div>\n </div>\n </div>\n </div>\n <div class=\"modal-btns\">\n <a class=\"c-btn c-btn--flat js-cancel\">Cancel</a>\n <a class=\"c-btn c-btn--flat js-ok\">OK</a>\n </div>\n</div>\n";
66
});
77

88
var scrimTemplate = (function (_ref) {
@@ -376,6 +376,13 @@ var DateTimePicker = function (_Events) {
376376
return _this4.clickPm(e);
377377
}, false);
378378

379+
this.$('.js-show-calendar').addEventListener('click', function (e) {
380+
return _this4.clickShowCalendar(e);
381+
}, false);
382+
this.$('.js-show-clock').addEventListener('click', function (e) {
383+
return _this4.clickShowClock(e);
384+
}, false);
385+
379386
return this;
380387
}
381388
}, {
@@ -463,6 +470,18 @@ var DateTimePicker = function (_Events) {
463470
this.set(newValue);
464471
return this;
465472
}
473+
}, {
474+
key: 'clickShowCalendar',
475+
value: function clickShowCalendar() {
476+
this.$(".js-show-calendar").classList.add("is-selected");
477+
this.$(".js-show-clock").classList.remove("is-selected");
478+
}
479+
}, {
480+
key: 'clickShowClock',
481+
value: function clickShowClock() {
482+
this.$(".js-show-clock").classList.add("is-selected");
483+
this.$(".js-show-calendar").classList.remove("is-selected");
484+
}
466485
}, {
467486
key: 'data',
468487
value: function data(val) {

dist/material-datetime-picker.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "material-datetime-picker",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "A Vanilla JS Material Design date/time picker component",
55
"main": "dist/material-datetime-picker.js",
66
"module": "dist/material-datetime-picker.mjs",

0 commit comments

Comments
 (0)