diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index e613d4d7..470062ba 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1401,27 +1401,43 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1401 | 1401 | ||
1402 | timelineLeftPaneKeydown: { | 1402 | timelineLeftPaneKeydown: { |
1403 | value: function(event) { | 1403 | value: function(event) { |
1404 | var ua = navigator.userAgent.toLowerCase(), | ||
1405 | boolIsMac = false; | ||
1406 | if (ua.indexOf("mac") > -1) { | ||
1407 | boolIsMac = true; | ||
1408 | } | ||
1404 | if (event.keyCode === 16) { | 1409 | if (event.keyCode === 16) { |
1405 | // Shift key has been pressed | 1410 | // Shift key has been pressed |
1406 | this._isShiftPressed = true; | 1411 | this._isShiftPressed = true; |
1407 | } | 1412 | } |
1408 | if (event.keyCode === 17) { | 1413 | if ((event.keyCode === 17) && !boolIsMac) { |
1409 | // Control key has been pressed | 1414 | // Control key has been pressed |
1410 | this._isControlPressed = true; | 1415 | this._isControlPressed = true; |
1411 | } | 1416 | } |
1417 | if (event.metaKey === true) { | ||
1418 | this._isControlPressed = true; | ||
1419 | } | ||
1412 | } | 1420 | } |
1413 | }, | 1421 | }, |
1414 | 1422 | ||
1415 | timelineLeftPaneKeyup: { | 1423 | timelineLeftPaneKeyup: { |
1416 | value: function(event) { | 1424 | value: function(event) { |
1425 | var ua = navigator.userAgent.toLowerCase(), | ||
1426 | boolIsMac = false; | ||
1427 | if (ua.indexOf("mac") > -1) { | ||
1428 | boolIsMac = true; | ||
1429 | } | ||
1417 | if (event.keyCode === 16) { | 1430 | if (event.keyCode === 16) { |
1418 | // Shift key has been released | 1431 | // Shift key has been released |
1419 | this._isShiftPressed = false; | 1432 | this._isShiftPressed = false; |
1420 | } | 1433 | } |
1421 | if (event.keyCode === 17) { | 1434 | if ((event.keyCode === 17) && !boolIsMac) { |
1422 | // Control key has been released | 1435 | // Control key has been released |
1423 | this._isControlPressed = false; | 1436 | this._isControlPressed = false; |
1424 | } | 1437 | } |
1438 | if (event.metaKey === false) { | ||
1439 | this._isControlPressed = false; | ||
1440 | } | ||
1425 | } | 1441 | } |
1426 | }, | 1442 | }, |
1427 | createstageElement:{ | 1443 | createstageElement:{ |