Merge branch 't/11793b'

ckeditor · May 8, 2014 · cce1107 · cce1107
2 parents 997eff8 + 42e3c2a
commit cce1107
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -21,6 +21,7 @@ Fixed Issues:
 * [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: It is not possible to change language back to undefined in [Code Snippet](http://ckeditor.com/addon/codesnippet) dialog.
 * [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: [Filter](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied inside elements with `contenteditable` attribute set to `true`.
 * [#11798](http://dev.ckeditor.com/ticket/11798): Fixed: Inserting non-editable element inside a table cell breaks the table badly.
+* [#11793](http://dev.ckeditor.com/ticket/11793): Fixed: Drop down is not "on" when clicking it while editor is blurred.
 
 Other changes:
 

diff --git a/plugins/richcombo/plugin.js b/plugins/richcombo/plugin.js
@@ -160,6 +160,10 @@ CKEDITOR.plugins.add( 'richcombo', {
 				};
 
 				function updateState() {
+					// Don't change state while richcombo is active (#11793).
+					if ( this.getState() == CKEDITOR.TRISTATE_ON )
+						return;
+
 					var state = this.modes[ editor.mode ] ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED;
 
 					if ( editor.readOnly && !this.readOnly )