jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (0229301)
......................................................................
Update VE core submodule to master (0229301)
New changes:
5eb7294 Find and replace
123a6ad Find and replace tool
557f70f Go backwards through find and replace results on shift enter
4a4ed81 Allow language widget to filter on available languages
Local changes to adjust.
Change-Id: I15e14d6d3c7ee60e465baf3a4df7572851cbca3e
---
M .docs/eg-iframe.html
M VisualEditor.php
M lib/ve
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
5 files changed, 25 insertions(+), 5 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index 917261a..4c9b4de 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -23,7 +23,9 @@
<link rel=stylesheet
href="lib/ve/src/ce/styles/nodes/ve.ce.TableNode.css">
<link rel=stylesheet href="lib/ve/src/ce/styles/ve.ce.css">
<link rel=stylesheet
href="lib/ve/src/ce/styles/ve.ce.Surface.css">
+ <link rel=stylesheet
href="lib/ve/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css">
+ <link rel=stylesheet
href="lib/ve/src/ui/styles/dialogs/ve.ui.FindAndReplaceDialog.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/dialogs/ve.ui.ProgressDialog.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/tools/ve.ui.FormatTool.css">
<link rel=stylesheet
href="lib/ve/src/ui/styles/widgets/ve.ui.LanguageInputWidget.css">
@@ -308,13 +310,16 @@
<script
src="lib/ve/src/ui/commands/ve.ui.IndentationCommand.js"></script>
<script
src="lib/ve/src/ui/commands/ve.ui.MergeCellsCommand.js"></script>
<script
src="lib/ve/src/ui/commands/ve.ui.TableCaptionCommand.js"></script>
- <script
src="lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.FragmentDialog.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.NodeDialog.js"></script>
+ <script
src="lib/ve/src/ui/dialogs/ve.ui.ToolbarDialog.js"></script>
+ <script
src="lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js"></script>
+ <script
src="lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js"></script>
<script
src="lib/ve/src/ui/filedrophandlers/ve.ui.DSVFileDropHandler.js"></script>
<script
src="lib/ve/src/ui/filedrophandlers/ve.ui.PlainTextFileDropHandler.js"></script>
<script
src="lib/ve/src/ui/filedrophandlers/ve.ui.HTMLFileDropHandler.js"></script>
+ <script
src="lib/ve/src/ui/windowmanagers/ve.ui.ToolbarDialogWindowManager.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.LanguageSearchWidget.js"></script>
<script
src="lib/ve/src/ui/widgets/ve.ui.LanguageResultWidget.js"></script>
<script
src="lib/ve/src/ui/dialogs/ve.ui.LanguageSearchDialog.js"></script>
@@ -329,6 +334,7 @@
<script
src="lib/ve/src/ui/tools/ve.ui.AnnotationTool.js"></script>
<script
src="lib/ve/src/ui/tools/ve.ui.ClearAnnotationTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.DialogTool.js"></script>
+ <script
src="lib/ve/src/ui/tools/ve.ui.FindAndReplaceTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.FormatTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.HistoryTool.js"></script>
<script
src="lib/ve/src/ui/tools/ve.ui.IndentationTool.js"></script>
diff --git a/VisualEditor.php b/VisualEditor.php
index 2c72a4b..19c4f24 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -563,13 +563,17 @@
'lib/ve/src/ui/dialogs/ve.ui.FragmentDialog.js',
'lib/ve/src/ui/dialogs/ve.ui.NodeDialog.js',
- 'lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js',
+ 'lib/ve/src/ui/dialogs/ve.ui.ToolbarDialog.js',
'lib/ve/src/ui/dialogs/ve.ui.CommandHelpDialog.js',
+ 'lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js',
+ 'lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js',
// FIXME disabled because papaparse is broken (T75896)
//'lib/ve/src/ui/filedrophandlers/ve.ui.DSVFileDropHandler.js',
'lib/ve/src/ui/filedrophandlers/ve.ui.PlainTextFileDropHandler.js',
'lib/ve/src/ui/filedrophandlers/ve.ui.HTMLFileDropHandler.js',
+
+
'lib/ve/src/ui/windowmanagers/ve.ui.ToolbarDialogWindowManager.js',
'lib/ve/src/ui/widgets/ve.ui.SurfaceWidget.js',
'lib/ve/src/ui/widgets/ve.ui.LinkTargetInputWidget.js',
@@ -582,6 +586,7 @@
'lib/ve/src/ui/tools/ve.ui.AnnotationTool.js',
'lib/ve/src/ui/tools/ve.ui.ClearAnnotationTool.js',
'lib/ve/src/ui/tools/ve.ui.DialogTool.js',
+ 'lib/ve/src/ui/tools/ve.ui.FindAndReplaceTool.js',
'lib/ve/src/ui/tools/ve.ui.FormatTool.js',
'lib/ve/src/ui/tools/ve.ui.HistoryTool.js',
'lib/ve/src/ui/tools/ve.ui.IndentationTool.js',
@@ -616,7 +621,9 @@
'lib/ve/src/ce/styles/ve.ce.Surface.css',
// ui
+ 'lib/ve/src/ui/styles/dialogs/ve.ui.ToolbarDialog.css',
'lib/ve/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css',
+
'lib/ve/src/ui/styles/dialogs/ve.ui.FindAndReplaceDialog.css',
'lib/ve/src/ui/styles/dialogs/ve.ui.ProgressDialog.css',
'lib/ve/src/ui/styles/tools/ve.ui.FormatTool.css',
'lib/ve/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css',
@@ -676,6 +683,13 @@
'visualeditor-dialog-media-size-originalsize-error',
'visualeditor-dimensionswidget-px',
'visualeditor-dimensionswidget-times',
+ 'visualeditor-find-and-replace-find-text',
+ 'visualeditor-find-and-replace-match-case',
+ 'visualeditor-find-and-replace-replace-all-button',
+ 'visualeditor-find-and-replace-replace-button',
+ 'visualeditor-find-and-replace-replace-text',
+ 'visualeditor-find-and-replace-results',
+ 'visualeditor-find-and-replace-title',
'visualeditor-formatdropdown-format-blockquote',
'visualeditor-formatdropdown-format-heading-label',
'visualeditor-formatdropdown-format-heading1',
@@ -757,7 +771,7 @@
'scripts' => array(
'lib/ve/src/ui/ve.ui.MobileSurface.js',
'lib/ve/src/ui/ve.ui.MobileContext.js',
- 'lib/ve/src/ui/ve.ui.MobileWindowManager.js',
+
'lib/ve/src/ui/windowmanagers/ve.ui.MobileInspectorWindowManager.js',
'lib/ve/src/ui/widgets/ve.ui.MobileContextOptionWidget.js',
),
'styles' => array(
diff --git a/lib/ve b/lib/ve
index 4743d59..0229301 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 4743d5906c22ce9aa11ef402d3d2985348f84307
+Subproject commit 022930145ecd071644183a309ce2f387e5e6ed0f
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 62f3203..be82b2d 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -1113,7 +1113,7 @@
type: 'list',
icon: 'menu',
title: ve.msg( 'visualeditor-pagemenu-tooltip' ),
- include: [ 'meta', 'settings', 'advancedSettings',
'categories', 'languages', 'editModeSource' ]
+ include: [ 'meta', 'settings', 'advancedSettings',
'categories', 'languages', 'editModeSource', 'findAndReplace' ]
}
] );
diff --git a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
index 74a62ea..79a1d33 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWCommandHelpDialog.css
@@ -8,5 +8,5 @@
/*
* See ve.ui.CommandHelpDialog.css
*/
- height: 38em;
+ height: 39em;
}
--
To view, visit https://gerrit.wikimedia.org/r/175699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15e14d6d3c7ee60e465baf3a4df7572851cbca3e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
