Skip to content
Permalink
Browse files

Merge branch 't/13680'

  • Loading branch information...
Reinmar committed Sep 7, 2015
2 parents 2e699f0 + 7d8dd6a commit cb9f37c6ab24dcb8c308454414100335fe300df2
Showing with 9 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +1 −1 core/dtd.js
  3. +7 −1 tests/core/htmlparser/htmlparser.js
@@ -14,6 +14,7 @@ Fixed Issues:
* [#13599](http://dev.ckeditor.com/ticket/13599): Fixed: Cross-editor D&D of inline widget ends up in error/artifacts.
* [#13640](http://dev.ckeditor.com/ticket/13640): [IE] Fixed: Dropping a widget outside body is not handled correctly.
* [#13533](http://dev.ckeditor.com/ticket/13533): Fixed: No progress during upload.
* [#13680](http://dev.ckeditor.com/ticket/13680): Fixed: The parser should allow `<h1-6>` to be a child of the `<summary>` element.

Other Changes:

@@ -194,7 +194,7 @@ CKEDITOR.dtd = ( function() {
strong: P,
style: T,
sub: P,
summary: P,
summary: X( { h1: 1, h2: 1, h3: 1, h4: 1, h5: 1, h6: 1 }, P ),
sup: P,
table: { caption: 1, colgroup: 1, thead: 1, tfoot: 1, tbody: 1, tr: 1 },
tbody: { tr: 1 },
@@ -310,7 +310,13 @@
parser.parse( html );
assert.areSame( expectedTags, tags.join( ',' ), 'tags - ' + msg );
}
},

// #13680
'test header elements in summary tag': function() {
assert.areSame( '<summary><h2>Summary</h2></summary>',
htmlParse( '<summary><h2>Summary</h2></summary>' ) );
}
} );

} )();
} )();

0 comments on commit cb9f37c

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