Ticket #117: isdirty.patch

editor/_source/internals/fck.js

@@ -47 +47 @@
 
         IsDirty : function()
         {
-                return ( this.StartupValue != this.EditorDocument.body.innerHTML ) ;
+                if ( this.EditMode == FCK_EDITMODE_SOURCE )
+                        return ( this.StartupValue != this.EditingArea.Textarea.value ) ;
+                else
+                        return ( this.StartupValue != this.EditorDocument.body.innerHTML ) ;
         },
 
         ResetIsDirty : function()
         {
-                if ( this.EditorDocument.body )
+                if ( this.EditMode == FCK_EDITMODE_SOURCE )
+                        this.StartupValue = this.EditingArea.Textarea.value ;
+                else if ( this.EditorDocument.body )
                         this.StartupValue = this.EditorDocument.body.innerHTML ;
         },
 
@@ -85 +90 @@
                 this.EditingArea.FFSpellChecker = false ;
 
                 // Set the editor's startup contents
-                this.SetHTML( this.GetLinkedFieldValue() ) ;
+                this.SetHTML( this.GetLinkedFieldValue(), true ) ;
         },
 
         Focus : function()
@@ -299 +304 @@
                 return html ;
         },
 
-        SetHTML : function( html )
+        SetHTML : function( html, resetIsDirty )
         {
                 this.EditingArea.Mode = FCK.EditMode ;
 
@@ -319 +324 @@
                                 html = html.replace( FCKRegexLib.EmOpener, '<i$1' ) ;
                                 html = html.replace( FCKRegexLib.EmCloser, '<\/i>' ) ;
                         }
+                        
+                        this._ForceResetIsDirty = ( resetIsDirty === true ) ;
 
                         var sHtml = '' ;
 
@@ -415 +422 @@
 
                         // Removes the enter key handler.
                         FCK.EnterKeyHandler = null ;
+                        
+                        if ( resetIsDirty )
+                                this.ResetIsDirty() ;
 
                         // Listen for keystroke events.
                         FCK.KeystrokeHandler.AttachToElement( this.EditingArea.Textarea ) ;
@@ -529 +539 @@
         SwitchEditMode : function( noUndo )
         {
                 var bIsWysiwyg = ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) ;
+
+                // Save the current IsDirty state, so we may restore it after the switch.
+                var bIsDirty = FCK.IsDirty() ;
+
                 var sHtml ;
 
                 // Update the HTML in the view output to show.
@@ -547 +561 @@
 
                 FCK.EditMode = bIsWysiwyg ? FCK_EDITMODE_SOURCE : FCK_EDITMODE_WYSIWYG ;
 
-                FCK.SetHTML( sHtml ) ;
-
+                FCK.SetHTML( sHtml, !bIsDirty ) ;
+                
                 // Set the Focus.
                 FCK.Focus() ;
 
@@ -622 +636 @@
 
         // Listen for keystroke events.
         FCK.KeystrokeHandler.AttachToElement( FCK.EditorDocument ) ;
+        
+        if ( FCK._ForceResetIsDirty )
+                FCK.ResetIsDirty() ;
 
         FCK.OnAfterSetHTML() ;
 
@@ -629 +646 @@
         if ( FCK.Status != FCK_STATUS_NOTLOADED )
                 return ;
 
-        // Save the startup value for the "IsDirty()" check.
-        FCK.ResetIsDirty() ;
-
         FCK.SetStatus( FCK_STATUS_ACTIVE ) ;
 }