Skip to content
Permalink
Browse files

Merge branch 't/9301c'

  • Loading branch information...
Reinmar committed Oct 16, 2012
2 parents 4cd29d2 + cd05ac8 commit ed293e1509470848fd5cb16d6a69c96135a421c0
Showing with 228 additions and 168 deletions.
  1. +3 −1 core/dom/elementpath.js
  2. +209 −164 core/dtd.js
  3. +16 −3 plugins/wysiwygarea/plugin.js
@@ -179,7 +179,9 @@ CKEDITOR.dom.elementPath.prototype = {

// Check for block context.
if ( tag in CKEDITOR.dtd.$block ) {
holder = ( this.root.equals( this.block ) && this.block ) || this.blockLimit;
// Indeterminate elements which are not subjected to be splitted or surrounded must be checked first.
var inter = this.contains( CKEDITOR.dtd.$intermediate );
holder = inter || ( this.root.equals( this.block ) && this.block ) || this.blockLimit;
return !!holder.getDtd()[ tag ];
}

Oops, something went wrong.

0 comments on commit ed293e1

Please sign in to comment.
You can’t perform that action at this time.