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

Update VE core submodule to master (aaad03a)

Browse source 
Also update ContentBranchNode test for changes in VE core

New changes:
bdf9a9f Merge two Properties blocks in DesktopContext
d3c22bb Make ContentBranchNode echo suppression work in CBNs that contain inline nodes
aaad03a Localisation updates from https://translatewiki.net.

Change-Id: I3e1757b42307c3bd52ba0571068eb1c6bfb5ab89
This commit is contained in:
James D. Forrester 2014-03-16 16:53:03 -07:00
parent 7821eb7bd3
commit 5e4af875c1
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ve

@ -1 +1 @@
Subproject commit cd00a93d2f69218ec4796d47205da884b17779cd Subproject commit aaad03aeac4b1dc3bfd01b018b37bc3a115b27d8

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

@ -11,7 +11,7 @@ QUnit.module( 've.ce.ContentBranchNode' );
// FIXME runner copypasted from core, use data provider // FIXME runner copypasted from core, use data provider
QUnit.test( 'getRenderedContents', function ( assert ) { QUnit.test( 'getRenderedContents', function ( assert ) {
var i, len, doc, $rendered, $wrapper, var i, len, doc, $wrapper,
cases = [ cases = [
{ {
'msg': 'Annotation spanning text and inline nodes', 'msg': 'Annotation spanning text and inline nodes',
@ -44,8 +44,7 @@ QUnit.test( 'getRenderedContents', function ( assert ) {
QUnit.expect( cases.length ); QUnit.expect( cases.length );
for ( i = 0, len = cases.length; i < len; i++ ) { for ( i = 0, len = cases.length; i < len; i++ ) {
doc = new ve.dm.Document( ve.dm.example.preprocessAnnotations( cases[i].data ) ); doc = new ve.dm.Document( ve.dm.example.preprocessAnnotations( cases[i].data ) );
$rendered = ( new ve.ce.ParagraphNode( doc.getDocumentNode().getChildren()[0] ) ).getRenderedContents(); $wrapper = $( new ve.ce.ParagraphNode( doc.getDocumentNode().getChildren()[0] ).getRenderedContents() );
$wrapper = $( '<div>' ).append( $rendered );
// HACK strip out all the class="ve-ce-TextStyleAnnotation ve-ce-TextStyleBoldAnnotation" crap // HACK strip out all the class="ve-ce-TextStyleAnnotation ve-ce-TextStyleBoldAnnotation" crap
$wrapper.find( '.ve-ce-TextStyleAnnotation' ).removeAttr( 'class' ); $wrapper.find( '.ve-ce-TextStyleAnnotation' ).removeAttr( 'class' );
assert.equalDomElement( $wrapper[0], $( '<div>' ).html( cases[i].html )[0], cases[i].msg ); assert.equalDomElement( $wrapper[0], $( '<div>' ).html( cases[i].html )[0], cases[i].msg );