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
/
core
/
dom
/
node.js
diff --git
a/_source/core/dom/node.js
b/_source/core/dom/node.js
index
a106810
..
ef41e06
100644
(file)
--- a/
_source/core/dom/node.js
+++ b/
_source/core/dom/node.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
@@
-664,13
+664,13
@@
CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype,
* @since 3.5
\r
* @example
\r
* // For the following HTML:
\r
* @since 3.5
\r
* @example
\r
* // For the following HTML:
\r
- * // <div contenteditable="false">Some <b>text</b></div>
\r
+ * // <div contenteditable="false">Some <b>text</b></div>
\r
*
\r
*
\r
- * // If "ele" is the above <div>
\r
- * ele.getReadOnlyRoot(); // the <div> element
\r
+ * // If "ele" is the above <div>
\r
+ * ele.isReadOnly(); // the <div> element
\r
*
\r
*
\r
- * // If "ele" is the above <b>
\r
- * ele.getReadOnlyRoot(); // the <div> element
\r
+ * // If "ele" is the above <b>
\r
+ * ele.isReadOnly(); // the <div> element
\r
*/
\r
isReadOnly : function()
\r
{
\r
*/
\r
isReadOnly : function()
\r
{
\r
@@
-679,7
+679,7
@@
CKEDITOR.tools.extend( CKEDITOR.dom.node.prototype,
{
\r
if ( current.type == CKEDITOR.NODE_ELEMENT )
\r
{
\r
{
\r
if ( current.type == CKEDITOR.NODE_ELEMENT )
\r
{
\r
- if ( current.is( 'body' ) || current.getCustomData( '_cke_notReadOnly' ) )
\r
+ if ( current.is( 'body' ) || !!current.data( 'cke-editable' ) )
\r
break;
\r
\r
if ( current.getAttribute( 'contentEditable' ) == 'false' )
\r
break;
\r
\r
if ( current.getAttribute( 'contentEditable' ) == 'false' )
\r