Merge branch 't/11129' into major

ckeditor · Nov 12, 2013 · 9c5820a · 9c5820a
2 parents f2fb41a + cd42eb0
commit 9c5820a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -52,6 +52,7 @@ Fixed Issues:
 * [#11074](http://dev.ckeditor.com/ticket/11074): Temporarily disabled inline widgets drag and drop, because of seriously buggy native `range#moveToPoint` method.
 * [#11098](http://dev.ckeditor.com/ticket/11098): Fixed wrong selection position after undoing widget drag and drop.
 * [#11110](http://dev.ckeditor.com/ticket/11110): Fixed iframe and flash object being incorrectly pasted in certain conditions.
+* [#11129](http://dev.ckeditor.com/ticket/11129): Pagebreak is lost when loading data.
 
 ## CKEditor 4.3 Beta
 

diff --git a/plugins/pagebreak/plugin.js b/plugins/pagebreak/plugin.js
@@ -64,7 +64,7 @@ CKEDITOR.plugins.add( 'pagebreak', {
 			htmlFilter = dataProcessor && dataProcessor.htmlFilter;
 
 		if ( htmlFilter ) {
-			htmlFilter.addRules({
+			htmlFilter.addRules( {
 				attributes: {
 					'class': function( value, element ) {
 						var className = value.replace( 'cke_pagebreak', '' );
@@ -80,11 +80,11 @@ CKEDITOR.plugins.add( 'pagebreak', {
 						return className;
 					}
 				}
-			}, 5 );
+			}, { applyToAll: true, priority: 5 } );
 		}
 
 		if ( dataFilter ) {
-			dataFilter.addRules({
+			dataFilter.addRules( {
 				elements: {
 					div: function( element ) {
 						var attributes = element.attributes,
@@ -103,7 +103,7 @@ CKEDITOR.plugins.add( 'pagebreak', {
 						}
 					}
 				}
-			});
+			} );
 		}
 	}
 });