aboutsummaryrefslogtreecommitdiff
path: root/sources/plugins/richcombo
diff options
context:
space:
mode:
Diffstat (limited to 'sources/plugins/richcombo')
-rw-r--r--sources/plugins/richcombo/plugin.js21
1 files changed, 3 insertions, 18 deletions
diff --git a/sources/plugins/richcombo/plugin.js b/sources/plugins/richcombo/plugin.js
index 67ccc8e..15b04b1 100644
--- a/sources/plugins/richcombo/plugin.js
+++ b/sources/plugins/richcombo/plugin.js
@@ -1,5 +1,5 @@
1/** 1/**
2 * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. 2 * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
3 * For licensing, see LICENSE.md or http://ckeditor.com/license 3 * For licensing, see LICENSE.md or http://ckeditor.com/license
4 */ 4 */
5 5
@@ -37,7 +37,7 @@ CKEDITOR.plugins.add( 'richcombo', {
37 template += 37 template +=
38 ' onkeydown="return CKEDITOR.tools.callFunction({keydownFn},event,this);"' + 38 ' onkeydown="return CKEDITOR.tools.callFunction({keydownFn},event,this);"' +
39 ' onfocus="return CKEDITOR.tools.callFunction({focusFn},event);" ' + 39 ' onfocus="return CKEDITOR.tools.callFunction({focusFn},event);" ' +
40 ( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) + // #188 40 ( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) + // http://dev.ckeditor.com/ticket/188
41 '="CKEDITOR.tools.callFunction({clickFn},this);return false;">' + 41 '="CKEDITOR.tools.callFunction({clickFn},this);return false;">' +
42 '<span id="{id}_text" class="cke_combo_text cke_combo_inlinelabel">{label}</span>' + 42 '<span id="{id}_text" class="cke_combo_text cke_combo_inlinelabel">{label}</span>' +
43 '<span class="cke_combo_open">' + 43 '<span class="cke_combo_open">' +
@@ -160,7 +160,7 @@ CKEDITOR.plugins.add( 'richcombo', {
160 }; 160 };
161 161
162 function updateState() { 162 function updateState() {
163 // Don't change state while richcombo is active (#11793). 163 // Don't change state while richcombo is active (http://dev.ckeditor.com/ticket/11793).
164 if ( this.getState() == CKEDITOR.TRISTATE_ON ) 164 if ( this.getState() == CKEDITOR.TRISTATE_ON )
165 return; 165 return;
166 166
@@ -189,15 +189,6 @@ CKEDITOR.plugins.add( 'richcombo', {
189 189
190 var keystroke = ev.getKeystroke(); 190 var keystroke = ev.getKeystroke();
191 191
192 // ARROW-DOWN
193 // This call is duplicated in plugins/toolbar/plugin.js in itemKeystroke().
194 // Move focus to the first element after drop down was opened by the arrow down key.
195 if ( keystroke == 40 ) {
196 editor.once( 'panelShow', function( evt ) {
197 evt.data._.panel._.currentBlock.onKeyDown( 40 );
198 } );
199 }
200
201 switch ( keystroke ) { 192 switch ( keystroke ) {
202 case 13: // ENTER 193 case 13: // ENTER
203 case 32: // SPACE 194 case 32: // SPACE
@@ -266,12 +257,6 @@ CKEDITOR.plugins.add( 'richcombo', {
266 257
267 if ( me.onOpen ) 258 if ( me.onOpen )
268 me.onOpen(); 259 me.onOpen();
269
270 // The "panelShow" event is fired assinchronously, after the
271 // onShow method call.
272 editor.once( 'panelShow', function() {
273 list.focus( !list.multiSelect && me.getValue() );
274 } );
275 }; 260 };
276 261
277 panel.onHide = function( preventOnClose ) { 262 panel.onHide = function( preventOnClose ) {