Ticket #2882: 2882.patch

_source/core/config.js

@@ -146 +146 @@
          * @example
          * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
          */
-        plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,removeformat,smiley,sourcearea,specialchar,tab,toolbar,wysiwygarea',
+        plugins : 'basicstyles,button,elementspath,horizontalrule,htmldataprocessor,keystrokes,newpage,pagebreak,removeformat,save,smiley,sourcearea,specialchar,tab,toolbar,wysiwygarea',
 
         /**
          * The theme to be used to build the UI.

_source/core/editor.js

@@ -231 +231 @@
                                 form.on( 'submit', function()
                                         {
                                                 editor.updateElement();
+                                                editor.fire( 'submit' );
                                         });
 
-                                // If we have a submit function, override it also, because it doesn't fire the "submit" event.
-                                if ( form.submit && form.submit.call )
+                                if ( form.$.onsubmit && form.$.onsubmit.call )
                                 {
-                                        CKEDITOR.tools.override( form.submit, function( originalSubmit )
+                                         form.$.onsubmit = CKEDITOR.tools.override( form.$.onsubmit, function( originalSubmit )
                                                 {
                                                         return function()
                                                                 {
+                                                                        // Update element before onsubmit.
                                                                         editor.updateElement();
-                                                                        originalSubmit.apply( this, arguments );
+                                                                        return originalSubmit.apply( this, arguments );
                                                                 };
                                                 });
                                 }
+
+                                // If we have a submit function, override it also, because it doesn't fire the "submit" event.
+                                if ( form.$.submit && ( form.$.submit.apply || ( CKEDITOR.env.ie && typeof( form.$.submit ) == 'object' ) ) )   //IE bug: In IE it is an "object".
+                                {
+                                        if ( form.getCustomData( '_cke_submit' ) != 'true' )
+                                        {
+                                                form.$.submit = CKEDITOR.tools.override( form.$.submit, function( originalSubmit )
+                                                        {
+                                                                return function()
+                                                                        {
+                                                                                form.fire( 'submit' );
+                                                                                if ( originalSubmit.apply )
+                                                                                        return originalSubmit.apply( this );
+                                                                                else
+                                                                                        return originalSubmit();
+                                                                        };
+                                                        });
+                                                form.setCustomData( '_cke_submit', 'true' );
+                                        }
+                                }
                         }
                 }
         };

_source/lang/en.js

@@ -30 +30 @@
         // Toolbar buttons without dialogs.
         source                  : 'Source',
         newPage                 : 'New Page',
+        save                    : 'Save',
         print                   : 'Print',
         underline               : 'Underline',
         bold                    : 'Bold',

_source/plugins/save/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileSave plugin.
+ */
+
+(function()
+{
+        var saveCmd =
+        {
+                exec : function( editor )
+                {
+                        var oForm = editor.element.$.form;
+                        if ( oForm )
+                        {
+                                if ( typeof( oForm.onsubmit ) == 'function' )
+                                {
+                                        var bRet = oForm.onsubmit();
+                                        if ( bRet != null && bRet === false )
+                                                return;
+                                }
+
+                                // Submit the form.
+                                // If there's a button named "submit" then the form.submit() function is masked and
+                                // can't be called in Mozilla, so we call the click() method of that button.
+                                if ( typeof( oForm.submit ) == 'function' )
+                                        oForm.submit();
+                                else if ( CKEDITOR.env.ie && typeof( oForm.submit ) == 'object' )       //IE bug: In IE it is an "object".
+                                {
+                                        try
+                                        {
+                                                oForm.submit();
+                                        }
+                                        catch( e ) {}
+                                }
+                                else
+                                        oForm.submit.click();
+                        }
+                }
+        };
+
+        var pluginName = 'save';
+
+        // Register a plugin named "save".
+        CKEDITOR.plugins.add( pluginName,
+        {
+                init : function( editor, pluginPath )
+                {
+                        editor.addCommand( pluginName, saveCmd );
+                        editor.ui.addButton( 'Save',
+                                {
+                                        label : editor.lang.save,
+                                        command : pluginName
+                                });
+                }
+        });
+})();

_source/plugins/toolbar/plugin.js

@@ -207 +207 @@
 [
         [
                 'Source', '-',
-                'NewPage', '-',
+                'NewPage', 'Save', '-',
                 'Bold', 'Italic', 'Underline', 'Strike', '-',
                 'Subscript', 'Superscript', '-',
                 'SelectAll', 'RemoveFormat', '-',

_source/skins/default/toolbar.css

@@ -151 +151 @@
         background-position: 0 -48px;
 }
 
+.cke_skin_default a.cke_button_save .cke_icon
+{
+        background-position: 0 -32px;
+}
+
 .cke_skin_default a.cke_button_find .cke_icon
 {
         background-position: 0 -240px;