Merge pull request #36 from Fishrock123/windows-control-key

Map the ctrl key as cmd if the user is on windows.

Author: artursapek

build/index.html

@@ -256,17 +256,17 @@
 
           <div class="menu-item red" id="save-item">
               <span buttontext>Save</span>
-              <div class="shortcut"><span class="modifier">⌘</span>S</div>
+              <div class="shortcut"><span class="modifier ⌘"></span>S</div>
           </div>
 
           <div class="menu-item red shortcut" id="save-as-item">Save as...
-              <div class="shortcut"><span class="modifier">⇧⌘</span>S</div>
+              <div class="shortcut"><span class="modifier ⌘">⇧</span>S</div>
           </div>
 
           <div class="separator"><div class="separator-line"></div></div>
 
           <div class="menu-item red shortcut" id="open-item">Open...
-              <div class="shortcut"><span class="modifier">⌘</span>O</div>
+              <div class="shortcut"><span class="modifier ⌘"></span>O</div>
           </div>
 
           <div class="menu-item red" id="open-from-hd-item">Open from hard drive...
@@ -304,11 +304,11 @@
         <div class="menu-dropdown with-shortcuts" id="edit-menu-dropdown">
 
           <div class="menu-item yellow shortcut" id="undo-item">Undo
-              <div class="shortcut"><span class="modifier">⌘</span>Z</div>
+              <div class="shortcut"><span class="modifier ⌘"></span>Z</div>
           </div>
 
           <div class="menu-item yellow shortcut" id="redo-item">Redo
-              <div class="shortcut"><span class="modifier">⇧⌘</span>Z</div>
+              <div class="shortcut"><span class="modifier ⌘">⇧</span>Z</div>
           </div>
 
           <div class="menu-item yellow shortcut" id="visual-history">Visual History
@@ -318,23 +318,23 @@
           <div class="separator"><div class="separator-line"></div></div>
 
           <div class="menu-item yellow shortcut" id="cut-item">Cut
-              <div class="shortcut"><span class="modifier">⌘</span>X</div>
+              <div class="shortcut"><span class="modifier ⌘"></span>X</div>
           </div>
 
           <div class="menu-item yellow shortcut" id="copy-item">Copy
-              <div class="shortcut"><span class="modifier">⌘</span>C</div>
+              <div class="shortcut"><span class="modifier ⌘"></span>C</div>
           </div>
 
           <div class="menu-item yellow shortcut" id="paste-item">Paste
-              <div class="shortcut"><span class="modifier">⌘</span>V</div>
+              <div class="shortcut"><span class="modifier ⌘"></span>V</div>
           </div>
 
           <div class="menu-item yellow shortcut" id="delete-item">Delete
               <div class="shortcut"><span class="modifier">⌫</span></div>
           </div>
 
           <div class="menu-item yellow shortcut bottom" id="select-all-item">Select all
-              <div class="shortcut"><span class="modifier">⌘</span>A</div>
+              <div class="shortcut"><span class="modifier ⌘"></span>A</div>
           </div>
 
         </div>

src/coffee/ui/hotkeys.coffee

@@ -164,6 +164,14 @@ ui.hotkeys =
 
   lastEvent: {}
 
+  modifierCodes:
+    8: 'backspace'
+    16: 'shift'
+    17: 'ctrl'
+    18: 'alt'
+    91: 'cmd'
+    92: 'cmd'
+    224: 'cmd'
 
   ###
     Strategy:
@@ -178,6 +186,11 @@ ui.hotkeys =
   ###
 
   setup: ->
+    # Map the ctrl key as cmd if the user is on windows.
+    if ~navigator.appVersion.indexOf("Win")
+      @modifierCodes[17] = 'cmd'
+      dom.body?.setAttribute 'os', 'windows'
+
     @use "app"
 
     ui.window.on 'focus', =>
@@ -205,17 +218,10 @@ ui.hotkeys =
       # Save this event for
       @lastEvent = e
 
-      if not e.metaKey
-        @cmdDown = false
-        @registerModifierUp "cmd"
-      else
-        @registerModifier "cmd"
-
       # Cmd has been pushed
       if keystroke is 'cmd'
-        if not @cmdDown
-          @cmdDown = true # Custom tracking for cmd
-          @registerModifier "cmd"
+        @cmdDown = true # Custom tracking for cmd
+        @registerModifier "cmd"
         return
 
       else if keystroke in ['shift', 'alt', 'ctrl']
@@ -323,8 +329,7 @@ ui.hotkeys =
       @using.up?.always?.call(@using.context, @lastEvent)
 
       if keystroke is 'cmd' # CMD has been released!
-        @modifiersDown = @modifiersDown.remove 'cmd'
-        ui.uistate.get('tool').deactivateModifier 'cmd'
+        @registerModifierUp keystroke
         @keysDown = []
         @cmdDown = false
 
@@ -335,8 +340,7 @@ ui.hotkeys =
         return @maintainInterval()
 
       else if keystroke in ['shift', 'alt', 'ctrl']
-        @modifiersDown = @modifiersDown.remove keystroke
-        ui.uistate.get('tool').deactivateModifier keystroke
+        @registerModifierUp keystroke
         return @maintainInterval()
       else
         @keysDown = @keysDown.remove keystroke
@@ -404,17 +408,8 @@ ui.hotkeys =
 
   parseKeystroke: (e) ->
 
-    modifiers =
-      8: 'backspace'
-      16: 'shift'
-      17: 'ctrl'
-      18: 'alt'
-      91: 'cmd'
-      92: 'cmd'
-      224: 'cmd'
-
-    if modifiers[e.which]?
-      return modifiers[e.which]
+    if @modifierCodes[e.which]?
+      return @modifierCodes[e.which]
 
     accepted = [
       new Range(9, 9) # Enter

src/less/ui.less

@@ -89,6 +89,22 @@ body {
       cursor: none!important;
     }
   }
+
+  .⌘ {
+    &:after {
+      content: '⌘';
+    }
+  }
+
+  &[os="windows"] {
+    .⌘ {
+      &:after {
+        content: 'ctrl';
+        margin: auto 2px;
+        letter-spacing: -0.01em;
+      }
+    }
+  }
 }
 
 div#canvas {