github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-02 18:21:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix find next/previous (#1679) (#1745)

Browse Source 
* fix find next/previous (#1679)

* document new find next/previous shortcuts (#1679)
This commit is contained in:
DanEble 2019-11-27 14:09:32 -05:00 committed by Felix Häusler
parent 1883153913
commit f0e548d7e0
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/KEYBINDINGS.md
View File

@ -58,7 +58,7 @@ Here is an example:
**Edit menu:**
| Id | Default | Description |
|:------------------------ | -------------------------------------------------- | ----------------------------------------------- |
|:------------------------ | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
| `edit.undo` | <kbd>CmdOrCtrl</kbd>+<kbd>Z</kbd> | Undo last operation |
| `edit.redo` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>Z</kbd> | Redo last operation |
| `edit.cut` | <kbd>CmdOrCtrl</kbd>+<kbd>X</kbd> | Cut selected text |
@ -71,8 +71,8 @@ Here is an example:
| `edit.create-paragraph` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>N</kbd> | Create a new paragraph after the current one |
| `edit.delete-paragraph` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>D</kbd> | Delete current paragraph |
| `edit.find` | <kbd>CmdOrCtrl</kbd>+<kbd>F</kbd> | Find information in the document |
| `edit.find-next` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>U</kbd> | Continue the search and find the next match |
| `edit.find-previous` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>U</kbd> | Continue the search and find the previous match |
| `edit.find-next` | <kbd>F3</kbd> | Continue the search and find the next match (or <kbd>Cmd</kbd>+<kbd>G</kbd> on macOS) |
| `edit.find-previous` | <kbd>Shift</kbd>+<kbd>F3</kbd> | Continue the search and find the previous match (or <kbd>Shift</kbd>+<kbd>Cmd</kbd>+<kbd>G</kbd> on macOS) |
| `edit.replace` | <kbd>CmdOrCtrl</kbd>+<kbd>Alt</kbd>+<kbd>F</kbd> | Replace the information with a replacement |
| `edit.find-in-folder` | <kbd>CmdOrCtrl</kbd>+<kbd>Shift</kbd>+<kbd>F</kbd> | Find files contain the keyword in opend folder |
| `edit.aidou` | <kbd>CmdOrCtrl</kbd>+<kbd>/</kbd> | Show Aidou dialog |

4
src/main/keyboard/shortcutHandler.js
View File

@ -50,8 +50,8 @@ class Keybindings {
['edit.create-paragraph', 'Shift+CmdOrCtrl+N'],
['edit.delete-paragraph', 'Shift+CmdOrCtrl+D'],
['edit.find', 'CmdOrCtrl+F'],
['edit.find-next', 'CmdOrCtrl+Alt+U'],
['edit.find-previous', 'CmdOrCtrl+Shift+U'],
['edit.find-next', isOsx ? 'Cmd+G' : 'F3'],
['edit.find-previous', isOsx ? 'Cmd+Shift+G' : 'Shift+F3'],
['edit.replace', 'CmdOrCtrl+Alt+F'],
['edit.find-in-folder', 'Shift+CmdOrCtrl+F'],
['edit.aidou', 'CmdOrCtrl+/'],

2
src/main/menu/templates/edit.js
View File

@ -90,7 +90,7 @@ export default function (keybindings, userPreference) {
label: 'Find Next',
accelerator: keybindings.getAccelerator('edit.find-next'),
click (menuItem, browserWindow) {
actions.edit(browserWindow, 'fineNext')
actions.edit(browserWindow, 'findNext')
}
}, {
label: 'Find Previous',

2
src/renderer/commands/index.js
View File

@ -194,7 +194,7 @@ const commands = [
// description: 'Edit: Find Next',
// execute: async () => {
// await delay(150)
// bus.$emit('fineNext', 'fineNext')
// bus.$emit('findNext', 'findNext')
// }
// }, {
// id: 'edit.find-previous',