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

Update VE core submodule to master (cb06317)

Browse source 
New changes:
5197b2d Rangestate optimization
80a07cf Unmix GeneratedContentNode from AlienNodes
f510e9c Make (Node/Annotation/MetaItem)Factory inherit from ModelFactory
b625ff0 Localisation updates from https://translatewiki.net.
5c4653c ve.qunit: Use 'jscs:disable' comment rather than hacks
90e9480 Remove registration of abstract AlienNode classes
d325674 i18n/en.json: Convert from spaces to tabs, like all other files
f40fc15 Add 'classes' config option to focusable nodes to simplify AlienNode
f7c8999 Document config options as @cfg
ad3aa0b ve.ce.Surface.test: Groundwork for testing non-linear selections
cd1a992 Localisation updates from https://translatewiki.net.
c92471e Move drop marker to highlights layer and position absolutely

Change-Id: I437663d93a346a06c6a5137cce5149c7a6fcbb7f
This commit is contained in:
James D. Forrester 2015-03-25 08:00:40 -07:00 committed by Ed Sanders
parent 80d8312c28
commit 497e7eb4a1
7 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.jsduck/categories.json
View file

@ -66,9 +66,11 @@
"classes": [
"ve.dm",
"ve.dm.Model",
"ve.dm.ModelRegistry",
"ve.dm.ModelFactory",
"ve.dm.AnnotationFactory",
"ve.dm.MetaItemFactory",
"ve.dm.ModelRegistry",
"ve.dm.NodeFactory",
"ve.dm.Converter",
"ve.dm.DataString",
"ve.dm.DocumentSynchronizer",
@ -76,7 +78,6 @@
"ve.dm.Scalable",
"ve.dm.APIResultsProvider",
"ve.dm.APIResultsQueue",
"ve.dm.NodeFactory",
"ve.dm.Surface",
"ve.dm.SurfaceFragment",
"ve.dm.*Selection",

1
.jsduck/eg-iframe.html
View file

@ -141,6 +141,7 @@
<script src="lib/ve/src/ve.EventSequencer.js"></script>
<script src="lib/ve/src/dm/ve.dm.js"></script>
<script src="lib/ve/src/dm/ve.dm.Model.js"></script>
<script src="lib/ve/src/dm/ve.dm.ModelFactory.js"></script>
<script src="lib/ve/src/dm/ve.dm.ModelRegistry.js"></script>
<script src="lib/ve/src/dm/ve.dm.NodeFactory.js"></script>
<script src="lib/ve/src/dm/ve.dm.AnnotationFactory.js"></script>

1
VisualEditor.php
View file

@ -378,6 +378,7 @@ $wgResourceModules += array(
'lib/ve/src/dm/ve.dm.js',
'lib/ve/src/dm/ve.dm.Model.js',
'lib/ve/src/dm/ve.dm.ModelRegistry.js',
'lib/ve/src/dm/ve.dm.ModelFactory.js',
'lib/ve/src/dm/ve.dm.NodeFactory.js',
'lib/ve/src/dm/ve.dm.AnnotationFactory.js',
'lib/ve/src/dm/ve.dm.AnnotationSet.js',

1
extension.json
View file

@ -456,6 +456,7 @@
"lib/ve/src/dm/ve.dm.js",
"lib/ve/src/dm/ve.dm.Model.js",
"lib/ve/src/dm/ve.dm.ModelRegistry.js",
"lib/ve/src/dm/ve.dm.ModelFactory.js",
"lib/ve/src/dm/ve.dm.NodeFactory.js",
"lib/ve/src/dm/ve.dm.AnnotationFactory.js",
"lib/ve/src/dm/ve.dm.AnnotationSet.js",

2
lib/ve

@ -1 +1 @@
Subproject commit 715750bd8c23984f6ae458025a39b179cd8593fa
Subproject commit cb06317a7be0c6b1b3d624abbc5e5b737e9fbccf

9
modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js
View file

@ -27,14 +27,17 @@ QUnit.test( 'getRenderedContents', function ( assert ) {
['d', [ { type: 'textStyle/bold' } ]],
{
type: 'alienInline',
originalDomElements: $( '<tt>e</tt>' ).toArray(),
originalDomElements: $( '<span rel="ve:Alien">e</span>' ).toArray(),
annotations: [ { type: 'textStyle/bold' } ]
},
{ type: '/alienInline' },
{ type: '/paragraph' }
],
html: 'a<b>b<span class="ve-ce-leafNode ' +
've-ce-mwEntityNode" contenteditable="false">c</span>d<tt>e</tt></b>'
html:
'a<b>b' +
'<span class="ve-ce-leafNode ve-ce-mwEntityNode" contenteditable="false">c</span>' +
'd<span rel="ve:Alien" class="ve-ce-focusableNode" contenteditable="false">e</span>' +
'</b>'
} ];
QUnit.expect( cases.length );
for ( i = 0, len = cases.length; i < len; i++ ) {

7
modules/ve-mw/tests/ce/ve.ce.Surface.test.js
View file

@ -22,7 +22,10 @@ QUnit.test( 'handleLinearDelete', function ( assert ) {
operations: ['backspace'],
// TODO: This action should probably unwrap the list item as
expectedData: function () {},
expectedRange: new ve.Range( 12 ),
expectedSelection: {
type: 'linear',
range: new ve.Range( 12 )
},
msg: 'Backspace in a list next to a block image doesn\'t merge into the caption'
}
];
@ -32,7 +35,7 @@ QUnit.test( 'handleLinearDelete', function ( assert ) {
for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfaceHandleSpecialKeyTest(
assert, cases[i].html, cases[i].range, cases[i].operations,
cases[i].expectedData, cases[i].expectedRange, cases[i].msg
cases[i].expectedData, cases[i].expectedSelection, cases[i].msg
);
}
} );