From 06107dd26056e94dc824883ca03f2a89a8e8f59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarc=C3=ADsio=20Gruppi?= <txgruppi@gmail.com>
Date: Sun, 27 Apr 2014 00:50:36 +0000
Subject: [PATCH 1/2] Change shortcut keys on Mac

---
 src/data/os.js        |  5 +++++
 src/ui/editor.js      | 13 +++++++++++++
 src/ui/global-keys.js | 19 +++++++++++--------
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 src/data/os.js

diff --git a/src/data/os.js b/src/data/os.js
new file mode 100644
index 0000000..25fb500
--- /dev/null
+++ b/src/data/os.js
@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = {
+  isMac: (/^Mac/).test(window.navigator.platform)
+};
diff --git a/src/ui/editor.js b/src/ui/editor.js
index d180e25..90ee105 100644
--- a/src/ui/editor.js
+++ b/src/ui/editor.js
@@ -177,6 +177,7 @@ function jack() {/*
 
   "Right-Click in the area to the left to create a new repo"
 
+  -- If you are on ChromeOS, Linux, Windows
   Global-Controls = {
     Control-Shift-R: "Reload the app"
     Control-Plus: "Increase font size"
@@ -189,6 +190,18 @@ function jack() {/*
     -- If you manually close the tree by dragging, toggle remembers this.
   }
 
+  -- But if you are on a Mac
+  Global-Controls-On-Mac = {
+    Command-Shift-R: "Reload the app"
+    Command-Plus: "Increase font size"
+    Command-Minus: "Decrease font size"
+    Command-B: "Apply next Theme"
+    Command-Shift-B: "Apply previous Theme"
+    Command-E: "Toggle focus between editor and file tree"
+    Command-N: "Create new file relative to current or selected"
+    Control-Tilde: "Switch between recently opened files"
+  }
+
   File-Tree-Controls = {
     Up: "Move the selection up"
     Down: "Move the selection down"
diff --git a/src/ui/global-keys.js b/src/ui/global-keys.js
index 6432a8a..66b79d1 100644
--- a/src/ui/global-keys.js
+++ b/src/ui/global-keys.js
@@ -6,21 +6,24 @@ var editor = require('./editor');
 var tree = require('./tree');
 var dialog = require('./dialog');
 var doc = require('data/document');
+var os = require('data/os');
 var pending;
 
 window.addEventListener("keydown", onDown, true);
 window.addEventListener("keyup", onUp, true);
 window.addEventListener("keypress", onPress, true);
 function onDown(evt) {
+  console.log(evt);
+  var ctrlOrMeta = os.isMac ? evt.metaKey : evt.ctrlKey;
   // Ctrl-0
-  if (evt.ctrlKey && !evt.shiftKey && evt.keyCode === 48) zoom.reset();
+  if (ctrlOrMeta && !evt.shiftKey && evt.keyCode === 48) zoom.reset();
   // Ctrl-"+"
-  else if (evt.ctrlKey && !evt.shiftKey && evt.keyCode === 187) zoom.bigger();
+  else if (ctrlOrMeta && !evt.shiftKey && evt.keyCode === 187) zoom.bigger();
   // Ctrl-"-"
-  else if (evt.ctrlKey && !evt.shiftKey && evt.keyCode === 189) zoom.smaller();
+  else if (ctrlOrMeta && !evt.shiftKey && evt.keyCode === 189) zoom.smaller();
   // Ctrl-Shift-R
-  else if (evt.ctrlKey && evt.shiftKey && evt.keyCode === 82) chrome.runtime.reload();
-  else if (evt.ctrlKey && evt.keyCode === 66) {
+  else if (ctrlOrMeta && evt.shiftKey && evt.keyCode === 82) chrome.runtime.reload();
+  else if (ctrlOrMeta && evt.keyCode === 66) {
     // Ctrl-Shift-B
     if (evt.shiftKey) editor.prevTheme();
     // Ctrl-B
@@ -32,16 +35,16 @@ function onDown(evt) {
     else return;
   }
   // Alt+` switches between documents
-  else if (evt.altKey && evt.keyCode === 192) {
+  else if ((os.isMac ? evt.ctrlKey : evt.altKey) && evt.keyCode === 192) {
     pending = true;
     doc.next();
   }
   // Control-E Toggles Tree
-  else if (evt.ctrlKey && evt.keyCode === 69) {
+  else if (ctrlOrMeta && evt.keyCode === 69) {
     tree.toggle();
   }
   // Control-N Create new file
-  else if (evt.ctrlKey && !evt.shiftKey && evt.keyCode === 78) {
+  else if (ctrlOrMeta && !evt.shiftKey && evt.keyCode === 78) {
     tree.newFile();
   }
   else if (!tree.isFocused()) return;

From be18879834b6d75308dd294dd9bdfa3e30ca8292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarc=C3=ADsio=20Gruppi?= <txgruppi@gmail.com>
Date: Sun, 27 Apr 2014 00:59:37 +0000
Subject: [PATCH 2/2] Removed console.log line

---
 src/ui/global-keys.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ui/global-keys.js b/src/ui/global-keys.js
index 66b79d1..70b7bd9 100644
--- a/src/ui/global-keys.js
+++ b/src/ui/global-keys.js
@@ -13,7 +13,6 @@ window.addEventListener("keydown", onDown, true);
 window.addEventListener("keyup", onUp, true);
 window.addEventListener("keypress", onPress, true);
 function onDown(evt) {
-  console.log(evt);
   var ctrlOrMeta = os.isMac ? evt.metaKey : evt.ctrlKey;
   // Ctrl-0
   if (ctrlOrMeta && !evt.shiftKey && evt.keyCode === 48) zoom.reset();