Changeset 1081

Timestamp:

2007-11-15 06:19:37 (2 years ago)

Author:

martinkou

Message:

Fix for #102 : Fixed excessive empty paragraphs generated in IE the paste as plain text feature in P mode.

Location:

FCKeditor/trunk/editor/_source/internals

Files:

• fck_ie.js (modified) (1 diff)
• fckundo.js (modified) (2 diffs)

FCKeditor/trunk/editor/_source/internals/fck_ie.js

@@ -284 +284 @@
                 sText = FCKTools.ProcessLineBreaks( window, FCKConfig, sText ) ;
 
+                var closeTagIndex = sText.search( '</p>' ) ;
+                var startTagIndex = sText.search( '<p>' ) ;
+
+                if ( ( closeTagIndex != -1 && startTagIndex != -1 && closeTagIndex < startTagIndex ) 
+                                || ( closeTagIndex != -1 && startTagIndex == -1 ) )
+                {
+                        var prefix = sText.substr( 0, closeTagIndex ) ;
+                        sText = sText.substr( closeTagIndex + 4 ) ;
+                        this.InsertHtml( prefix ) ;
+                }
+
                 // Insert the resulting data in the editor.
+                FCKUndo.SaveLocked = true ;
                 this.InsertHtml( sText ) ;
+                FCKUndo.SaveLocked = false ;
         }
 }

FCKeditor/trunk/editor/_source/internals/fckundo.js

@@ -28 +28 @@
 FCKUndo.MaxTypes = 25 ;
 FCKUndo.Typing = false ;
+FCKUndo.SaveLocked = false ;
 
 FCKUndo._GetBookmark = function()
@@ -115 +116 @@
 FCKUndo.SaveUndoStep = function()
 {
-        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+        if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || this.SaveLocked )
                 return ;