Index: /CKEditor/branches/prototype/_samples/replacebyclass.html =================================================================== --- /CKEditor/branches/prototype/_samples/replacebyclass.html (revision 3005) +++ /CKEditor/branches/prototype/_samples/replacebyclass.html (revision 3006) @@ -11,5 +11,5 @@
-
+

- +

+ CKEditor - Posted Data +

+ + + + + + + + + $value ) +{ + if ( get_magic_quotes_gpc() ) + $postedValue = htmlspecialchars( stripslashes( $value ) ) ; + else + $postedValue = htmlspecialchars( $value ) ; + +?> + + + + + +
Field NameValue
+ + + Index: /CKEditor/branches/prototype/_source/core/config.js =================================================================== --- /CKEditor/branches/prototype/_source/core/config.js (revision 3005) +++ /CKEditor/branches/prototype/_source/core/config.js (revision 3006) @@ -38,4 +38,6 @@ */ customConfig : CKEDITOR.getUrl( 'config.js' ), + + autoUpdateElement : true, /** Index: /CKEditor/branches/prototype/_source/core/editor.js =================================================================== --- /CKEditor/branches/prototype/_source/core/editor.js (revision 3005) +++ /CKEditor/branches/prototype/_source/core/editor.js (revision 3006) @@ -213,5 +213,39 @@ editorTheme.path = CKEDITOR.themes.getPath( theme ); editorTheme.build( editor ); + + if ( editor.config.autoUpdateElement ) + attachToForm( editor ); }); + }; + + var attachToForm = function( editor ) + { + var element = editor.element; + + // If are replacing a textarea, we must + if ( editor.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE && element.is( 'textarea' ) ) + { + var form = new CKEDITOR.dom.element( element.$.form ); + if ( form ) + { + form.on( 'submit', function() + { + editor.updateElement() + }); + + // If we have a submit function, override it also, because it doesn't fire the "submit" event. + if ( form.submit && form.submit.call ) + { + CKEDITOR.tools.override( form.submit, function( originalSubmit ) + { + return function() + { + editor.updateElement(); + originalSubmit.apply( this, arguments ); + }; + }); + } + } + } }; @@ -241,5 +275,5 @@ * alert( editor.element.getName() ); "textarea" */ - this.element = element && element; + this.element = element; /** @@ -401,4 +435,18 @@ }, + getSnapshot : function() + { + var data = this.fire( 'getSnapshot' ); + + if ( typeof data != 'string' ) + { + var element = this.element; + if ( element && this.elementMode == CKEDITOR.ELEMENT_MODE_REPLACE ) + data = element.is( 'textarea' ) ? element.getValue() : element.getHtml(); + } + + return data; + }, + /** * Sets the editor data. The data must be provided in raw format. @@ -441,4 +489,15 @@ { this.fire( 'insertElement', element ); + }, + + checkDirty : function() + { + return ( this.mayBeDirty && this._.previousValue !== this.getSnapshot() ); + }, + + resetDirty : function() + { + if ( this.mayBeDirty ) + this._.previousValue = this.getSnapshot(); }, Index: /CKEditor/branches/prototype/_source/plugins/editingblock/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/editingblock/plugin.js (revision 3005) +++ /CKEditor/branches/prototype/_source/plugins/editingblock/plugin.js (revision 3006) @@ -65,4 +65,10 @@ } }); + + editor.on( 'getSnapshot', function( event ) + { + if ( editor.mode ) + event.data = getMode( editor ).getSnapshotData(); + }); } }); @@ -100,5 +106,6 @@ { var data, - holderElement = this.getThemeSpace( 'contents' ); + holderElement = this.getThemeSpace( 'contents' ), + isDirty = this.checkDirty(); // Unload the previous mode. @@ -121,8 +128,14 @@ throw '[CKEDITOR.editor.setMode] Unknown mode "' + mode + '".'; + if ( !isDirty ) + { + this.on( 'mode', function() + { + this.resetDirty(); + this.removeListener( 'mode', arguments.callee ); + }); + } + modeEditor.load( holderElement, data || this.getData() ); - - this.mode = mode; - this.fire( 'mode' ); }; Index: /CKEditor/branches/prototype/_source/plugins/sourcearea/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/sourcearea/plugin.js (revision 3005) +++ /CKEditor/branches/prototype/_source/plugins/sourcearea/plugin.js (revision 3006) @@ -64,6 +64,12 @@ holderElement.append( textarea ); + // The editor data "may be dirty" after this point. + editor.mayBeDirty = true; + // Set the