jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (b5a0269)
......................................................................
Update VE core submodule to master (b5a0269)
New changes:
20d9764 Move window managers to sub folder
d69c2fa Update OOjs UI to v0.2.3
62aa941 Use complex change logic if there are changes not at the selection
Change-Id: I063a38268c96db614f8870c65cdc0ed62fb96e27
---
M .docs/categories.json
M .docs/eg-iframe.html
M VisualEditor.php
M lib/ve
4 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Divec: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.docs/categories.json b/.docs/categories.json
index 85dd355..fe41763 100644
--- a/.docs/categories.json
+++ b/.docs/categories.json
@@ -120,11 +120,10 @@
"ve.ui.*Registry",
"ve.ui.*Sequence",
"ve.ui.*Tool",
- "ve.ui.*Inspector",
"ve.ui.*Widget",
"ve.ui.*WindowManager",
- "ve.ui.*InspectorManager",
- "ve.ui.*Dialog"
+ "ve.ui.*Dialog",
+ "ve.ui.*Inspector"
]
},
{
diff --git a/.docs/eg-iframe.html b/.docs/eg-iframe.html
index ef0ecc4..917261a 100644
--- a/.docs/eg-iframe.html
+++ b/.docs/eg-iframe.html
@@ -347,7 +347,7 @@
<!-- visualEditor.desktop.build -->
<script src="lib/ve/src/ui/ve.ui.DesktopSurface.js"></script>
<script src="lib/ve/src/ui/ve.ui.DesktopContext.js"></script>
- <script
src="lib/ve/src/ui/ve.ui.DesktopInspectorManager.js"></script>
+ <script
src="lib/ve/src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js"></script>
<!-- example scripts -->
<script>
diff --git a/VisualEditor.php b/VisualEditor.php
index 8b2bef1..2c72a4b 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -742,7 +742,7 @@
'scripts' => array(
'lib/ve/src/ui/ve.ui.DesktopSurface.js',
'lib/ve/src/ui/ve.ui.DesktopContext.js',
- 'lib/ve/src/ui/ve.ui.DesktopInspectorManager.js',
+
'lib/ve/src/ui/windowmanagers/ve.ui.DesktopInspectorWindowManager.js',
),
'styles' => array(
'lib/ve/src/ui/styles/ve.ui.DesktopContext.css',
diff --git a/lib/ve b/lib/ve
index ddbedd1..b5a0269 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit ddbedd1ba6a46529c01b653264d80cc52fc0d9da
+Subproject commit b5a02696daacb7d6eff908ecde1308506d776a7f
--
To view, visit https://gerrit.wikimedia.org/r/176392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I063a38268c96db614f8870c65cdc0ed62fb96e27
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Divec <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
