Merge pull request #95 from ckeditor/t/ckeditor5/1403

Fix: The UI buttons should be marked as toggleable for better assistive technologies support (see ckeditor/ckeditor5#1403).
ckeditor · Aug 12, 2019 · b9f5867 · b9f5867
2 parents b8b6cbc + bd36451
commit b9f5867
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 7 deletions.
diff --git a/src/bold/boldui.js b/src/bold/boldui.js
@@ -36,7 +36,8 @@ export default class BoldUI extends Plugin {
 				label: t( 'Bold' ),
 				icon: boldIcon,
 				keystroke: 'CTRL+B',
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );

diff --git a/src/code/codeui.js b/src/code/codeui.js
@@ -37,7 +37,8 @@ export default class CodeUI extends Plugin {
 			view.set( {
 				label: t( 'Code' ),
 				icon: codeIcon,
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );

diff --git a/src/italic/italicui.js b/src/italic/italicui.js
@@ -36,7 +36,8 @@ export default class ItalicUI extends Plugin {
 				label: t( 'Italic' ),
 				icon: italicIcon,
 				keystroke: 'CTRL+I',
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );

diff --git a/src/strikethrough/strikethroughui.js b/src/strikethrough/strikethroughui.js
@@ -36,7 +36,8 @@ export default class StrikethroughUI extends Plugin {
 				label: t( 'Strikethrough' ),
 				icon: strikethroughIcon,
 				keystroke: 'CTRL+SHIFT+X',
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );

diff --git a/src/subscript/subscriptui.js b/src/subscript/subscriptui.js
@@ -35,7 +35,8 @@ export default class SubscriptUI extends Plugin {
 			view.set( {
 				label: t( 'Subscript' ),
 				icon: subscriptIcon,
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );

diff --git a/src/superscript/superscriptui.js b/src/superscript/superscriptui.js
@@ -35,7 +35,8 @@ export default class SuperscriptUI extends Plugin {
 			view.set( {
 				label: t( 'Superscript' ),
 				icon: superscriptIcon,
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );

diff --git a/src/underline/underlineui.js b/src/underline/underlineui.js
@@ -36,7 +36,8 @@ export default class UnderlineUI extends Plugin {
 				label: t( 'Underline' ),
 				icon: underlineIcon,
 				keystroke: 'CTRL+U',
-				tooltip: true
+				tooltip: true,
+				isToggleable: true
 			} );
 
 			view.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );

diff --git a/tests/bold/boldui.js b/tests/bold/boldui.js
@@ -43,6 +43,7 @@ describe( 'BoldUI', () => {
 		expect( boldView.label ).to.equal( 'Bold' );
 		expect( boldView.icon ).to.match( /<svg / );
 		expect( boldView.keystroke ).to.equal( 'CTRL+B' );
+		expect( boldView.isToggleable ).to.be.true;
 	} );
 
 	it( 'should execute bold command on model execute event', () => {

diff --git a/tests/code/codeui.js b/tests/code/codeui.js
@@ -42,6 +42,7 @@ describe( 'CodeUI', () => {
 		expect( codeView.isOn ).to.be.false;
 		expect( codeView.label ).to.equal( 'Code' );
 		expect( codeView.icon ).to.match( /<svg / );
+		expect( codeView.isToggleable ).to.be.true;
 	} );
 
 	it( 'should execute code command on model execute event', () => {

diff --git a/tests/italic/italicui.js b/tests/italic/italicui.js
@@ -44,6 +44,7 @@ describe( 'ItalicUI', () => {
 		expect( italicView.label ).to.equal( 'Italic' );
 		expect( italicView.icon ).to.match( /<svg / );
 		expect( italicView.keystroke ).to.equal( 'CTRL+I' );
+		expect( italicView.isToggleable ).to.be.true;
 	} );
 
 	it( 'should execute italic command on model execute event', () => {

diff --git a/tests/strikethrough/strikethroughui.js b/tests/strikethrough/strikethroughui.js
@@ -44,6 +44,7 @@ describe( 'StrikethroughUI', () => {
 		expect( strikeView.label ).to.equal( 'Strikethrough' );
 		expect( strikeView.icon ).to.match( /<svg / );
 		expect( strikeView.keystroke ).to.equal( 'CTRL+SHIFT+X' );
+		expect( strikeView.isToggleable ).to.be.true;
 	} );
 
 	it( 'should execute strikethrough command on model execute event', () => {

diff --git a/tests/subscript/subscriptui.js b/tests/subscript/subscriptui.js
@@ -42,6 +42,7 @@ describe( 'SubscriptUI', () => {
 		expect( subView.isOn ).to.be.false;
 		expect( subView.label ).to.equal( 'Subscript' );
 		expect( subView.icon ).to.match( /<svg / );
+		expect( subView.isToggleable ).to.be.true;
 	} );
 
 	it( 'should execute subscript command on model execute event', () => {

diff --git a/tests/superscript/superscriptui.js b/tests/superscript/superscriptui.js
@@ -42,6 +42,7 @@ describe( 'SuperscriptUI', () => {
 		expect( superView.isOn ).to.be.false;
 		expect( superView.label ).to.equal( 'Superscript' );
 		expect( superView.icon ).to.match( /<svg / );
+		expect( superView.isToggleable ).to.be.true;
 	} );
 
 	it( 'should execute superscript command on model execute event', () => {

diff --git a/tests/underline/underlineui.js b/tests/underline/underlineui.js
@@ -44,6 +44,7 @@ describe( 'Underline', () => {
 		expect( underlineView.label ).to.equal( 'Underline' );
 		expect( underlineView.icon ).to.match( /<svg / );
 		expect( underlineView.keystroke ).to.equal( 'CTRL+U' );
+		expect( underlineView.isToggleable ).to.be.true;
 	} );
 
 	it( 'should execute underline command on model execute event', () => {