diff options
Diffstat (limited to 'sources/plugins/toolbar/plugin.js')
| -rw-r--r-- | sources/plugins/toolbar/plugin.js | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sources/plugins/toolbar/plugin.js b/sources/plugins/toolbar/plugin.js index b267b51..fc19359 100644 --- a/sources/plugins/toolbar/plugin.js +++ b/sources/plugins/toolbar/plugin.js | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | if ( editor.toolbox ) { | 34 | if ( editor.toolbox ) { |
| 35 | editor.toolbox.focusCommandExecuted = true; | 35 | editor.toolbox.focusCommandExecuted = true; |
| 36 | 36 | ||
| 37 | // Make the first button focus accessible for IE. (#3417) | 37 | // Make the first button focus accessible for IE. (http://dev.ckeditor.com/ticket/3417) |
| 38 | // Adobe AIR instead need while of delay. | 38 | // Adobe AIR instead need while of delay. |
| 39 | if ( CKEDITOR.env.ie || CKEDITOR.env.air ) { | 39 | if ( CKEDITOR.env.ie || CKEDITOR.env.air ) { |
| 40 | setTimeout( function() { | 40 | setTimeout( function() { |
| @@ -51,7 +51,7 @@ | |||
| 51 | CKEDITOR.plugins.add( 'toolbar', { | 51 | CKEDITOR.plugins.add( 'toolbar', { |
| 52 | requires: 'button', | 52 | requires: 'button', |
| 53 | // jscs:disable maximumLineLength | 53 | // jscs:disable maximumLineLength |
| 54 | lang: 'af,ar,az,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,oc,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% | 54 | lang: 'af,ar,az,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,es-mx,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,oc,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% |
| 55 | // jscs:enable maximumLineLength | 55 | // jscs:enable maximumLineLength |
| 56 | 56 | ||
| 57 | init: function( editor ) { | 57 | init: function( editor ) { |
| @@ -118,10 +118,6 @@ | |||
| 118 | return false; | 118 | return false; |
| 119 | case 40: // DOWN-ARROW | 119 | case 40: // DOWN-ARROW |
| 120 | if ( item.button && item.button.hasArrow ) { | 120 | if ( item.button && item.button.hasArrow ) { |
| 121 | // Note: code is duplicated in plugins\richcombo\plugin.js in keyDownFn(). | ||
| 122 | editor.once( 'panelShow', function( evt ) { | ||
| 123 | evt.data._.panel._.currentBlock.onKeyDown( 40 ); | ||
| 124 | } ); | ||
| 125 | item.execute(); | 121 | item.execute(); |
| 126 | } else { | 122 | } else { |
| 127 | // Send left arrow key. | 123 | // Send left arrow key. |
| @@ -205,7 +201,7 @@ | |||
| 205 | // available because it's a common mistake to leave | 201 | // available because it's a common mistake to leave |
| 206 | // an extra comma in the toolbar definition | 202 | // an extra comma in the toolbar definition |
| 207 | // settings, which leads on the editor not loading | 203 | // settings, which leads on the editor not loading |
| 208 | // at all in IE. (#3983) | 204 | // at all in IE. (http://dev.ckeditor.com/ticket/3983) |
| 209 | if ( !row ) | 205 | if ( !row ) |
| 210 | continue; | 206 | continue; |
| 211 | 207 | ||
| @@ -287,7 +283,7 @@ | |||
| 287 | itemObj.toolbar = toolbarObj; | 283 | itemObj.toolbar = toolbarObj; |
| 288 | itemObj.onkey = itemKeystroke; | 284 | itemObj.onkey = itemKeystroke; |
| 289 | 285 | ||
| 290 | // Fix for #3052: | 286 | // Fix for http://dev.ckeditor.com/ticket/3052: |
| 291 | // Prevent JAWS from focusing the toolbar after document load. | 287 | // Prevent JAWS from focusing the toolbar after document load. |
| 292 | itemObj.onfocus = function() { | 288 | itemObj.onfocus = function() { |
| 293 | if ( !editor.toolbox.focusCommandExecuted ) | 289 | if ( !editor.toolbox.focusCommandExecuted ) |