Skip to content
Permalink
Browse files

Merge branch 't/11129' into major

  • Loading branch information...
Reinmar committed Nov 12, 2013
2 parents f2fb41a + cd42eb0 commit 9c5820aa22a672035ec3c5e22274aa50e2c5b114
Showing with 5 additions and 4 deletions.
  1. +1 −0 CHANGES.md
  2. +4 −4 plugins/pagebreak/plugin.js
@@ -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

@@ -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', {
}
}
}
});
} );
}
}
});

0 comments on commit 9c5820a

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