Merge branch 'master' into canary

app/config/keymaps.js

@@ -21,11 +21,11 @@ const _setCommandsForKeys = function(commands_) {
   }
 };
 
-const _import = function(customsKeys) {
+const _import = function(customKeys) {
   try {
     const mapping = JSON.parse(readFileSync(defaultPlatformKeyPath()));
     _setKeysForCommands(mapping);
-    _setKeysForCommands(customsKeys);
+    _setKeysForCommands(customKeys);
     _setCommandsForKeys(commands);
 
     return {commands, keys};
@@ -35,12 +35,12 @@ const _import = function(customsKeys) {
   }
 };
 
-const _extend = function(customsKeys) {
-  if (customsKeys) {
-    for (const command in customsKeys) {
+const _extend = function(customKeys) {
+  if (customKeys) {
+    for (const command in customKeys) {
       if (command) {
-        commands[command] = normalize(customsKeys[command]);
-        keys[normalize(customsKeys[command])] = command;
+        commands[command] = normalize(customKeys[command]);
+        keys[normalize(customKeys[command])] = command;
       }
     }
   }

app/config/paths.js

@@ -36,7 +36,7 @@ const plugs = {
 };
 const yarn = resolve(__dirname, '../../bin/yarn-standalone.js');
 
-const icon = resolve(__dirname, '../static/icon.png');
+const icon = resolve(__dirname, '../static/icon96x96.png');
 
 const keymapPath = resolve(__dirname, '../keymaps');
 const darwinKeys = join(keymapPath, 'darwin.json');

website/index.html

@@ -724,6 +724,11 @@
             </tr>
           </thead>
           <tbody>
+            <tr>
+              <td>"updateChannel"</td>
+              <td>"stable"</td>
+              <td>The update channel to receive updates from</td>
+            </tr>
             <tr>
               <td>"fontSize"</td>
               <td>12</td>
@@ -810,6 +815,11 @@
               <td>false</td>
               <td>If true, selected text will automatically be copied to the clipboard</td>
             </tr>
+            <tr>
+              <td>"quickEdit"</td>
+              <td>false</td>
+              <td>If true, on right click selected text will be copied or pasted if no selection is present (true by default on Windows)</td>
+            </tr>
             <tr>
               <td>"bell"</td>
               <td>"SOUND"</td>