Skip to content
Permalink
Browse files

Merge branch 't/14539'.

  • Loading branch information...
Comandeer committed Jun 24, 2016
2 parents a45d6de + e3b0402 commit d9873dd5c0bfbc9c25fe612a9a837ecebea70dfe
Showing with 229 additions and 53 deletions.
  1. +1 −0 CHANGES.md
  2. +12 −5 core/selection.js
  3. +2 −1 plugins/widget/lang/af.js
  4. +2 −1 plugins/widget/lang/ar.js
  5. +2 −1 plugins/widget/lang/bg.js
  6. +2 −1 plugins/widget/lang/ca.js
  7. +2 −1 plugins/widget/lang/cs.js
  8. +2 −1 plugins/widget/lang/cy.js
  9. +2 −1 plugins/widget/lang/da.js
  10. +2 −1 plugins/widget/lang/de-ch.js
  11. +2 −1 plugins/widget/lang/de.js
  12. +2 −1 plugins/widget/lang/el.js
  13. +2 −1 plugins/widget/lang/en-gb.js
  14. +2 −1 plugins/widget/lang/en.js
  15. +2 −1 plugins/widget/lang/eo.js
  16. +2 −1 plugins/widget/lang/es.js
  17. +2 −1 plugins/widget/lang/eu.js
  18. +2 −1 plugins/widget/lang/fa.js
  19. +2 −1 plugins/widget/lang/fi.js
  20. +2 −1 plugins/widget/lang/fr.js
  21. +2 −1 plugins/widget/lang/gl.js
  22. +2 −1 plugins/widget/lang/he.js
  23. +2 −1 plugins/widget/lang/hr.js
  24. +2 −1 plugins/widget/lang/hu.js
  25. +2 −1 plugins/widget/lang/id.js
  26. +2 −1 plugins/widget/lang/it.js
  27. +2 −1 plugins/widget/lang/ja.js
  28. +2 −1 plugins/widget/lang/km.js
  29. +2 −1 plugins/widget/lang/ko.js
  30. +2 −1 plugins/widget/lang/ku.js
  31. +2 −1 plugins/widget/lang/lv.js
  32. +2 −1 plugins/widget/lang/nb.js
  33. +2 −1 plugins/widget/lang/nl.js
  34. +2 −1 plugins/widget/lang/no.js
  35. +2 −1 plugins/widget/lang/pl.js
  36. +2 −1 plugins/widget/lang/pt-br.js
  37. +2 −1 plugins/widget/lang/pt.js
  38. +2 −1 plugins/widget/lang/ru.js
  39. +2 −1 plugins/widget/lang/sk.js
  40. +2 −1 plugins/widget/lang/sl.js
  41. +2 −1 plugins/widget/lang/sq.js
  42. +2 −1 plugins/widget/lang/sv.js
  43. +2 −1 plugins/widget/lang/tr.js
  44. +2 −1 plugins/widget/lang/tt.js
  45. +2 −1 plugins/widget/lang/ug.js
  46. +2 −1 plugins/widget/lang/uk.js
  47. +2 −1 plugins/widget/lang/vi.js
  48. +2 −1 plugins/widget/lang/zh-cn.js
  49. +2 −1 plugins/widget/lang/zh.js
  50. +36 −1 plugins/widget/plugin.js
  51. +3 −0 tests/plugins/widget/_helpers/tools.js
  52. +51 −0 tests/plugins/widget/manual/arialabel.html
  53. +32 −0 tests/plugins/widget/manual/arialabel.md
@@ -5,6 +5,7 @@ CKEditor 4 Changelog

Fixed Issues:

