jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356451 )
Change subject: Update VE core submodule to master (8be817396)
......................................................................
Update VE core submodule to master (8be817396)
New changes:
26085a853 Make author list a ListPopupTool
c4ea53eef Update OOjs to v2.1.0
8c94697f3 Update OOjs UI to v0.22.0
cdebc4817 Follow-up 8c94697f: Actually commit the icon changes I had locally
8be817396 Update OOjs UI to v0.22.1
Local changes for author list popup
Change-Id: I36bcaf122528a4a12882aaff3b33ef936082a391
---
M .jsduck/categories.json
M .jsduck/eg-iframe.html
M extension.json
M lib/ve
M modules/ve-mw-collab/ve.init.mw.CollabTarget.js
R modules/ve-mw/themes/wikimediaui/widgets.css
R modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
7 files changed, 32 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/.jsduck/categories.json b/.jsduck/categories.json
index 24ca660..98f50d1 100644
--- a/.jsduck/categories.json
+++ b/.jsduck/categories.json
@@ -231,9 +231,8 @@
"OO.ui.Element",
"OO.ui.HtmlSnippet",
"OO.ui.Toolbar",
- "OO.ui.Window",
+ "OO.ui.Window*",
"OO.ui.Dialog",
- "OO.ui.WindowManager",
"OO.ui.Process",
"OO.ui.Error",
"OO.ui.ActionSet"
diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html
index ea1723b..23fe457 100644
--- a/.jsduck/eg-iframe.html
+++ b/.jsduck/eg-iframe.html
@@ -6,6 +6,10 @@
<!-- oojs-ui-apex -->
<link rel=stylesheet href="lib/ve/lib/oojs-ui/oojs-ui-apex.css">
+ <link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex-icons-alerts.css">
+ <link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex-icons-interactions.css">
+ <link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex-icons-moderation.css">
+ <link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex-icons-user.css">
<link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex-icons-editing-core.css">
<link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css">
<link rel=stylesheet
href="lib/ve/lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css">
diff --git a/extension.json b/extension.json
index adc3be9..4bc8cb5 100644
--- a/extension.json
+++ b/extension.json
@@ -912,8 +912,8 @@
],
"skinStyles": {
"vector": [
-
"lib/ve/src/themes/mediawiki/dialogs.css",
-
"lib/ve/src/themes/mediawiki/widgets.css"
+
"lib/ve/src/themes/wikimediaui/dialogs.css",
+
"lib/ve/src/themes/wikimediaui/widgets.css"
],
"apex": [
"lib/ve/src/themes/apex/dialogs.css",
@@ -1080,16 +1080,17 @@
"lib/ve/src/dm/ve.dm.Change.js",
"lib/ve/src/dm/ve.dm.RebaseClient.js",
"lib/ve/src/dm/ve.dm.SurfaceSynchronizer.js",
-
"lib/ve/src/ui/widgets/ve.ui.AuthorListWidget.js"
+
"lib/ve/src/ui/widgets/ve.ui.AuthorItemWidget.js",
+
"lib/ve/src/ui/tools/ve.ui.AuthorListPopupTool.js"
],
"styles": [
-
"lib/ve/src/ui/styles/widgets/ve.ui.AuthorListWidget.css"
+
"lib/ve/src/ui/styles/widgets/ve.ui.AuthorItemWidget.css"
],
"dependencies": [
"ext.visualEditor.core",
"dompurify",
"socket.io",
- "oojs-ui.styles.icons-alerts"
+ "oojs-ui.styles.icons-user"
],
"messages": [
"visualeditor-rebase-client-author-name"
@@ -1261,7 +1262,7 @@
],
"skinStyles": {
"vector": [
-
"modules/ve-mw/themes/mediawiki/widgets.css"
+
"modules/ve-mw/themes/wikimediaui/widgets.css"
],
"monobook": [
"modules/ve-mw/themes/apex/widgets.css"
diff --git a/lib/ve b/lib/ve
index 9cd1842..8be8173 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit 9cd18424bf77a191a9735ff2bfc5f75e7b54b7e3
+Subproject commit 8be81739624b35c984e8f777f7941f622d89cb8e
diff --git a/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
b/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
index 4c8a6e4..4d95271 100644
--- a/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
+++ b/modules/ve-mw-collab/ve.init.mw.CollabTarget.js
@@ -47,6 +47,10 @@
ve.init.mw.CollabTarget.static.trackingName = 'collab';
+ve.init.mw.CollabTarget.static.actionGroups = [
+ { include: [ 'authorList' ] }
+];
+
/* Methods */
/**
@@ -67,24 +71,10 @@
* @inheritdoc
*/
ve.init.mw.CollabTarget.prototype.surfaceReady = function () {
- var synchronizer, authorList,
- surfaceView = this.getSurface().getView(),
- toolbar = this.getToolbar();
-
// Parent method
ve.init.mw.CollabTarget.super.prototype.surfaceReady.apply( this,
arguments );
- synchronizer = new ve.dm.SurfaceSynchronizer(
- this.getSurface().getModel(),
- this.title.toString(),
- { server: this.rebaserUrl }
- );
- authorList = new ve.ui.AuthorListWidget( synchronizer );
-
- toolbar.$actions.append( authorList.$element );
- toolbar.initialize();
- surfaceView.setSynchronizer( synchronizer );
- surfaceView.focus();
+ this.getSurface().getView().focus();
};
/**
@@ -99,8 +89,22 @@
* @inheritdoc
*/
ve.init.mw.CollabTarget.prototype.setSurface = function ( surface ) {
+ var synchronizer, surfaceView, toolbar;
+
if ( surface !== this.surface ) {
this.$editableContent.after( surface.$element );
+
+ surfaceView = surface.getView();
+ toolbar = this.getToolbar();
+
+ synchronizer = new ve.dm.SurfaceSynchronizer(
+ surface.getModel(),
+ this.title.toString(),
+ { server: this.rebaserUrl }
+ );
+
+ toolbar.initialize();
+ surfaceView.setSynchronizer( synchronizer );
}
// Parent method
diff --git a/modules/ve-mw/themes/mediawiki/widgets.css
b/modules/ve-mw/themes/wikimediaui/widgets.css
similarity index 100%
rename from modules/ve-mw/themes/mediawiki/widgets.css
rename to modules/ve-mw/themes/wikimediaui/widgets.css
diff --git a/modules/ve-mw/ui/styles/mediawiki/ve.ui.Icons.json
b/modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
similarity index 100%
rename from modules/ve-mw/ui/styles/mediawiki/ve.ui.Icons.json
rename to modules/ve-mw/ui/styles/wikimediaui/ve.ui.Icons.json
--
To view, visit https://gerrit.wikimedia.org/r/356451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36bcaf122528a4a12882aaff3b33ef936082a391
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
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
