Changeset 7162

Timestamp:

08/02/11 06:24:19 (23 months ago)

Author:

garry.yao

Message:

More friendly pagebreak on clipboard.

Location:

CKEditor/branches/features/v4-paste/_source/plugins

Files:

• htmldataprocessor/plugin.js (modified) (1 diff)
• pagebreak/plugin.js (modified) (3 diffs)
• wysiwygarea/plugin.js (modified) (1 diff)

CKEditor/branches/features/v4-paste/_source/plugins/htmldataprocessor/plugin.js

@@ -67 +67 @@
                 return function( node )
                 {
+                        if ( node.attributes.contenteditable == 'false' )
+                                return;
+
                         trimFillers( node, !isOutput );
 

CKEditor/branches/features/v4-paste/_source/plugins/pagebreak/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -64 +64 @@
                         htmlFilter.addRules(
                         {
-                                attributes : {
-                                        'class' : function( value, element )
+                                elements :
+                                {
+                                        'div' : function( element )
                                         {
-                                                var className =  value.replace( 'cke_pagebreak', '' );
-                                                if ( className != value )
+                                                var className =  element.attributes[ 'class' ];
+                                                if ( className && className.indexOf( 'cke_pagebreak' ) != -1 )
                                                 {
-                                                        var span = CKEDITOR.htmlParser.fragment.fromHtml( '<span style="display: none;">&nbsp;</span>' );
-                                                        element.children.length = 0;
-                                                        element.add( span );
                                                         var attrs = element.attributes;
+                                                        delete attrs[ 'class' ];
                                                         delete attrs[ 'aria-label' ];
                                                         delete attrs.contenteditable;
                                                         delete attrs.title;
+                                                        element.children.length = 0;
                                                 }
-                                                return className;
                                         }
                                 }
-                        }, 5 );
+                        }, 20 );
                 }
 
@@ -97 +96 @@
                                                                 childStyle = child && ( child.name == 'span' ) && child.attributes.style;
 
-                                                        if ( childStyle && ( /page-break-after\s*:\s*always/i ).test( style ) && ( /display\s*:\s*none/i ).test( childStyle ) )
+                                                        if ( /page-break-after\s*:\s*always/i.test( style ) )
                                                         {
-                                                                attributes.contenteditable = "false";
-                                                                attributes[ 'class' ] = "cke_pagebreak";
-                                                                attributes[ 'data-cke-display-name' ] = "pagebreak";
-                                                                attributes[ 'aria-label' ] = label;
-                                                                attributes[ 'title' ] = label;
-
-                                                                element.children.length = 0;
+                                                                if ( !element.children.length
+                                                                                // Back-compat.
+                                                                                || childStyle && /display\s*:\s*none/i .test( childStyle ) )
+                                                                {
+                                                                        attributes.contenteditable = "false";
+                                                                        attributes[ 'class' ] = "cke_pagebreak";
+                                                                        attributes[ 'data-cke-display-name' ] = "pagebreak";
+                                                                        attributes[ 'aria-label' ] = label;
+                                                                        attributes[ 'title' ] = label;
+                                                                        element.children.length = 0;
+                                                                }
                                                         }
                                                 }
                                         }
-                                });
+                                }, 5 );
                 }
         },

CKEditor/branches/features/v4-paste/_source/plugins/wysiwygarea/plugin.js

@@ -414 +414 @@
                         // 2. It doesn't end with one inner block; (#7467)
                         // 3. It doesn't have bogus br yet.
+                        // 4. It's an editable block.
                         if ( pathBlock
                                         && pathBlock.isBlockBoundary()
+                                        && !pathBlock.isReadOnly()
                                         && !( lastNode && lastNode.type == CKEDITOR.NODE_ELEMENT && lastNode.isBlockBoundary() )
                                         && !pathBlock.is( 'pre' )