Skip to content

Commit 0aad57c

Browse files
committed
fixup2
1 parent da8e503 commit 0aad57c

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

src/pat/date-picker/date-picker.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ export default Base.extend({
3030
name: "date-picker",
3131
trigger: ".pat-date-picker",
3232

33-
async init(el, opts) {
34-
if (el.jquery) {
35-
el = el[0];
36-
}
33+
async init($el, opts) {
34+
const el = this.el;
3735
//TODO: make parser with options extend missing options.
3836
//this.options = parser.parse(el, opts);
39-
this.options = $.extend(parser.parse(this.$el), this.options);
40-
console.log("3");
41-
console.log(opts);
42-
console.log("4");
43-
console.log(this.options);
37+
this.options = $.extend(parser.parse(el), opts);
4438

4539
this.polyfill = this.options.behavior === "native";
4640
if (this.polyfill && utils.checkInputSupport("date", "invalid date")) {
@@ -70,8 +64,6 @@ export default Base.extend({
7064
$(this._o.field).trigger("input-change");
7165
},
7266
};
73-
console.log("2");
74-
console.log(config);
7567

7668
if (el.getAttribute("min")) {
7769
config.minDate = Moment(el.getAttribute("min")).toDate();
@@ -80,7 +72,10 @@ export default Base.extend({
8072
config.maxDate = Moment(el.getAttribute("max")).toDate();
8173
}
8274

75+
console.log("iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii");
76+
console.log(this.options);
8377
if (this.options.i18n) {
78+
console.log("OKAY");
8479
$.getJSON(this.options.i18n)
8580
.done((data) => {
8681
config.i18n = data;

src/pat/datetime-picker/datetime-picker.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* pat-datetime-picker - Polyfill for input type=datetime-local */
22
import "regenerator-runtime/runtime"; // needed for ``await`` support
3+
import $ from "jquery";
34
import Base from "../../core/base";
45
import DatePicker from "../date-picker/date-picker";
56
import Parser from "../../core/parser";
@@ -20,12 +21,9 @@ export default Base.extend({
2021
name: "datetime-picker",
2122
trigger: ".pat-datetime-picker",
2223

23-
async init(el, opts) {
24-
if (el.jquery) {
25-
el = el[0];
26-
}
27-
this.el = el;
28-
this.options = parser.parse(el, opts);
24+
async init($el, opts) {
25+
const el = this.el;
26+
this.options = $.extend(parser.parse(el), opts);
2927

3028
Moment = await import("moment");
3129
Moment = Moment.default;

0 commit comments

Comments
 (0)