jenkins-bot has submitted this change and it was merged.

Change subject: Add find next/previous to command help dialog
......................................................................


Add find next/previous to command help dialog

Requires a bit of shuffling around and it's getting
very tall.

Bug: T87872
Change-Id: Ibda93d3b908577534f2d9b5088aef1e6aeba745d
---
M src/ui/dialogs/ve.ui.CommandHelpDialog.js
M src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
2 files changed, 21 insertions(+), 19 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ui/dialogs/ve.ui.CommandHelpDialog.js 
b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
index cdc6f58..d1bc47e 100644
--- a/src/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/src/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -135,24 +135,6 @@
                                { trigger: 'clear', msg: 
'visualeditor-clearbutton-tooltip' }
                        ]
                },
-               history: {
-                       title: 'visualeditor-shortcuts-history',
-                       commands: [
-                               { trigger: 'undo', msg: 
'visualeditor-historybutton-undo-tooltip' },
-                               { trigger: 'redo', msg: 
'visualeditor-historybutton-redo-tooltip' }
-                       ]
-               },
-               formatting: {
-                       title: 'visualeditor-shortcuts-formatting',
-                       commands: [
-                               { trigger: 'paragraph', msg: 
'visualeditor-formatdropdown-format-paragraph' },
-                               { shortcuts: ['ctrl+(1-6)'], msg: 
'visualeditor-formatdropdown-format-heading-label' },
-                               { trigger: 'preformatted', msg: 
'visualeditor-formatdropdown-format-preformatted' },
-                               { trigger: 'blockquote', msg: 
'visualeditor-formatdropdown-format-blockquote' },
-                               { trigger: 'indent', msg: 
'visualeditor-indentationbutton-indent-tooltip' },
-                               { trigger: 'outdent', msg: 
'visualeditor-indentationbutton-outdent-tooltip' }
-                       ]
-               },
                clipboard: {
                        title: 'visualeditor-shortcuts-clipboard',
                        commands: [
@@ -180,10 +162,30 @@
                                { trigger: 'pasteSpecial', msg: 
'visualeditor-clipboard-paste-special' }
                        ]
                },
+               formatting: {
+                       title: 'visualeditor-shortcuts-formatting',
+                       commands: [
+                               { trigger: 'paragraph', msg: 
'visualeditor-formatdropdown-format-paragraph' },
+                               { shortcuts: ['ctrl+(1-6)'], msg: 
'visualeditor-formatdropdown-format-heading-label' },
+                               { trigger: 'preformatted', msg: 
'visualeditor-formatdropdown-format-preformatted' },
+                               { trigger: 'blockquote', msg: 
'visualeditor-formatdropdown-format-blockquote' },
+                               { trigger: 'indent', msg: 
'visualeditor-indentationbutton-indent-tooltip' },
+                               { trigger: 'outdent', msg: 
'visualeditor-indentationbutton-outdent-tooltip' }
+                       ]
+               },
+               history: {
+                       title: 'visualeditor-shortcuts-history',
+                       commands: [
+                               { trigger: 'undo', msg: 
'visualeditor-historybutton-undo-tooltip' },
+                               { trigger: 'redo', msg: 
'visualeditor-historybutton-redo-tooltip' }
+                       ]
+               },
                other: {
                        title: 'visualeditor-shortcuts-other',
                        commands: [
                                { trigger: 'findAndReplace', msg: 
'visualeditor-find-and-replace-title' },
+                               { trigger: 'findNext', msg: 
'visualeditor-find-and-replace-next-button' },
+                               { trigger: 'findPrevious', msg: 
'visualeditor-find-and-replace-previous-button' },
                                { trigger: 'selectAll', msg: 
'visualeditor-content-select-all' },
                                { trigger: 'commandHelp', msg: 
'visualeditor-dialog-command-help-title' }
                        ]
diff --git a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css 
b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
index 79e4813..b803334 100644
--- a/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
+++ b/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css
@@ -14,7 +14,7 @@
         * Hack 1.1: The height isn't calculated correctly with the inline-block
         * hack so fix it to prevent unnecessary scroll bars.
         */
-       height: 39em;
+       height: 43em;
 }
 
 .ve-ui-commandHelpDialog-section {

-- 
To view, visit https://gerrit.wikimedia.org/r/187446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibda93d3b908577534f2d9b5088aef1e6aeba745d
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to