Skip to content

Commit e7b3238

Browse files
adeluraReinmar
authored andcommitted
Text inside .cke_voice_label comes from title config propety, and not added when value is set to false.
1 parent b6bc9ac commit e7b3238

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

core/creators/themedui.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,9 @@ CKEDITOR.replaceClass = 'ckeditor';
388388
' dir="{langDir}"' +
389389
' lang="{langCode}"' +
390390
' role="application"' +
391-
' aria-labelledby="cke_{name}_arialbl">' +
392-
'<span id="cke_{name}_arialbl" class="cke_voice_label">{voiceLabel}</span>' +
391+
( editor.title ? ' aria-labelledby="cke_{name}_arialbl"' : '' ) +
392+
'>' +
393+
( editor.title ? '<span id="cke_{name}_arialbl" class="cke_voice_label">{voiceLabel}</span>' : '' ) +
393394
'<{outerEl} class="cke_inner cke_reset" role="presentation">' +
394395
'{topHtml}' +
395396
'<{outerEl} id="{contentId}" class="cke_contents cke_reset" role="presentation"></{outerEl}>' +
@@ -403,7 +404,7 @@ CKEDITOR.replaceClass = 'ckeditor';
403404
name: name,
404405
langDir: editor.lang.dir,
405406
langCode: editor.langCode,
406-
voiceLabel: [ editor.lang.editor, editor.name ].join( ', ' ),
407+
voiceLabel: editor.title,
407408
topHtml: topHtml ? '<span id="' + editor.ui.spaceId( 'top' ) + '" class="cke_top cke_reset_all" role="presentation" style="height:auto">' + topHtml + '</span>' : '',
408409
contentId: editor.ui.spaceId( 'contents' ),
409410
bottomHtml: bottomHtml ? '<span id="' + editor.ui.spaceId( 'bottom' ) + '" class="cke_bottom cke_reset_all" role="presentation">' + bottomHtml + '</span>' : '',

plugins/floatingspace/plugin.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,7 @@
44
*/
55

66
( function() {
7-
var floatSpaceTpl = CKEDITOR.addTemplate( 'floatcontainer', '<div' +
8-
' id="cke_{name}"' +
9-
' class="cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} ' + CKEDITOR.env.cssClass + '"' +
10-
' dir="{langDir}"' +
11-
' title="' + ( CKEDITOR.env.gecko ? ' ' : '' ) + '"' +
12-
' lang="{langCode}"' +
13-
' role="application"' +
14-
' style="{style}"' +
15-
' aria-labelledby="cke_{name}_arialbl"' +
16-
'>' +
17-
'<span id="cke_{name}_arialbl" class="cke_voice_label">{voiceLabel}</span>' +
18-
'<div class="cke_inner">' +
19-
'<div id="{topId}" class="cke_top" role="presentation">{content}</div>' +
20-
'</div>' +
21-
'</div>' ),
22-
win = CKEDITOR.document.getWindow(),
7+
var win = CKEDITOR.document.getWindow(),
238
pixelate = CKEDITOR.tools.cssLength;
249

2510
CKEDITOR.plugins.add( 'floatingspace', {
@@ -278,15 +263,30 @@
278263
} )();
279264

280265
if ( topHtml ) {
281-
var floatSpace = CKEDITOR.document.getBody().append( CKEDITOR.dom.element.createFromHtml( floatSpaceTpl.output( {
266+
var floatSpaceTpl = new CKEDITOR.template( '<div' +
267+
' id="cke_{name}"' +
268+
' class="cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} ' + CKEDITOR.env.cssClass + '"' +
269+
' dir="{langDir}"' +
270+
' title="' + ( CKEDITOR.env.gecko ? ' ' : '' ) + '"' +
271+
' lang="{langCode}"' +
272+
' role="application"' +
273+
' style="{style}"' +
274+
( editor.title ? ' aria-labelledby="cke_{name}_arialbl"' : ' ' ) +
275+
'>' +
276+
( editor.title ? '<span id="cke_{name}_arialbl" class="cke_voice_label">{voiceLabel}</span>' : ' ' ) +
277+
'<div class="cke_inner">' +
278+
'<div id="{topId}" class="cke_top" role="presentation">{content}</div>' +
279+
'</div>' +
280+
'</div>' ),
281+
floatSpace = CKEDITOR.document.getBody().append( CKEDITOR.dom.element.createFromHtml( floatSpaceTpl.output( {
282282
content: topHtml,
283283
id: editor.id,
284284
langDir: editor.lang.dir,
285285
langCode: editor.langCode,
286286
name: editor.name,
287287
style: 'display:none;z-index:' + ( config.baseFloatZIndex - 1 ),
288288
topId: editor.ui.spaceId( 'top' ),
289-
voiceLabel: editor.lang.editorPanel + ', ' + editor.name
289+
voiceLabel: editor.title
290290
} ) ) ),
291291

292292
// Use event buffers to reduce CPU load when tons of events are fired.

0 commit comments

Comments
 (0)