Zoom page when using mousewheel + CTRL key (browser default) #468

jcubic · Apr 5, 2019 · d22f2d1 · d22f2d1
1 parent 357d16e
commit d22f2d1
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 * add $.terminal.pipe function
 * allow to return string from onPaste (not only a promise)
 * add CTRL+Home and CTRL+End keys + HOME and END move cursor to the end and beginning of the line [#479](https://github.com/jcubic/jquery.terminal/issues/479)
+* Zoom page when using mousewheel + CTRL key (browser default) [#468](https://github.com/jcubic/jquery.terminal/issues/468)
 ### Bugfix
 * fix selecting whole text of single .cmd line
 * fix double call of async prompt with async interpreter [#474](https://github.com/jcubic/jquery.terminal/issues/474)

diff --git a/js/jquery.terminal-2.2.0.js b/js/jquery.terminal-2.2.0.js
@@ -35,7 +35,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Fri, 05 Apr 2019 13:45:55 +0000
+ * Date: Fri, 05 Apr 2019 15:02:18 +0000
  */
 /* global location, setTimeout, window, global, sprintf, setImmediate,
           IntersectionObserver,  ResizeObserver, module, require, define,
@@ -3500,7 +3500,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Fri, 05 Apr 2019 13:45:55 +0000',
+        date: 'Fri, 05 Apr 2019 15:02:18 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -8758,7 +8758,7 @@
                         if (ret === true) {
                             return;
                         }
-                        if (have_scrollbar() || ret === false) {
+                        if (have_scrollbar() || ret === false || !event.ctrlKey) {
                             event.stopPropagation();
                             event.preventDefault();
                         }

diff --git a/js/jquery.terminal-2.2.0.min.js b/js/jquery.terminal-2.2.0.min.js
diff --git a/js/jquery.terminal-src.js b/js/jquery.terminal-src.js
@@ -8758,7 +8758,7 @@
                         if (ret === true) {
                             return;
                         }
-                        if (have_scrollbar() || ret === false) {
+                        if (have_scrollbar() || ret === false || !event.ctrlKey) {
                             event.stopPropagation();
                             event.preventDefault();
                         }

diff --git a/js/jquery.terminal.js b/js/jquery.terminal.js
@@ -35,7 +35,7 @@
  * emoji regex v7.0.1 by Mathias Bynens
  * MIT license
  *
- * Date: Fri, 05 Apr 2019 13:45:55 +0000
+ * Date: Fri, 05 Apr 2019 15:02:18 +0000
  */
 /* global location, setTimeout, window, global, sprintf, setImmediate,
           IntersectionObserver,  ResizeObserver, module, require, define,
@@ -3500,7 +3500,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Fri, 05 Apr 2019 13:45:55 +0000',
+        date: 'Fri, 05 Apr 2019 15:02:18 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -8758,7 +8758,7 @@
                         if (ret === true) {
                             return;
                         }
-                        if (have_scrollbar() || ret === false) {
+                        if (have_scrollbar() || ret === false || !event.ctrlKey) {
                             event.stopPropagation();
                             event.preventDefault();
                         }

diff --git a/js/jquery.terminal.min.js b/js/jquery.terminal.min.js
diff --git a/js/jquery.terminal.min.js.map b/js/jquery.terminal.min.js.map