wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update VE core submodule to master (1d341ca7d)"

Browse source
This commit is contained in:
jenkins-bot 2018-05-18 15:37:04 +00:00 committed by Gerrit Code Review
parent 60ef3af0b1 9e52ece21f
commit a47b78e18c
7 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.jsduck/eg-iframe.html
View file

@ -433,6 +433,8 @@
<script src="lib/ve/src/ui/tools/ve.ui.WindowTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.FragmentWindowTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.FragmentInspectorTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.LinkInspectorTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.CommentInspectorTool.js"></script>
<script src="lib/ve/src/ui/tools/ve.ui.ToolbarDialogTool.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>

20
extension.json
View file

@ -899,6 +899,8 @@
"lib/ve/src/ui/tools/ve.ui.WindowTool.js",
"lib/ve/src/ui/tools/ve.ui.FragmentWindowTool.js",
"lib/ve/src/ui/tools/ve.ui.FragmentInspectorTool.js",
"lib/ve/src/ui/tools/ve.ui.LinkInspectorTool.js",
"lib/ve/src/ui/tools/ve.ui.CommentInspectorTool.js",
"lib/ve/src/ui/tools/ve.ui.ToolbarDialogTool.js",
"lib/ve/src/ui/tools/ve.ui.FormatTool.js",
"lib/ve/src/ui/tools/ve.ui.HistoryTool.js",
@ -1147,6 +1149,21 @@
"mobile"
]
},
"ext.visualEditor.commentAnnotation": {
"scripts": [
"lib/ve/src/dm/annotations/ve.dm.CommentAnnotation.js",
"lib/ve/src/ce/annotations/ve.ce.CommentAnnotation.js",
"lib/ve/src/ui/contextitems/ve.ui.CommentAnnotationContextItem.js",
"lib/ve/src/ui/tools/ve.ui.CommentAnnotationInspectorTool.js",
"lib/ve/src/ui/inspectors/ve.ui.CommentAnnotationInspector.js"
],
"styles": [
"lib/ve/src/ce/styles/annotations/ve.ce.CommentAnnotation.css"
],
"dependencies": [
"ext.visualEditor.core"
]
},
"ext.visualEditor.rebase": {
"scripts": [
"lib/ve/src/dm/ve.dm.RebaseClient.js",
@ -1162,7 +1179,8 @@
"dompurify",
"socket.io",
"color-picker",
"oojs-ui.styles.icons-user"
"oojs-ui.styles.icons-user",
"ext.visualEditor.commentAnnotation"
],
"messages": [
"visualeditor-rebase-client-author-name"

2
lib/ve

@ -1 +1 @@
Subproject commit ca25f72abe3b97ea8d85a00a9e05ea007e14a08f
Subproject commit 1d341ca7d31148436c164502023faf4307e84fcc

2
modules/ve-mw/ce/styles/annotations/ve.ce.MWExternalLinkAnnotation.css
View file

@ -4,7 +4,7 @@
* @copyright 2011-2018 VisualEditor Team and others; see http://ve.mit-license.org
*/
.plainlinks a.ve-ce-linkAnnotation-active.external {
.plainlinks a.ve-ce-linkAnnotation.ve-ce-annotation-active.external {
/*
* plainlinks is a MW core class which tries to suppress the normal
* external-link appearance; we don't want it to also suppress the

2
modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-monobook.css
View file

@ -10,7 +10,7 @@
font-size: 1.28em; /* 0.8em / x-small */
}
.mw-body a.external.ve-ce-linkAnnotation-active {
.mw-body a.external.ve-ce-linkAnnotation.ve-ce-annotation-active {
/* Reset -2px from VE-core */
margin-right: 0;
/* Monobook sets a background:url(); rule which overrides the colour. TODO: Fix upstream */

2
modules/ve-mw/init/styles/ve.init.mw.DesktopTarget-vector.css
View file

@ -29,7 +29,7 @@
margin: 0.5em 0;
}
.mw-body .external.ve-ce-linkAnnotation-active {
.mw-body .external.ve-ce-linkAnnotation.ve-ce-annotation-active {
/* Reset -2px from VE-core */
margin-right: 0;
}

2
modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js
View file

@ -143,7 +143,7 @@ ve.ui.MWLinkNodeInspector.prototype.getTeardownProcess = function ( data ) {
// selection starts inside or outside of the node.
// If you can think of a test function for "the selection has stabilised", this could
// be moved to ve.scheduler.
// Note: we can't rely on surfaceView.activeLink, because the selection-focus created
// Note: we can't rely on surfaceView.activeAnnotations, because the selection-focus created
// by the transaction might be outside the link node. As such, get the node immediately
// after the offset where we inserted the annotation, and then get the closest link
// annotation to it.