From 5e4af875c17a3593f9d8323cb603e1c00873e87c Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Sun, 16 Mar 2014 16:53:03 -0700 Subject: [PATCH] Update VE core submodule to master (aaad03a) 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 --- lib/ve | 2 +- modules/ve-mw/test/ce/ve.ce.ContentBranchNode.test.js | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/ve b/lib/ve index cd00a93d2f..aaad03aeac 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit cd00a93d2f69218ec4796d47205da884b17779cd +Subproject commit aaad03aeac4b1dc3bfd01b018b37bc3a115b27d8 diff --git a/modules/ve-mw/test/ce/ve.ce.ContentBranchNode.test.js b/modules/ve-mw/test/ce/ve.ce.ContentBranchNode.test.js index 22ba858bb0..983c7dabbb 100644 --- a/modules/ve-mw/test/ce/ve.ce.ContentBranchNode.test.js +++ b/modules/ve-mw/test/ce/ve.ce.ContentBranchNode.test.js @@ -11,7 +11,7 @@ QUnit.module( 've.ce.ContentBranchNode' ); // FIXME runner copypasted from core, use data provider QUnit.test( 'getRenderedContents', function ( assert ) { - var i, len, doc, $rendered, $wrapper, + var i, len, doc, $wrapper, cases = [ { 'msg': 'Annotation spanning text and inline nodes', @@ -44,8 +44,7 @@ QUnit.test( 'getRenderedContents', function ( assert ) { QUnit.expect( cases.length ); for ( i = 0, len = cases.length; i < len; i++ ) { doc = new ve.dm.Document( ve.dm.example.preprocessAnnotations( cases[i].data ) ); - $rendered = ( new ve.ce.ParagraphNode( doc.getDocumentNode().getChildren()[0] ) ).getRenderedContents(); - $wrapper = $( '
' ).append( $rendered ); + $wrapper = $( new ve.ce.ParagraphNode( doc.getDocumentNode().getChildren()[0] ).getRenderedContents() ); // HACK strip out all the class="ve-ce-TextStyleAnnotation ve-ce-TextStyleBoldAnnotation" crap $wrapper.find( '.ve-ce-TextStyleAnnotation' ).removeAttr( 'class' ); assert.equalDomElement( $wrapper[0], $( '
' ).html( cases[i].html )[0], cases[i].msg );