Merge pull request #145 from sbusch/zoomkey

Allow `shiftKey` for `zoomKey` option
yotamberk · Mar 30, 2019 · 830e848 · 830e848
2 parents bf1baed + ea4539e
commit 830e848
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docs/src/OptionsPage.js b/docs/src/OptionsPage.js
@@ -287,7 +287,7 @@ class OptionsPage extends React.Component {
           <td>Boolean</td>
           <td>false</td>
           <td>This option allows you to scroll horizontally to move backwards and forwards in the time range.
-          Only applicable when option <code>{`zoomCtrl`}</code> is defined or <code>{`zoomable`}</code> is <code>{`false`}</code>.
+          Only applicable when option <code>{`zoomKey`}</code> is defined or <code>{`zoomable`}</code> is <code>{`false`}</code>.
           </td>
         </tr>
 
@@ -810,7 +810,7 @@ class OptionsPage extends React.Component {
         <tr parent="tooltip">
           <td className="indent">tooltip.delay</td>
           <td>Number</td>
-          <td><code>{`'500'`}</code></td>
+          <td><code>{`500`}</code></td>
           <td>
             Set a value (in ms) that the tooltip is delayed before showing.
           </td>
@@ -882,7 +882,7 @@ class OptionsPage extends React.Component {
           <td>String</td>
           <td><code>{`''`}</code></td>
           <td>Specifies whether the Timeline is only zoomed when an additional key is down.
-            Available values are '' (does not apply), 'altKey', 'ctrlKey', or 'metaKey'.
+            Available values are '' (does not apply), 'altKey', 'ctrlKey', 'shiftKey' or 'metaKey'.
             Only applicable when option <code>{`moveable`}</code> is set <code>{`true`}</code>.
           </td>
         </tr>

diff --git a/lib/timeline/optionsTimeline.js b/lib/timeline/optionsTimeline.js
@@ -181,7 +181,7 @@ let allOptions = {
   width: {string, number},
   preferZoom: { 'boolean': bool},
   zoomable: { 'boolean': bool},
-  zoomKey: {string: ['ctrlKey', 'altKey', 'metaKey', '']},
+  zoomKey: {string: ['ctrlKey', 'altKey', 'shiftKey', 'metaKey', '']},
   zoomFriction: {number},
   zoomMax: {number},
   zoomMin: {number},
@@ -284,7 +284,7 @@ let configureOptions = {
     type: ['box', 'point', 'range', 'background'],
     width: '100%',
     zoomable: true,
-    zoomKey: ['ctrlKey', 'altKey', 'metaKey', ''],
+    zoomKey: ['ctrlKey', 'altKey', 'shiftKey', 'metaKey', ''],
     zoomMax: [315360000000000, 10, 315360000000000, 1],
     zoomMin: [10, 10, 315360000000000, 1]
   }