X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fcolorbutton%2Fplugin.js;h=16ad1f2813722a265f46bb8bcf9747f7208d0232;hp=0fb8c05e43d8ab7ffe8425ffb1fe710d617a7cc1;hb=48b1db88210b4160dce439c6e3e32e14af8c106b;hpb=9afde8772159bd3436f1f5b7862960307710ae5a

diff --git a/_source/plugins/colorbutton/plugin.js b/_source/plugins/colorbutton/plugin.js
index 0fb8c05..16ad1f2 100644
--- a/_source/plugins/colorbutton/plugin.js
+++ b/_source/plugins/colorbutton/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -73,7 +73,7 @@ CKEDITOR.plugins.add( 'colorbutton',
 						{
 							color = block && block.getComputedStyle( type == 'back' ? 'background-color' : 'color' ) || 'transparent';
 						}
-						while ( type == 'back' && color == 'transparent' && ( block = block.getParent() ) );
+						while ( type == 'back' && color == 'transparent' && block && ( block = block.getParent() ) );
 
 						// The box should never be transparent.
 						if ( !color || color == 'transparent' )
@@ -220,7 +220,7 @@ CKEDITOR.plugins.add( 'colorbutton',
 
 		function isUnstylable( ele )
 		{
-			return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-cke-nostyle' );
+			return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' );
 		}
 	}
 });