Index: /CKEditor/tests/dt/core/htmlparser/filter.html
===================================================================
--- /CKEditor/tests/dt/core/htmlparser/filter.html (revision 5477)
+++ /CKEditor/tests/dt/core/htmlparser/filter.html (revision 5477)
@@ -0,0 +1,94 @@
+
+
+
+ CKEDITOR.htmlParser.filter
+
+
+
+
+
+
Index: Editor/tests/tt/5617/1.html
===================================================================
--- /CKEditor/tests/tt/5617/1.html (revision 5476)
+++ (revision )
@@ -1,94 +1,0 @@
-
-
-
- Test Ticket #5617
-
-
-
-
-
-
Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 5476)
+++ /CKEditor/trunk/CHANGES.html (revision 5477)
@@ -82,4 +82,5 @@
#5586 : [Firefox] Maximize the second editor ruins fullscreen mode.
#5671 : SCAYT bookstrap script could be added multiple times unnecessarily.
+ #5617 : Html filter system does not allow two 'text' filter rules.
Updated the following language files:
- #5432 : Dutch;
Index: /CKEditor/trunk/_source/core/htmlparser/filter.js
===================================================================
--- /CKEditor/trunk/_source/core/htmlparser/filter.js (revision 5476)
+++ /CKEditor/trunk/_source/core/htmlparser/filter.js (revision 5477)
@@ -228,24 +228,50 @@
}
+ // Invoke filters sequentially on the array, break the iteration
+ // when it doesn't make sense to continue anymore.
function callItems( currentEntry )
{
- var isObject = ( typeof currentEntry == 'object' );
+ var isNode = currentEntry.type
+ || currentEntry instanceof CKEDITOR.htmlParser.fragment;
for ( var i = 0 ; i < this.length ; i++ )
{
+ // Backup the node info before filtering.
+ if ( isNode )
+ {
+ var orgType = currentEntry.type,
+ orgName = currentEntry.name;
+ }
+
var item = this[ i ],
ret = item.apply( window, arguments );
- if ( typeof ret != 'undefined' )
- {
- if ( ret === false )
- return false;
-
- if ( isObject && ret != currentEntry )
+ if ( ret === false )
+ return ret;
+
+ // We're filtering node (element/fragment).
+ if ( isNode )
+ {
+ // No further filtering if it's not anymore
+ // fitable for the subsequent filters.
+ if ( ret && ( ret.name != orgName
+ || ret.type != orgType ) )
+ {
return ret;
- }
- }
-
- return null;
+ }
+ }
+ // Filtering value (nodeName/textValue/attrValue).
+ else
+ {
+ // No further filtering if it's not
+ // any more values.
+ if ( typeof ret != 'string' )
+ return ret;
+ }
+
+ ret != undefined && ( currentEntry = ret );
+ }
+
+ return currentEntry;
}
})();