Fix: Selection attribute is not updated on consecutive `HighlightComm…

…and#execute()` calls.
ckeditor · Feb 20, 2018 · 943d665 · 943d665
1 parent 7ddd2ea
commit 943d665
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/highlightcommand.js b/src/highlightcommand.js
@@ -84,6 +84,7 @@ export default class HighlightCommand extends Command {
 					} else {
 						// ...update `highlight` value.
 						writer.setAttribute( 'highlight', highlighter, highlightRange );
+						writer.setSelectionAttribute( 'highlight', highlighter );
 					}
 				} else if ( highlighter ) {
 					writer.setSelectionAttribute( 'highlight', highlighter );

diff --git a/tests/highlightcommand.js b/tests/highlightcommand.js
@@ -172,6 +172,22 @@ describe( 'HighlightCommand', () => {
 					expect( command.value ).to.be.undefined;
 					expect( doc.selection.hasAttribute( 'highlight' ) ).to.be.false;
 				} );
+
+				it( 'should change selection attribute on consecutive calls', () => {
+					setData( model, '<p>abcfoobar[] foobar</p>' );
+
+					expect( command.value ).to.be.undefined;
+
+					command.execute( { value: 'greenMarker' } );
+
+					expect( command.value ).to.equal( 'greenMarker' );
+					expect( doc.selection.hasAttribute( 'highlight' ) ).to.be.true;
+
+					command.execute( { value: 'pinkMarker' } );
+
+					expect( command.value ).to.equal( 'pinkMarker' );
+					expect( doc.selection.hasAttribute( 'highlight' ) ).to.be.true;
+				} );
 			} );
 
 			describe( 'on not collapsed range', () => {