Ticket #2763: 2763_5.patch

_source/core/command.js

@@ -9 +9 @@
 
         this.exec = function()
         {
-                commandDefinition.exec.call( this, editor );
+                if ( this.state == CKEDITOR.TRISTATE_DISABLED )
+                        return false;
+
+                return ( commandDefinition.exec.call( this, editor ) !== false );
         };
 
         CKEDITOR.tools.extend( this, commandDefinition );

_source/core/commanddefinition.js

@@ -24 +24 @@
  * @function
  * @param {CKEDITOR.editor} editor The editor within which run the command.
  * @param {Object} [data] Additional data to be used to execute the command.
+ * @returns {Boolean} Whether the command has been successfully executed.
+ *              Defaults to "true", if nothing is returned.
  * @example
  * editorInstance.addCommand( 'sample',
  * {
@@ -33 +35 @@
  *     }
  * });
  */
+
+/**
+ * Whether the command need to be hooked into the redo/undo system.
+ * @name  CKEDITOR.commandDefinition.canUndo
+ * @type {Boolean} If not defined or 'true' both hook into undo system, set it
+ *              to 'false' explicitly  keep it out.
+ * @field
+ * @example
+ * editorInstance.addCommand( 'alertName',
+ * {
+ *     exec : function( editor )
+ *     {
+ *         alert( editor.name );
+ *     },
+ *     canUndo : false    // No support for undo/redo
+ * });
+ */

_source/core/config.js

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

_source/core/editor.js

@@ -346 +346 @@
                  */
                 addCommand : function( commandName, commandDefinition )
                 {
-                        this._.commands[ commandName ] = new CKEDITOR.command( this, commandDefinition );
+                        return this._.commands[ commandName ] = new CKEDITOR.command( this, commandDefinition );
                 },
 
                 addCss : function( css )
@@ -386 +386 @@
                 execCommand : function( commandName, data )
                 {
                         var command = this.getCommand( commandName );
+
+                        var eventData =
+                        {
+                                name: commandName,
+                                commandData: data,
+                                command: command
+                        };
+
                         if ( command && command.state != CKEDITOR.TRISTATE_DISABLED )
-                                return command.exec( this, data );
+                        {
+                                if ( this.fire( 'beforeCommandExec', eventData ) !== false )
+                                {
+                                        eventData.returnValue = command.exec( this, eventData.commandData );
 
+                                        if ( this.fire( 'afterCommandExec', eventData ) !== false )
+                                                return eventData.returnValue;
+                                }
+                        }
+
                         // throw 'Unknown command name "' + commandName + '"';
                         return false;
                 },
@@ -454 +470 @@
                         return data;
                 },
 
+                loadSnapshot : function( snapshot )
+                {
+                        this.fire( 'loadSnapshot', snapshot );
+                },
+
                 /**
                  * Sets the editor data. The data must be provided in raw format.
                  * @param {String} data HTML code to replace the curent content in the editor.

_source/core/tools.js

@@ -15 +15 @@
  */
 CKEDITOR.tools =
 {
+        arrayCompare : function( arrayA, arrayB )
+        {
+                if ( !arrayA && !arrayB )
+                        return true;
+
+                if ( !arrayA || !arrayB || arrayA.length != arrayB.length )
+                        return false;
+
+                for ( var i = 0 ; i < arrayA.length ; i++ )
+                {
+                        if ( arrayA[ i ] != arrayB[ i ] )
+                                return false;
+                }
+
+                return true;
+        },
+
         /**
          * Copy the properties from one object to another. By default, properties
          * already present in the target object <strong>are not</strong> overwritten.

_source/lang/en.js

@@ -43 +43 @@
         horizontalrule  : 'Insert Horizontal Line',
         pagebreak               : 'Insert Page Break',
         unlink                  : 'Unlink',
+        undo                    : 'Undo',
+        redo                    : 'Redo',
 
         // Common messages and labels.
         common :

_source/plugins/editingblock/plugin.js

@@ -70 +70 @@
                                         if ( editor.mode )
                                                 event.data = getMode( editor ).getSnapshotData();
                                 });
+
+                        editor.on( 'loadSnapshot', function( event )
+                                {
+                                        if ( editor.mode )
+                                                getMode( editor ).loadSnapshotData( event.data );
+                                });
                 }
         });
 

_source/plugins/selection/plugin.js

@@ -633 +633 @@
                         return retval;
                 },
 
+                createBookmarks2 : function()
+                {
+                        var bookmarks = [],
+                                ranges = this.getRanges();
+
+                        for ( var i = 0 ; i < ranges.length ; i++ )
+                                bookmarks.push( ranges[i].createBookmark2() );
+                        
+                        return bookmarks;
+                },
+
                 selectBookmarks : function( bookmarks )
                 {
                         var ranges = [];

_source/plugins/toolbar/plugin.js

@@ -212 +212 @@
                 'NumberedList', 'BulletedList', '-',
                 'Outdent', 'Indent', '-',
                 'Subscript', 'Superscript', '-',
+                'Undo', 'Redo', '-',
                 'SelectAll', 'RemoveFormat', '-',
                 'Link', 'Unlink', 'Anchor', '-',
                 'Table', 'Smiley', 'HorizontalRule', 'SpecialChar', 'PageBreak'

_source/skins/default/toolbar.css

@@ -310 +310 @@
 {
         background-position: 0 -880px;
 }
-
+.cke_skin_default a.cke_button_undo .cke_icon
+{
+        background-position: 0 -208px;
+}
+.cke_skin_default a.cke_button_redo .cke_icon
+{
+        background-position: 0 -224px;
+}
 .cke_skin_default a.cke_button_numberedlist .cke_icon
 {
         background-position: 0 -400px;