From 9a1e3852fc9a6a7d043ded7e9871510708ba863f Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Fri, 22 Aug 2014 22:09:16 +0100 Subject: [PATCH] Update VE core submodule to master (c231b71) New changes: c9f1027 Remove broken ve.isMsie() function 6571da1 Fix case on language annotation CSS class c231b71 Fix case in all annotation classes Local changes: Fix case in all annotation classes Change-Id: Iba2596cde52d8f8be27e0257893ef8ec77798ae8 --- lib/ve | 2 +- modules/ve-mw/init/styles/ve.init.mw.IEHacks.css | 2 +- .../browser/features/support/pages/visual_editor_page.rb | 4 ++-- modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ve b/lib/ve index f1fd9a83c5..c231b71870 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit f1fd9a83c5072d7166885dae673ebcdf65463963 +Subproject commit c231b7187056e586c55cf8542cb1313d8bac22b9 diff --git a/modules/ve-mw/init/styles/ve.init.mw.IEHacks.css b/modules/ve-mw/init/styles/ve.init.mw.IEHacks.css index e7b3e3dadd..05435c11de 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.IEHacks.css +++ b/modules/ve-mw/init/styles/ve.init.mw.IEHacks.css @@ -25,6 +25,6 @@ /* Don't apply a background color to language annotations, otherwise the text disappears if the span has dir="rtl" */ -.ve-ce-LanguageAnnotation { +.ve-ce-languageAnnotation { background: none; } diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb index 35e5bb77c6..b127efd2d7 100644 --- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb @@ -83,8 +83,8 @@ class VisualEditorPage a(:first_reference, text: "[1]", index: 1) a(:second_reference, text: "[1]", index: 2) unordered_list(:link_list, class: 'oo-ui-widget oo-ui-widget-enabled oo-ui-selectWidget oo-ui-selectWidget-depressed oo-ui-clippableElement-clippable oo-ui-menuWidget oo-ui-textInputMenuWidget oo-ui-lookupWidget-menu ve-ui-mwLinkTargetInputWidget-menu') - a(:new_link, class: "ve-ce-LinkAnnotation ve-ce-mwInternalLinkAnnotation new") - a(:internal_link, class: "ve-ce-LinkAnnotation ve-ce-mwInternalLinkAnnotation") + a(:new_link, class: "ve-ce-linkAnnotation ve-ce-mwInternalLinkAnnotation new") + a(:internal_link, class: "ve-ce-linkAnnotation ve-ce-mwInternalLinkAnnotation") unordered_list(:popup_icon, class: "ve-ui-context-menu") span(:basic_reference, class: "oo-ui-iconedElement-icon oo-ui-icon-reference") div(:toolbar_action, class: "oo-ui-toolbar-actions") diff --git a/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js b/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js index 27bcd59573..826c1c71d7 100644 --- a/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js +++ b/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js @@ -41,8 +41,8 @@ QUnit.test( 'getRenderedContents', function ( assert ) { for ( i = 0, len = cases.length; i < len; i++ ) { doc = new ve.dm.Document( ve.dm.example.preprocessAnnotations( cases[i].data ) ); $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' ); + // 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 ); } } );