Merge branch 'refs/heads/timeline-local' into TimelineUber

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, {
 
         timelineLeftPaneKeydown: {
                 value: function(event) {
+                        var ua = navigator.userAgent.toLowerCase(),
+                                boolIsMac = false;
+                        if (ua.indexOf("mac") > -1) {
+                                boolIsMac = true;
+                        }
                         if (event.keyCode === 16) {
                                 // Shift key has been pressed
                                 this._isShiftPressed = true;
                         }
-                        if (event.keyCode === 17) {
+                        if ((event.keyCode === 17) && !boolIsMac) {
                                 // Control key has been pressed
                                 this._isControlPressed = true;
                         }
+                        if (event.metaKey === true) {
+                                this._isControlPressed = true;
+                        }
                 }
         },
     
         timelineLeftPaneKeyup: {
                 value: function(event) {
+                        var ua = navigator.userAgent.toLowerCase(),
+                                boolIsMac = false;
+                        if (ua.indexOf("mac") > -1) {
+                                boolIsMac = true;
+                        }
                         if (event.keyCode === 16) {
                                 // Shift key has been released
                                 this._isShiftPressed = false;
                         }
-                        if (event.keyCode === 17) {
+                        if ((event.keyCode === 17) && !boolIsMac) {
                                 // Control key has been released
                                 this._isControlPressed = false;
                         }
+                        if (event.metaKey === false) {
+                                this._isControlPressed = false;
+                        }
                 }
         },
     createstageElement:{