Skip to content
This repository has been archived by the owner on Nov 19, 2019. It is now read-only.

Allow shiftKey for zoomKey option #145

Merged
merged 2 commits into from
Mar 30, 2019
Merged

Allow shiftKey for zoomKey option #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6acba0
add shiftKey to zoomKey options
sbusch Mar 26, 2019
ea4539e
fix docs
sbusch Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/src/OptionsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions lib/timeline/optionsTimeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -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]
}
Expand Down