diff options
Diffstat (limited to 'sources/core/htmlparser/element.js')
| -rw-r--r-- | sources/core/htmlparser/element.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/core/htmlparser/element.js b/sources/core/htmlparser/element.js index 0ed750e..224d3e6 100644 --- a/sources/core/htmlparser/element.js +++ b/sources/core/htmlparser/element.js | |||
| @@ -35,7 +35,7 @@ CKEDITOR.htmlParser.element = function( name, attributes ) { | |||
| 35 | */ | 35 | */ |
| 36 | this.children = []; | 36 | this.children = []; |
| 37 | 37 | ||
| 38 | // Reveal the real semantic of our internal custom tag name (#6639), | 38 | // Reveal the real semantic of our internal custom tag name (http://dev.ckeditor.com/ticket/6639), |
| 39 | // when resolving whether it's block like. | 39 | // when resolving whether it's block like. |
| 40 | var realName = name || '', | 40 | var realName = name || '', |
| 41 | prefixed = realName.match( /^cke:(.*)/ ); | 41 | prefixed = realName.match( /^cke:(.*)/ ); |
| @@ -543,8 +543,8 @@ CKEDITOR.htmlParser.cssStyle = function() { | |||
| 543 | 543 | ||
| 544 | if ( !ctx.nonEditable && this.attributes.contenteditable == 'false' ) | 544 | if ( !ctx.nonEditable && this.attributes.contenteditable == 'false' ) |
| 545 | changes.push( 'nonEditable', true ); | 545 | changes.push( 'nonEditable', true ); |
| 546 | // A context to be given nestedEditable must be nonEditable first (by inheritance) (#11372, #11698). | 546 | // A context to be given nestedEditable must be nonEditable first (by inheritance) (http://dev.ckeditor.com/ticket/11372, http://dev.ckeditor.com/ticket/11698). |
| 547 | // Special case: #11504 - filter starts on <body contenteditable=true>, | 547 | // Special case: http://dev.ckeditor.com/ticket/11504 - filter starts on <body contenteditable=true>, |
| 548 | // so ctx.nonEditable has not been yet set to true. | 548 | // so ctx.nonEditable has not been yet set to true. |
| 549 | else if ( ctx.nonEditable && !ctx.nestedEditable && this.attributes.contenteditable == 'true' ) | 549 | else if ( ctx.nonEditable && !ctx.nestedEditable && this.attributes.contenteditable == 'true' ) |
| 550 | changes.push( 'nestedEditable', true ); | 550 | changes.push( 'nestedEditable', true ); |