Merge branch 't/10975'

ckeditor · Oct 31, 2013 · 152e853 · 152e853
2 parents 48da853 + 94ff9d2
commit 152e853
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@ CKEditor 4 Changelog
 Fixed Issues:
 
 * [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: loading external jQuery when opening adapter sample from file.
+* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening color palette.
 
 ## CKEditor 4.2.2
 

diff --git a/plugins/colorbutton/plugin.js b/plugins/colorbutton/plugin.js
@@ -70,6 +70,9 @@ CKEDITOR.plugins.add( 'colorbutton', {
 						path = editor.elementPath( block ),
 						color;
 
+					if ( !path )
+						return;
+
 					// Find the closest block element.
 					block = path.block || path.blockLimit || editor.document.getBody();