Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.5.1
[ckeditor.git]
/
_source
/
plugins
/
colorbutton
/
plugin.js
diff --git
a/_source/plugins/colorbutton/plugin.js
b/_source/plugins/colorbutton/plugin.js
index
0fb8c05
..
16ad1f2
100644
(file)
--- a/
_source/plugins/colorbutton/plugin.js
+++ b/
_source/plugins/colorbutton/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-73,7
+73,7
@@
CKEDITOR.plugins.add( 'colorbutton',
{
\r
color = block && block.getComputedStyle( type == 'back' ? 'background-color' : 'color' ) || 'transparent';
\r
}
\r
{
\r
color = block && block.getComputedStyle( type == 'back' ? 'background-color' : 'color' ) || 'transparent';
\r
}
\r
- while ( type == 'back' && color == 'transparent' && ( block = block.getParent() ) );
\r
+ while ( type == 'back' && color == 'transparent' && block && ( block = block.getParent() ) );
\r
\r
// The box should never be transparent.
\r
if ( !color || color == 'transparent' )
\r
\r
// The box should never be transparent.
\r
if ( !color || color == 'transparent' )
\r
@@
-220,7
+220,7
@@
CKEDITOR.plugins.add( 'colorbutton',
\r
function isUnstylable( ele )
\r
{
\r
\r
function isUnstylable( ele )
\r
{
\r
- return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-cke-nostyle' );
\r
+ return ( ele.getAttribute( 'contentEditable' ) == 'false' ) || ele.getAttribute( 'data-nostyle' );
\r
}
\r
}
\r
});
\r
}
\r
}
\r
});
\r