Ticket #6091: 6091_2.patch

_source/plugins/pagebreak/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -78 +78 @@
         requires : [ 'fakeobjects' ]
 });
 
+// keep items on which page break cannot be done
+var disallowedPagebrakeItems = { li:1 };
+
 CKEDITOR.plugins.pagebreakCmd =
 {
         exec : function( editor )
@@ -102 +105 @@
                         if ( i < ranges.length -1 )
                                 breakObject = breakObject.clone( true );
 
-                        range.splitBlock( 'p' );
+            var boundaryBlocks = range.getBoundaryBlocks();
+
+            // split block on allowed items
+            if( !disallowedPagebrakeItems[ boundaryBlocks.startBlock.getName() ] && !disallowedPagebrakeItems[ boundaryBlocks.endBlock.getName() ] )
+                range.splitBlock( 'p' );
+
                         range.insertNode( breakObject );
                         if ( i == ranges.length - 1 )
                         {
@@ -118 +126 @@
 
                 editor.fire( 'saveSnapshot' );
         }
-};
+};
+ No newline at end of file

_source/core/dom/range.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -644 +644 @@
                         return { startNode : startNode, endNode : endNode };
                 },
 
+                getBoundaryBlocks : function()
+                {
+                        var startPath   = new CKEDITOR.dom.elementPath( this.startContainer ),
+                                endPath         = new CKEDITOR.dom.elementPath( this.endContainer );
+
+                        var startBlockLimit     = startPath.blockLimit,
+                                endBlockLimit   = endPath.blockLimit;
+
+                        return { startBlock : startPath.block, endBlock : endPath.block };
+
+                },
+
                 /**
                  * Find the node which fully contains the range.
                  * @param includeSelf