Skip to content

Commit 34d6f78

Browse files
committed
fix keybinds
1 parent 4cfa060 commit 34d6f78

File tree

6 files changed

+32
-8
lines changed

6 files changed

+32
-8
lines changed

build/js/tempusdominus-core.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,9 @@ var DateTimePicker = function ($, moment) {
245245
return true;
246246
},
247247
enter: function enter() {
248+
if (!this.widget) {
249+
return false;
250+
}
248251
this.hide();
249252
return true;
250253
},
@@ -265,6 +268,9 @@ var DateTimePicker = function ($, moment) {
265268
return true;
266269
},
267270
t: function t() {
271+
if (!this.widget) {
272+
return false;
273+
}
268274
this.date(this.getMoment());
269275
return true;
270276
},
@@ -657,7 +663,7 @@ var DateTimePicker = function ($, moment) {
657663
}
658664

659665
if (handler) {
660-
if (handler.call(this.widget)) {
666+
if (handler.call(this)) {
661667
e.stopPropagation();
662668
e.preventDefault();
663669
}

build/js/tempusdominus-core.min.js

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tempusdominus/core",
33
"type": "component",
4-
"version": "5.0.0-alpha16",
4+
"version": "5.0.0-alpha17",
55
"description": "Tempus Dominus core",
66
"keywords": [
77
"bootstrap",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/tempusdominus/core/issues"
1111
},
1212
"dependencies": {
13-
"jquery": "^1.9.1 || ^2.0 || ^3.0",
13+
"jquery": "^3.0",
1414
"moment": "^2.10",
1515
"moment-timezone": "^0.4.0"
1616
},
@@ -49,7 +49,7 @@
4949
"type": "git",
5050
"url": "https://github.com/tempusdominus/core.git"
5151
},
52-
"version": "5.0.0-alpha16",
52+
"version": "5.0.0-alpha17",
5353
"files": [
5454
"build",
5555
"src/js/**/*.js",

src/js/tempusdominus-core.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ const DateTimePicker = (($, moment) => {
244244
return true;
245245
},
246246
enter: function () {
247+
if (!this.widget) {
248+
return false;
249+
}
247250
this.hide();
248251
return true;
249252
},
@@ -264,6 +267,9 @@ const DateTimePicker = (($, moment) => {
264267
return true;
265268
},
266269
t: function () {
270+
if (!this.widget) {
271+
return false;
272+
}
267273
this.date(this.getMoment());
268274
return true;
269275
},
@@ -709,7 +715,7 @@ const DateTimePicker = (($, moment) => {
709715
}
710716

711717
if (handler) {
712-
if (handler.call(this.widget)) {
718+
if (handler.call(this)) {
713719
e.stopPropagation();
714720
e.preventDefault();
715721
}

tasks/bump-version.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@ module.exports = function (grunt) {
1515
]
1616
}
1717
});
18-
18+
19+
grunt.config('string-replace.package-json-lock', {
20+
files: { 'package-lock.json': 'package-lock.json' },
21+
options: {
22+
replacements: [
23+
{
24+
pattern: /"version": .*/,
25+
replacement: '"version": "' + version + '",'
26+
}
27+
]
28+
}
29+
});
30+
1931
grunt.config('string-replace.composer-json', {
2032
files: {'composer.json': 'composer.json'},
2133
options: {
@@ -46,4 +58,4 @@ module.exports = function (grunt) {
4658
'string-replace:js'
4759
]);
4860
});
49-
};
61+
};

0 commit comments

Comments
 (0)