Ticket #2882: 2882_2.patch

_source/core/config.js

@@ -151 +151 @@
          * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
          */
 
-        plugins : 'basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,newpage,pagebreak,pastefromword,pastetext,preview,print,removeformat,smiley,showblocks,sourcearea,stylescombo,table,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+        plugins : 'basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,newpage,pagebreak,pastefromword,pastetext,preview,print,removeformat,save,smiley,showblocks,sourcearea,stylescombo,table,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**
          * The theme to be used to build the UI.

_source/core/editor.js

@@ -249 +249 @@
                                                 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 )
+                                // Setup the submit function because it doesn't fire the
+                                // "submit" event.
+                                if ( !form.$.submit.nodeName )
                                 {
-                                        CKEDITOR.tools.override( form.submit, function( originalSubmit )
+                                        form.$.submit = CKEDITOR.tools.override( form.$.submit, function( originalSubmit )
                                                 {
                                                         return function()
                                                                 {
                                                                         editor.updateElement();
-                                                                        originalSubmit.apply( this, arguments );
+
+                                                                        // For IE, the DOM submit function is not a
+                                                                        // function, so we need thid check.
+                                                                        if ( originalSubmit.apply )
+                                                                                originalSubmit.apply( this, arguments );
+                                                                        else
+                                                                                originalSubmit();
                                                                 };
                                                 });
                                 }

_source/lang/en.js

@@ -30 +30 @@
         // Toolbar buttons without dialogs.
         source                  : 'Source',
         newPage                 : 'New Page',
+        save                    : 'Save',
         preview                 : 'Preview',
         cut                             : 'Cut',
         copy                    : 'Copy',

_source/plugins/toolbar/plugin.js

@@ -225 +225 @@
  */
 CKEDITOR.config.toolbar =
 [
-        ['Source','-','NewPage','Preview','-','Templates'],
+        ['Source','-','Save','NewPage','Preview','-','Templates'],
         ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker'],
         ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
         ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],

_source/skins/default/icons.css

@@ -279 +279 @@
 {
         background-position: 0 -160px;
 }
+
+.cke_skin_default a.cke_button_save .cke_icon
+{
+        background-position: 0 -32px;
+}