fix keybinds

tempusdominus · Mar 15, 2018 · 34d6f78 · 34d6f78
1 parent 4cfa060
commit 34d6f78
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 8 deletions.
diff --git a/build/js/tempusdominus-core.js b/build/js/tempusdominus-core.js
@@ -245,6 +245,9 @@ var DateTimePicker = function ($, moment) {
                 return true;
             },
             enter: function enter() {
+                if (!this.widget) {
+                    return false;
+                }
                 this.hide();
                 return true;
             },
@@ -265,6 +268,9 @@ var DateTimePicker = function ($, moment) {
                 return true;
             },
             t: function t() {
+                if (!this.widget) {
+                    return false;
+                }
                 this.date(this.getMoment());
                 return true;
             },
@@ -657,7 +663,7 @@ var DateTimePicker = function ($, moment) {
             }
 
             if (handler) {
-                if (handler.call(this.widget)) {
+                if (handler.call(this)) {
                     e.stopPropagation();
                     e.preventDefault();
                 }

diff --git a/build/js/tempusdominus-core.min.js b/build/js/tempusdominus-core.min.js
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "tempusdominus/core",
   "type": "component",
-  "version": "5.0.0-alpha16",
+  "version": "5.0.0-alpha17",
   "description": "Tempus Dominus core",
   "keywords": [
     "bootstrap",

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/tempusdominus/core/issues"
   },
   "dependencies": {
-    "jquery": "^1.9.1 || ^2.0 || ^3.0",
+    "jquery": "^3.0",
     "moment": "^2.10",
     "moment-timezone": "^0.4.0"
   },
@@ -49,7 +49,7 @@
     "type": "git",
     "url": "https://github.com/tempusdominus/core.git"
   },
-  "version": "5.0.0-alpha16",
+  "version": "5.0.0-alpha17",
   "files": [
     "build",
     "src/js/**/*.js",

diff --git a/src/js/tempusdominus-core.js b/src/js/tempusdominus-core.js
@@ -244,6 +244,9 @@ const DateTimePicker = (($, moment) => {
                     return true;
                 },
                 enter: function () {
+                    if (!this.widget) {
+                        return false;
+                    }
                     this.hide();
                     return true;
                 },
@@ -264,6 +267,9 @@ const DateTimePicker = (($, moment) => {
                     return true;
                 },
                 t: function () {
+                    if (!this.widget) {
+                        return false;
+                    }
                     this.date(this.getMoment());
                     return true;
                 },
@@ -709,7 +715,7 @@ const DateTimePicker = (($, moment) => {
             }
 
             if (handler) {
-                if (handler.call(this.widget)) {
+                if (handler.call(this)) {
                     e.stopPropagation();
                     e.preventDefault();
                 }

diff --git a/tasks/bump-version.js b/tasks/bump-version.js
@@ -15,7 +15,19 @@ module.exports = function (grunt) {
                 ]
             }
         });
-
+
+        grunt.config('string-replace.package-json-lock', {
+            files: { 'package-lock.json': 'package-lock.json' },
+            options: {
+                replacements: [
+                    {
+                        pattern: /"version": .*/,
+                        replacement: '"version": "' + version + '",'
+                    }
+                ]
+            }
+        });
+
         grunt.config('string-replace.composer-json', {
             files: {'composer.json': 'composer.json'},
             options: {
@@ -46,4 +58,4 @@ module.exports = function (grunt) {
             'string-replace:js'
         ]);
     });
-};
+};