quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-13 04:28:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into canary

Browse source
This commit is contained in:
Guillermo Rauch 2017-09-25 15:23:14 +02:00
commit 3293c3b50a
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/config/keymaps.js
View file

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

2
app/config/paths.js
View file

@ -36,7 +36,7 @@ const plugs = {
}; };
const yarn = resolve(__dirname, '../../bin/yarn-standalone.js'); 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 keymapPath = resolve(__dirname, '../keymaps');
const darwinKeys = join(keymapPath, 'darwin.json'); const darwinKeys = join(keymapPath, 'darwin.json');

BIN
app/static/icon96x96.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

10
website/index.html
View file

@ -724,6 +724,11 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<td>"updateChannel"</td>
<td>"stable"</td>
<td>The update channel to receive updates from</td>
</tr>
<tr> <tr>
<td>"fontSize"</td> <td>"fontSize"</td>
<td>12</td> <td>12</td>
@ -810,6 +815,11 @@
<td>false</td> <td>false</td>
<td>If true, selected text will automatically be copied to the clipboard</td> <td>If true, selected text will automatically be copied to the clipboard</td>
</tr> </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> <tr>
<td>"bell"</td> <td>"bell"</td>
<td>"SOUND"</td> <td>"SOUND"</td>