* [#14539](https://dev.ckeditor.com/ticket/14539): Fixed: JAWS reads "selected Blank" instead of "selected <widget name>" when selecting widget.
* [#14667](http://dev.ckeditor.com/ticket/14667): [IE] Fixed: Removing background color from selected text removes background color from the whole paragraph.
* [#14252](http://dev.ckeditor.com/ticket/14252): Fixed: Styles dropdown doesn't always reflect the current style of the text line in Internet Explorer.
* [#13929](http://dev.ckeditor.com/ticket/13929): Fixed: Errors in console on IE11 with compatibility mode in manual test for [#13867](http://dev.ckeditor.com/ticket/13867).
@@ -234,10 +234,11 @@
}

// Creates cke_hidden_sel container and puts real selection there.
function hideSelection( editor ) {
var style = CKEDITOR.env.ie ? 'display:none' : 'position:fixed;top:0;left:-1000px',
function hideSelection( editor, ariaLabel ) {
var content = ariaLabel || '&nbsp;',
style = CKEDITOR.env.ie ? 'display:none' : 'position:fixed;top:0;left:-1000px',
hiddenEl = CKEDITOR.dom.element.createFromHtml(
'<div data-cke-hidden-sel="1" data-cke-temp="1" style="' + style + '">&nbsp;</div>',
'<div data-cke-hidden-sel="1" data-cke-temp="1" style="' + style + '">' + content + '</div>',
editor.document );

editor.fire( 'lockSnapshot' );
@@ -1954,14 +1955,20 @@
* displayed to the user.
*
* @param {CKEDITOR.dom.element} element The element to be "selected".
* @param {String} [ariaLabel] String to be used for screen reader to describe the selection.
*/
fake: function( element ) {
fake: function( element, ariaLabel ) {
var editor = this.root.editor;

// Attempt to retreive aria-label if possible (#14539).
if ( ariaLabel === undefined && element.hasAttribute( 'aria-label' ) ) {
ariaLabel = element.getAttribute( 'aria-label' );
}

// Cleanup after previous selection - e.g. remove hidden sel container.
this.reset();

hideSelection( editor );
hideSelection( editor, ariaLabel );

// Set this value after executing hiseSelection, because it may
// cause reset() which overwrites cache.
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'af', {
'move': 'Klik en trek on te beweeg'
'move': 'Klik en trek on te beweeg',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'ar', {
'move': 'إضغط و إسحب للتحريك'
'move': 'إضغط و إسحب للتحريك',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'bg', {
'move': 'Кликни и влачи, за да преместиш'
'move': 'Кликни и влачи, за да преместиш',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'ca', {
'move': 'Clicar i arrossegar per moure'
'move': 'Clicar i arrossegar per moure',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'cs', {
'move': 'Klepněte a táhněte pro přesunutí'
'move': 'Klepněte a táhněte pro přesunutí',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'cy', {
'move': 'Clcio a llusgo i symud'
'move': 'Clcio a llusgo i symud',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'da', {
'move': 'Klik og træk for at flytte'
'move': 'Klik og træk for at flytte',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'de-ch', {
'move': 'Zum Verschieben anwählen und ziehen'
'move': 'Zum Verschieben anwählen und ziehen',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'de', {
'move': 'Zum Verschieben anwählen und ziehen'
'move': 'Zum Verschieben anwählen und ziehen',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'el', {
'move': 'Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε'
'move': 'Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'en-gb', {
'move': 'Click and drag to move'
'move': 'Click and drag to move',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'en', {
'move': 'Click and drag to move'
'move': 'Click and drag to move',
'label': '%1 widget'
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'eo', {
'move': 'klaki kaj treni por movi'
'move': 'klaki kaj treni por movi',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'es', {
'move': 'Dar clic y arrastrar para mover'
'move': 'Dar clic y arrastrar para mover',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'eu', {
'move': 'Klikatu eta arrastatu lekuz aldatzeko'
'move': 'Klikatu eta arrastatu lekuz aldatzeko',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'fa', {
'move': 'کلیک و کشیدن برای جابجایی'
'move': 'کلیک و کشیدن برای جابجایی',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'fi', {
'move': 'Siirrä klikkaamalla ja raahaamalla'
'move': 'Siirrä klikkaamalla ja raahaamalla',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'fr', {
'move': 'Cliquer et glisser pour déplacer'
'move': 'Cliquer et glisser pour déplacer',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'gl', {
'move': 'Prema e arrastre para mover'
'move': 'Prema e arrastre para mover',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'he', {
'move': 'לחץ וגרור להזזה'
'move': 'לחץ וגרור להזזה',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'hr', {
'move': 'Klikni i povuci da pomakneš'
'move': 'Klikni i povuci da pomakneš',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'hu', {
'move': 'Kattints és húzd a mozgatáshoz'
'move': 'Kattints és húzd a mozgatáshoz',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'id', {
'move': 'Tekan dan geser untuk memindahkan'
'move': 'Tekan dan geser untuk memindahkan',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'it', {
'move': 'Fare clic e trascinare per spostare'
'move': 'Fare clic e trascinare per spostare',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'ja', {
'move': 'ドラッグして移動'
'move': 'ドラッグして移動',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'km', {
'move': 'ចុច​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី'
'move': 'ចុច​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'ko', {
'move': '움직이려면 클릭 후 드래그 하세요'
'move': '움직이려면 클릭 후 드래그 하세요',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'ku', {
'move': 'کرتەبکە و ڕایبکێشە بۆ جوڵاندن'
'move': 'کرتەبکە و ڕایبکێشە بۆ جوڵاندن',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'lv', {
'move': 'Klikšķina un velc, lai pārvietotu'
'move': 'Klikšķina un velc, lai pārvietotu',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'nb', {
'move': 'Klikk og dra for å flytte'
'move': 'Klikk og dra for å flytte',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'nl', {
'move': 'Klik en sleep om te verplaatsen'
'move': 'Klik en sleep om te verplaatsen',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'no', {
'move': 'Klikk og dra for å flytte'
'move': 'Klikk og dra for å flytte',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'pl', {
'move': 'Kliknij i przeciągnij, by przenieść.'
'move': 'Kliknij i przeciągnij, by przenieść.',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'pt-br', {
'move': 'Click e arraste para mover'
'move': 'Click e arraste para mover',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'pt', {
'move': 'Clique e arraste para mover'
'move': 'Clique e arraste para mover',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'ru', {
'move': 'Нажмите и перетащите'
'move': 'Нажмите и перетащите',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'sk', {
'move': 'Kliknite a potiahnite pre presunutie'
'move': 'Kliknite a potiahnite pre presunutie',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'sl', {
'move': 'Kliknite in povlecite, da premaknete'
'move': 'Kliknite in povlecite, da premaknete',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'sq', {
'move': 'Kliko dhe tërhiqe për ta lëvizur'
'move': 'Kliko dhe tërhiqe për ta lëvizur',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'sv', {
'move': 'Klicka och drag för att flytta'
'move': 'Klicka och drag för att flytta',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'tr', {
'move': 'Taşımak için, tıklayın ve sürükleyin'
'move': 'Taşımak için, tıklayın ve sürükleyin',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'tt', {
'move': 'Күчереп куер өчен басып шудырыгыз'
'move': 'Күчереп куер өчен басып шудырыгыз',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'ug', {
'move': 'يۆتكەشتە چېكىپ سۆرەڭ'
'move': 'يۆتكەشتە چېكىپ سۆرەڭ',
'label': '%1 widget' // MISSING
} );
@@ -3,5 +3,6 @@
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'uk', {
'move': 'Клікніть і потягніть для переміщення'
'move': 'Клікніть і потягніть для переміщення',
'label': '%1 widget' // MISSING
} );

0 comments on commit d9873dd

Please sign in to comment.
You can’t perform that action at this time.