Skip to content
Permalink
Browse files

Merge branch 't/12501'

  • Loading branch information...
Reinmar committed Sep 30, 2014
2 parents 77bbc7e + 0502d13 commit 357402907a762340dcea2286efa548c9916e9823
Showing with 8 additions and 4 deletions.
  1. +4 −0 CHANGES.md
  2. +2 −2 core/filter.js
  3. +2 −2 tests/core/filter/api.js
@@ -3,6 +3,10 @@ CKEditor 4 Changelog

## CKEditor 4.4.6

New Features:

* [#12501](http://dev.ckeditor.com/ticket/12501): Allowed dashes in element names in the [string format of allowed content rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules-section-string-format).

Fixed Issues:

* [#12489](http://dev.ckeditor.com/ticket/12423) and [#12491](http://dev.ckeditor.com/ticket/12423): Fixed: Various issues related to restoring selection after making operations on filler char. See the [fixed cases](http://dev.ckeditor.com/ticket/12491#comment:4).
@@ -1369,8 +1369,8 @@
}
}

// < elements >< styles, attributes and classes >< separator >
var rulePattern = /^([a-z0-9*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,
// < elements >< styles, attributes and classes >< separator >
var rulePattern = /^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,
groupsPatterns = {
styles: /{([^}]+)}/,
attrs: /\[([^\]]+)\]/,
@@ -171,9 +171,9 @@
'test allowedContent array - string format': function() {
var filter = new CKEDITOR.filter( 'p' );

filter.allow( 'a b', 'rule1' );
filter.allow( 'a b-c d', 'rule1' );
assertRule( filter, 'rule1', {
elements: { a: true, b: true }
elements: { a: true, 'b-c': true, d: true }
} );

filter.allow( '*[attr1]', 'rule2' );

0 comments on commit 3574029

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