mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-09-23 18:28:51 +00:00
Update VE core submodule to master (1d341ca7d)
New changes: 3a6d868bf Separate (Comment/Link)InspectorTools into separate files cb5d36e32 Localisation updates from https://translatewiki.net. c75491b16 build: Extend 'svgmin' options and amend ddef270d9 Genericise activeLink behaviour to any annotation d13d44e12 Create simple comment annotation type for rebaser. 7e49a1f33 Add getters for author properties 1d341ca7d Follow-up I16942623d: Only filter inactive models if they are 'canBeActive' Local changes: Change .ve-ce-linkAnnotation-active > .ve-ce-linkAnnotation.ve-ce-annotation-active Bug: T185596 Change-Id: I2a49315d01aa075373f9b5f0d8802a7e7dd4dca3
This commit is contained in:
parent
a975aacbe7
commit
9e52ece21f
|
@ -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>
|
||||
|
|
|
@ -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
2
lib/ve
|
@ -1 +1 @@
|
|||
Subproject commit ca25f72abe3b97ea8d85a00a9e05ea007e14a08f
|
||||
Subproject commit 1d341ca7d31148436c164502023faf4307e84fcc
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue