Ticket #2763: 2763.2.patch

_source/plugins/editingblock/plugin.js

@@ -190 +190 @@
                 modeEditor.load( holderElement, data || this.getData() );
 
                 this.mode = mode;
-                this.fire( 'mode' );
+                this.fire( 'mode' , mode);
         };
 
         /**

_source/core/dom/range.js

@@ -424 +424 @@
                         return docFrag;
                 },
 
-                // This is an "intrusive" way to create a bookmark. It includes <span> tags
-                // in the range boundaries. The advantage of it is that it is possible to
-                // handle DOM mutations when moving back to the bookmark.
-                // Attention: the inclusion of nodes in the DOM is a design choice and
-                // should not be changed as there are other points in the code that may be
-                // using those nodes to perform operations. See GetBookmarkNode.
-                createBookmark : function()
+                /**
+                 * This is an "intrusive" way to create a bookmark. It includes <span>
+                 * tags in the range boundaries. The advantage of it is that it is
+                 * possible to handle DOM mutations when moving back to the bookmark.
+                 * Attention: the inclusion of nodes in the DOM is a design choice.
+                 * 
+                 * @param serializeable {Boolean} If set to true will record the bookmark with startNode/endNode IDs for serializing purpose.
+                 */
+                createBookmark : function(serializeable)
                 {
-                        var startNode, endNode;
+                        var startNode , endNode;
                         var clone;
 
                         startNode = this.document.createElement( 'span' );
-                        startNode.setAttribute( '_fck_bookmark', 1 );
-                        startNode.setStyle( 'display', 'none' );
+                        startNode.setAttribute( '_fck_bookmark' , 1 );
+                        startNode.setStyle( 'display' , 'none' );
 
                         // For IE, it must have something inside, otherwise it may be
                         // removed during DOM operations.
@@ -451 +453 @@
 
                                 clone = this.clone();
                                 clone.collapse();
-                                clone.insertNode( endNode );
+                                clone.insertNode( endNode ); // CONFUSE: This insert will not influence current selection.
                         }
 
                         clone = this.clone();
                         clone.collapse( true );
-                        clone.insertNode( startNode );
+                        clone.insertNode( startNode ); // CONFUSE: This insert will fade current selection out.
 
                         // Update the range position.
                         if ( endNode )
@@ -465 +467 @@
                                 this.setEndBefore( endNode );
                         }
                         else
-                                this.moveToPosition( startNode, CKEDITOR.POSITION_AFTER_END );
+                                this.moveToPosition( startNode , CKEDITOR.POSITION_AFTER_END );
 
+                        if ( serializeable )
+                        {
+                                startNode.setAttribute( 'id' , ( new Date() ).valueOf()
+                                                + Math.floor( Math.random() * 1000 ) + 'S' );
+                                if ( endNode )
+                                        endNode.setAttribute( 'id' , ( new Date() ).valueOf()
+                                                        + Math.floor( Math.random() * 1000 ) + 'E' );
+                        }
                         return {
-                                startNode : startNode,
-                                endNode : endNode
+                                startNode :serializeable ? startNode.getAttribute( 'id' )
+                                                : startNode,
+                                endNode :endNode ? ( serializeable ? endNode
+                                                .getAttribute( 'id' ) : endNode ) : null
                         };
                 },
-
+        
+        /**
+                 * Move the range boundaries to where the bookmarks indicated.
+                 * 
+                 * @see CKEDITOR.dom.range::createBookmark
+                 * @param bookmark
+                 *            {Object}
+                 */
                 moveToBookmark : function( bookmark )
                 {
+                        var st = bookmark.startNode , ed = bookmark.endNode;
+
                         // Set the range start at the bookmark start node position.
-                        this.setStartBefore( bookmark.startNode );
+                        this.setStartBefore( typeof st === 'string' ? ( st = this.document
+                                        .getById( st ) ) : st );
 
                         // Remove it, because it may interfere in the setEndBefore call.
-                        bookmark.startNode.remove();
+                        st.remove();
 
                         // Set the range end at the bookmark end node position, or simply
                         // collapse it if it is not available.
-                        var endNode = bookmark.endNode;
-                        if ( endNode )
+                        if ( ed )
                         {
-                                this.setEndBefore( endNode );
-                                endNode.remove();
+                                this.setEndBefore( typeof ed === 'string' ? 
+                                                ( ed = this.document.getById( ed ) )
+                                                : ed );
+                                ed.remove();
                         }
                         else
                                 this.collapse( true );

_source/core/editor.js

@@ -361 +361 @@
                 execCommand : function( commandName, data )
                 {
                         var command = this.getCommand( commandName );
+                        var cp =
+                        /**
+                         * Name-command pair to trace commands behavious
+                         * 
+                         * @type FCKEDITOR.command.Pair
+                         */
+                        {
+                                name :commandName,
+                                command :command
+                        };
                         if ( command && command.state != CKEDITOR.TRISTATE_DISABLED )
-                                return command.exec( this, data );
-
+                        {
+                                this.fire( 'beforeCommandExec' , cp );
+                                command.exec( this , data );
+                                this.fire( 'afterCommandExec' , cp );
+                        }
+        
                         // throw 'Unknown command name "' + commandName + '"';
                         return false;
-                },
+        },
                 
                 /**
-                 * Gets one of the registered commands. Note that, after registering a
-                 * command definition with addCommand, it is transformed internally
-                 * into an instance of {@link CKEDITOR.command}, which will be then
-                 * returned by this function.
-                 * @param {String} commandName The name of the command to be returned.
-                 * This is the same used to register the command with addCommand.
-                 * @returns {CKEDITOR.command} The command object identified by the
-                 * provided name.
+                 * Gets one of the registered commands. Note that, after registering a command definition with addCommand, it is
+                 * transformed internally into an instance of {@link CKEDITOR.command}, which will be then returned by this
+                 * function.
+                 * 
+                 * @param {String}
+                 *            commandName The name of the command to be returned. This is the same used to register the command
+                 *            with addCommand.
+                 * @returns {CKEDITOR.command} The command object identified by the provided name.
                  */
                 getCommand : function( commandName )
                 {

_source/plugins/selection/plugin.js

@@ -630 +630 @@
                                                 sel.addRange( nativeRange );
                                         }
                                 },
-
-                createBookmarks : function()
+        /**
+                 * This method is a delegate to ceate bookmark for every ranges in this selection.
+                 * 
+                 * @see CKEDITOR.dom.range::createBookmark
+                 */
+                createBookmarks : function ( serializable )
                 {
-                        var retval = [],
-                                ranges = this.getRanges();
+                        var retval = [] , ranges = this.getRanges();
                         for ( var i = 0 ; i < ranges.length ; i++ )
-                                retval.push( ranges[i].createBookmark() );
+                                retval.push( ranges[ i ].createBookmark( serializable ) );
                         return retval;
                 },
 

_source/core/commanddefinition.js

@@ -34 +34 @@
  * @example
  */
 
- /**
+/**
  * Executes the command.
  * @name CKEDITOR.commandDefinition.prototype.exec
  * @function
@@ -49 +49 @@
  *     }
  * });
  */
+
+/**
+ * Whether the command need to be hooked into the redo/undo system.
+ * @name  CKEDITOR.commandDefinition.supportUndoRedo
+ * @type {Boolean} If not defined or 'true' both hook into undo system, set it to 'false' explicitly  keep it out.  
+ * @field
+ * @example
+ *  editorInstance.addCommand( 'sample',
+ * {
+ *     CKEDITOR.commandDefinition.supportUndoRedo : false    //declare this command does not support undo/redo  
+ * });
+ */
+

_source/tests/core/dom/range.html

@@ -1507 +1507 @@
                         assert.areSame( 3, range.endOffset, 'range.endOffset' );
                         assert.isFalse( range.collapsed, 'range.collapsed' );
                 },
+                
+                
+        //Test serializable bookmark create and apply
+                                test_bookmark_single_1 : function ( )
+                                {
 
-                /////////////
+                                        var range = new CKEDITOR.dom.range( doc );
+                                        range.setStartBefore( doc.getById( '_Span' ) );
+                                        range.setEndAfter( doc.getById( '_P' ) );
+                                        bm = range.createBookmark( true );
+                                        range.setStartBefore( doc.getById( '_P2' ) );
+                                        range.setEndAfter( doc.getById( '_P2' ) );
+                                        range.moveToBookmark( bm );
 
-                setUp : function()
-                {
-                         document.getElementById( 'playground' ).innerHTML = html1;
-                         document.getElementById( 'playground2' ).innerHTML = html2;
-                },
+                                        assert.areSame( document.getElementById( '_P' ) ,
+                                                        range.startContainer.$ , 'range.startContainer' );
+                                        assert  .areSame( 1 , range.startOffset,'range.startOffset' );
+                                        assert.areSame( document.getElementById( 'playground2' ) ,
+                                                        range.endContainer.$ , 'range.endContainer' );
+                                        assert.areSame( 4 , range.endOffset , 'range.endOffset' );
+                                        assert.isNull( document.getElementById( bm.startNode ) ,
+                                                        'bookmark.startNode' );
+                                        assert.isNull( document.getElementById( bm.endNode ) ,
+                                                        'bookmark.endNode' );
 
-                name : document.title
-        };
-})() );
+                                },
 
-//window.onload = function()
-//{
-//      // Local references.
-//      var assert                      = CKEDITOR.test.assert;
-//      var getInnerHtml        = CKEDITOR.test.getInnerHtml;
+                                /////////////
 
-//      var doc = new CKEDITOR.dom.document( document );
+                                setUp : function ( )
+                                {
+                                        document.getElementById( 'playground' ).innerHTML = html1;
+                                        document.getElementById( 'playground2' ).innerHTML = html2;
+                                },
 
-//                      doc.getById( '_EnlargeP' ).setHtml( 'this <i>is some </i>sample text' );
+                                name :document.title
+                        };
+                } )() );
 
-//                      var range = new CKEDITOR.dom.range( doc );
-//                      range.setStart( doc.getById( '_EnlargeP' ), 0 );
-//                      range.setEnd( doc.getById( '_EnlargeP' ).getChild( 1 ), 0 );
+        //window.onload = function()
+        //{
+        //      // Local references.
+        //      var assert                      = CKEDITOR.test.assert;
+        //      var getInnerHtml        = CKEDITOR.test.getInnerHtml;
 
-//                      range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
-//}
+        //      var doc = new CKEDITOR.dom.document( document );
 
+        //                      doc.getById( '_EnlargeP' ).setHtml( 'this <i>is some </i>sample text' );
+
+        //                      var range = new CKEDITOR.dom.range( doc );
+        //                      range.setStart( doc.getById( '_EnlargeP' ), 0 );
+        //                      range.setEnd( doc.getById( '_EnlargeP' ).getChild( 1 ), 0 );
+
+        //                      range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
+        //}
+
         //]]>
-        </script>
+</script>
 </head>
 <body>
         <div id="playground" style="visibility:hidden"><h1 id="_H1">FCKW3CRange Test</h1><p id="_Para">This is <b id="_B">some</b> text.</p><p>Another paragraph.</p></div>

_source/core/config.js

@@ -1 @@
-/*
+/*
  * CKEditor - The text editor for Internet - http://ckeditor.com
  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
@@ -161 +161 @@
          * @example
          * config.plugins = 'elementspath,toolbar,wysiwygarea';
          */
-        plugins : 'basicstyles,button,dialog,elementspath,horizontalrule,htmldataprocessor,keystrokes,removeformat,smiley,link,sourcearea,tab,toolbar,wysiwygarea,forms,image,find,table,specialchar,flash,print,pagebreak,newpage',
+        plugins : 'basicstyles,button,dialog,elementspath,horizontalrule,htmldataprocessor,keystrokes,removeformat,smiley,link,sourcearea,tab,toolbar,wysiwygarea,forms,image,find,table,specialchar,flash,print,pagebreak,undoredo,newpage',
 
         /**
          * The theme to be used to build the UI.
@@ -350 +350 @@
                         descriptions : [ ':)', ':(', ';)', ':D', ':/', ':P', 
                         '', '', '', '', '', '',
                         '', ';(', '', '', '', '',
-                        ':kiss', '', ],
+                        ':kiss', '' ],
 
                         //TODO: update path
                         path : CKEDITOR.basePath +  '_source/plugins/smiley/images/',