Procházet zdrojové kódy

Rename marker group to restrictedEditingException.

Maciej Gołaszewski před 6 roky
rodič
revize
632994022b

+ 1 - 1
packages/ckeditor5-restricted-editing/src/restrictededitingmode/converters.js

@@ -78,7 +78,7 @@ export function resurrectCollapsedMarkerPostFixer( editor ) {
 		let changeApplied = false;
 
 		for ( const [ name, data ] of editor.model.document.differ._changedMarkers ) {
-			if ( name.startsWith( 'restricted-editing-exception' ) && data.newRange.root.rootName == '$graveyard' ) {
+			if ( name.startsWith( 'restrictedEditingException' ) && data.newRange.root.rootName == '$graveyard' ) {
 				writer.updateMarker( name, {
 					range: writer.createRange( writer.createPositionAt( editor.model.document.selection.focus ) )
 				} );

+ 1 - 1
packages/ckeditor5-restricted-editing/src/restrictededitingmode/utils.js

@@ -21,7 +21,7 @@ export function getMarkerAtPosition( editor, position ) {
 		const markerRange = marker.getRange();
 
 		if ( isPositionInRangeBoundaries( markerRange, position ) ) {
-			if ( marker.name.startsWith( 'restricted-editing-exception:' ) ) {
+			if ( marker.name.startsWith( 'restrictedEditingException:' ) ) {
 				return marker;
 			}
 		}

+ 5 - 5
packages/ckeditor5-restricted-editing/src/restrictededitingmodeediting.js

@@ -118,9 +118,9 @@ export default class RestrictedEditingModeEditing extends Plugin {
 				classes: 'ck-restricted-editing-exception'
 			},
 			model: () => {
-				markerNumber++; // Starting from restricted-editing-exception:1 marker.
+				markerNumber++; // Starting from restrictedEditingException:1 marker.
 
-				return `restricted-editing-exception:${ markerNumber }`;
+				return `restrictedEditingException:${ markerNumber }`;
 			}
 		} ) );
 
@@ -128,7 +128,7 @@ export default class RestrictedEditingModeEditing extends Plugin {
 		// That's why there are 2 downcast converters for them:
 		// 1. The default marker-to-highlight will wrap selected text with `<span>`.
 		editor.conversion.for( 'downcast' ).markerToHighlight( {
-			model: 'restricted-editing-exception',
+			model: 'restrictedEditingException',
 			// Use callback to return new object every time new marker instance is created - otherwise it will be seen as the same marker.
 			view: () => ( {
 				name: 'span',
@@ -140,14 +140,14 @@ export default class RestrictedEditingModeEditing extends Plugin {
 		// 2. But for collapsed marker we need to render it as an element.
 		// Additionally the editing pipeline should always display a collapsed markers.
 		editor.conversion.for( 'editingDowncast' ).markerToElement( {
-			model: 'restricted-editing-exception',
+			model: 'restrictedEditingException',
 			view: ( markerData, viewWriter ) => viewWriter.createUIElement( 'span', {
 				class: 'ck-restricted-editing-exception ck-restricted-editing-exception_collapsed'
 			} )
 		} );
 
 		editor.conversion.for( 'dataDowncast' ).markerToElement( {
-			model: 'restricted-editing-exception',
+			model: 'restrictedEditingException',
 			view: ( markerData, viewWriter ) => viewWriter.createEmptyElement( 'span', {
 				class: 'ck-restricted-editing-exception'
 			} )

+ 1 - 1
packages/ckeditor5-restricted-editing/src/restrictededitingmodenavigationcommand.js

@@ -77,7 +77,7 @@ function getNearestExceptionRange( model, direction ) {
 	const markerRanges = [];
 
 	// Get all exception marker positions that start after/before the selection position.
-	for ( const marker of model.markers.getMarkersGroup( 'restricted-editing-exception' ) ) {
+	for ( const marker of model.markers.getMarkersGroup( 'restrictedEditingException' ) ) {
 		const markerRange = marker.getRange();
 
 		// Checking parent because there two positions <paragraph>foo^</paragraph><paragraph>^bar</paragraph>

+ 3 - 3
packages/ckeditor5-restricted-editing/tests/restrictededitingmodeediting-commands.js

@@ -29,7 +29,7 @@ describe( 'RestrictedEditingEditing - commands', () => {
 			firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange(
 						writer.createPositionAt( firstParagraph, 4 ),
 						writer.createPositionAt( firstParagraph, 7 ) ),
@@ -584,7 +584,7 @@ describe( 'RestrictedEditingEditing - commands', () => {
 			firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange(
 						writer.createPositionAt( firstParagraph, 4 ),
 						writer.createPositionAt( firstParagraph, 7 ) ),
@@ -747,7 +747,7 @@ describe( 'RestrictedEditingEditing - commands', () => {
 			firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange(
 						writer.createPositionAt( firstParagraph, 4 ),
 						writer.createPositionAt( firstParagraph, 7 ) ),

+ 37 - 37
packages/ckeditor5-restricted-editing/tests/restrictededitingmodeediting.js

@@ -68,9 +68,9 @@ describe( 'RestrictedEditingModeEditing', () => {
 			it( 'should convert <span class="ck-restricted-editing-exception"> to marker', () => {
 				editor.setData( '<p>foo <span class="ck-restricted-editing-exception">bar</span> baz</p>' );
 
-				expect( model.markers.has( 'restricted-editing-exception:1' ) ).to.be.true;
+				expect( model.markers.has( 'restrictedEditingException:1' ) ).to.be.true;
 
-				const marker = model.markers.get( 'restricted-editing-exception:1' );
+				const marker = model.markers.get( 'restrictedEditingException:1' );
 
 				expect( marker.getStart().path ).to.deep.equal( [ 0, 4 ] );
 				expect( marker.getEnd().path ).to.deep.equal( [ 0, 7 ] );
@@ -82,11 +82,11 @@ describe( 'RestrictedEditingModeEditing', () => {
 					'<p>ABCDEF<span class="ck-restricted-editing-exception">GHIJK</span>LMNOPQRST</p>'
 				);
 
-				expect( model.markers.has( 'restricted-editing-exception:1' ) ).to.be.true;
-				expect( model.markers.has( 'restricted-editing-exception:2' ) ).to.be.true;
+				expect( model.markers.has( 'restrictedEditingException:1' ) ).to.be.true;
+				expect( model.markers.has( 'restrictedEditingException:2' ) ).to.be.true;
 
 				// Data for the first marker is the same as in previous tests so no need to test it again.
-				const secondMarker = model.markers.get( 'restricted-editing-exception:2' );
+				const secondMarker = model.markers.get( 'restrictedEditingException:2' );
 
 				expect( secondMarker.getStart().path ).to.deep.equal( [ 1, 6 ] );
 				expect( secondMarker.getEnd().path ).to.deep.equal( [ 1, 11 ] );
@@ -95,7 +95,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			it( 'should not convert other <span> elements', () => {
 				editor.setData( '<p>foo <span class="foo bar">bar</span> baz</p>' );
 
-				expect( model.markers.has( 'restricted-editing-exception:1' ) ).to.be.false;
+				expect( model.markers.has( 'restrictedEditingException:1' ) ).to.be.false;
 			} );
 		} );
 
@@ -106,7 +106,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 				const paragraph = model.document.getRoot().getChild( 0 );
 
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 						usingOperation: true,
 						affectsData: true
@@ -124,7 +124,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 				const paragraph = model.document.getRoot().getChild( 0 );
 
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 4 ) ),
 						usingOperation: true,
 						affectsData: true
@@ -144,7 +144,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 				const paragraph = model.document.getRoot().getChild( 0 );
 
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 0 ), writer.createPositionAt( paragraph, 'end' ) ),
 						usingOperation: true,
 						affectsData: true
@@ -185,12 +185,12 @@ describe( 'RestrictedEditingModeEditing', () => {
 			const secondParagraph = model.document.getRoot().getChild( 1 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( firstParagraph, 4 ), writer.createPositionAt( firstParagraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
 				} );
-				writer.addMarker( 'restricted-editing-exception:2', {
+				writer.addMarker( 'restrictedEditingException:2', {
 					range: writer.createRange(
 						writer.createPositionAt( secondParagraph, 4 ),
 						writer.createPositionAt( secondParagraph, 7 )
@@ -226,7 +226,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			const firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( firstParagraph, 4 ), writer.createPositionAt( firstParagraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -246,7 +246,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			const firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( firstParagraph, 4 ), writer.createPositionAt( firstParagraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -256,7 +256,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			editor.execute( 'input', { text: 'X' } );
 
 			assertEqualMarkup( getModelData( model ), '<paragraph>foo barX[] baz</paragraph>' );
-			const markerRange = editor.model.markers.get( 'restricted-editing-exception:1' ).getRange();
+			const markerRange = editor.model.markers.get( 'restrictedEditingException:1' ).getRange();
 			const expectedRange = model.createRange(
 				model.createPositionAt( firstParagraph, 4 ),
 				model.createPositionAt( firstParagraph, 8 )
@@ -270,7 +270,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			const firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( firstParagraph, 4 ), writer.createPositionAt( firstParagraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -280,7 +280,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			editor.execute( 'input', { text: 'X' } );
 
 			assertEqualMarkup( getModelData( model ), '<paragraph>foo X[]bar baz</paragraph>' );
-			const markerRange = editor.model.markers.get( 'restricted-editing-exception:1' ).getRange();
+			const markerRange = editor.model.markers.get( 'restrictedEditingException:1' ).getRange();
 
 			const expectedRange = model.createRange(
 				model.createPositionAt( firstParagraph, 4 ),
@@ -295,7 +295,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			const firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( firstParagraph, 4 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -309,7 +309,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			editor.execute( 'input', { text: 'X' } );
 
 			assertEqualMarkup( getModelData( model ), '<paragraph>foo X[]bar baz</paragraph>' );
-			const markerRange = editor.model.markers.get( 'restricted-editing-exception:1' ).getRange();
+			const markerRange = editor.model.markers.get( 'restrictedEditingException:1' ).getRange();
 
 			const expectedRange = model.createRange(
 				model.createPositionAt( firstParagraph, 4 ),
@@ -324,7 +324,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			const firstParagraph = model.document.getRoot().getChild( 0 );
 
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange(
 						writer.createPositionAt( firstParagraph, 4 ),
 						writer.createPositionAt( firstParagraph, 5 )
@@ -337,7 +337,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 			editor.execute( 'delete' );
 
 			assertEqualMarkup( getModelData( model ), '<paragraph>foo []ar baz</paragraph>' );
-			const markerRange = editor.model.markers.get( 'restricted-editing-exception:1' ).getRange();
+			const markerRange = editor.model.markers.get( 'restrictedEditingException:1' ).getRange();
 
 			const expectedRange = model.createRange(
 				model.createPositionAt( firstParagraph, 4 ),
@@ -385,7 +385,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 				viewDoc.on( 'clipboardOutput', spy, { priority: 'high' } );
 
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange(
 							writer.createPositionAt( firstParagraph, 4 ),
 							writer.createPositionAt( firstParagraph, 7 )
@@ -435,7 +435,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 				viewDoc.on( 'clipboardOutput', spy, { priority: 'high' } );
 
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange(
 							writer.createPositionAt( firstParagraph, 4 ),
 							writer.createPositionAt( firstParagraph, 7 )
@@ -484,7 +484,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 				viewDoc.on( 'clipboardInput', spy, { priority: 'high' } );
 
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange(
 							writer.createPositionAt( firstParagraph, 4 ),
 							writer.createPositionAt( firstParagraph, 7 )
@@ -532,7 +532,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>foo <$marker>b[a]r</$marker> baz</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -551,7 +551,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>foo <$marker>b[a]r</$marker> baz</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -576,7 +576,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>[]foo <$marker>bar</$marker> baz</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -602,7 +602,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 				// <paragraph>foo <$marker>b[a]r</$marker> baz</paragraph>
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 						usingOperation: true,
 						affectsData: true
@@ -625,7 +625,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 				// <paragraph>foo <$marker>b[a]r</$marker> baz</paragraph>
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 						usingOperation: true,
 						affectsData: true
@@ -651,7 +651,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 				// <paragraph>foo <$marker>b[a]r</$marker> baz</paragraph>
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 						usingOperation: true,
 						affectsData: true
@@ -681,7 +681,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 				// <paragraph>foo <$marker>b[a]r</$marker> baz</paragraph>
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 						usingOperation: true,
 						affectsData: true
@@ -709,7 +709,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 				// <paragraph>foo <$marker>b[a]r</$marker> baz</paragraph>
 				model.change( writer => {
-					writer.addMarker( 'restricted-editing-exception:1', {
+					writer.addMarker( 'restrictedEditingException:1', {
 						range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 						usingOperation: true,
 						affectsData: true
@@ -774,7 +774,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>[]foo <marker>bar</marker> baz qux</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -783,7 +783,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>[]foo <marker>bar</marker> <marker>baz</marker≥ qux</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:2', {
+				writer.addMarker( 'restrictedEditingException:2', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -805,7 +805,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph><marker>foo</marker> qux[]</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 0 ), writer.createPositionAt( paragraph, 3 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -826,7 +826,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>foo <marker>bar</marker> baz qux[]</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -835,7 +835,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>foo <marker>bar</marker> <marker>baz</marker≥ qux[]</paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:2', {
+				writer.addMarker( 'restrictedEditingException:2', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 					usingOperation: true,
 					affectsData: true
@@ -858,7 +858,7 @@ describe( 'RestrictedEditingModeEditing', () => {
 
 			// <paragraph>[]foo <marker>qux</marker></paragraph>
 			model.change( writer => {
-				writer.addMarker( 'restricted-editing-exception:1', {
+				writer.addMarker( 'restrictedEditingException:1', {
 					range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 					usingOperation: true,
 					affectsData: true

+ 36 - 36
packages/ckeditor5-restricted-editing/tests/restrictededitingmodenavigationcommand.js

@@ -43,7 +43,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[]foo <marker>bar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -60,7 +60,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> baz[]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -77,7 +77,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo []<marker>bar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -94,7 +94,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>b[]ar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -111,7 +111,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker>[] baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -130,7 +130,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[fo]o <marker>bar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -147,7 +147,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[foo <marker>ba]r</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -164,7 +164,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>ba[r</marker> baz]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -185,7 +185,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[]foo <marker>bar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -194,7 +194,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[]foo <marker>bar</marker> <marker>baz</marker></paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -216,7 +216,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph><marker>foo</marker>[]</paragraph><paragraph>bar</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRangeIn( fiirstParagraph ),
 							usingOperation: true,
 							affectsData: true
@@ -225,7 +225,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph><marker>foo</marker>[]</paragraph><paragraph><marker>bar</marker></paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRangeIn( secondParagraph ),
 							usingOperation: true,
 							affectsData: true
@@ -243,7 +243,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[]foo bar <marker>baz</marker></paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -252,7 +252,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[]foo <marker>bar</marker> <marker>baz</marker></paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -275,7 +275,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[foo <marker>b]ar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -284,7 +284,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[foo <marker>b]ar</marker> <marker>baz</marker></paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -305,7 +305,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>b[ar</marker> b]az</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -314,7 +314,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>b[ar</marker> <marker>b]az</marker></paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -338,7 +338,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -355,7 +355,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[]foo <marker>bar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -372,7 +372,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker>[] baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -389,7 +389,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>b[]ar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -406,7 +406,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo []<marker>bar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -425,7 +425,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[fo]o <marker>bar</marker> b[az]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -442,7 +442,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>b[ar</marker> baz]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -459,7 +459,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>[foo <marker>b]ar</marker> baz</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -480,7 +480,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> baz[]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -489,7 +489,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> <marker>baz</marker>[]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -508,7 +508,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph><marker>foo</marker></paragraph><paragraph>[]bar</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRangeIn( fiirstParagraph ),
 							usingOperation: true,
 							affectsData: true
@@ -517,7 +517,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph><marker>foo</marker></paragraph><paragraph><marker>[]bar</marker></paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRangeIn( secondParagraph ),
 							usingOperation: true,
 							affectsData: true
@@ -535,7 +535,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> baz qux[]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -544,7 +544,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> <marker>baz</marker> qux[]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -565,7 +565,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo bar <marker>baz</marker> qux[]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -574,7 +574,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> <marker>baz</marker> qux[]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -597,7 +597,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> b[az]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:1', {
+						writer.addMarker( 'restrictedEditingException:1', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 4 ), writer.createPositionAt( paragraph, 7 ) ),
 							usingOperation: true,
 							affectsData: true
@@ -606,7 +606,7 @@ describe( 'RestrictedEditingModeNavigationCommand', () => {
 
 					// <paragraph>foo <marker>bar</marker> <marker>b[az</marker>]</paragraph>
 					model.change( writer => {
-						writer.addMarker( 'restricted-editing-exception:2', {
+						writer.addMarker( 'restrictedEditingException:2', {
 							range: writer.createRange( writer.createPositionAt( paragraph, 8 ), writer.createPositionAt( paragraph, 11 ) ),
 							usingOperation: true,
 							affectsData: true