Changeset 13257

Timestamp:

04/01/08 15:07:18 (8 months ago)

Author:

liucougar

Message:

fixes #6372: remove trailing br in LI elements in FF
minor cleanup in RichText?

Location:

dijit/trunk/_editor

Files:

• plugins/EnterKeyHandling.js (modified) (3 diffs)
• RichText.js (modified) (1 diff)

dijit/trunk/_editor/plugins/EnterKeyHandling.js

@@ -55 +55 @@
                                 if(!dojo.withGlobal(this.editor.window, 'hasAncestorElement', dijit._editor.selection, ['LI'])){
                                         //circulate the undo detection code by calling RichText::execCommand directly
-                                        dijit._editor.RichText.prototype.execCommand.apply(this.editor, ['formatblock',this.blockNodeForEnter]);
+                                        dijit._editor.RichText.prototype.execCommand.call(this.editor, 'formatblock',this.blockNodeForEnter);
                                         //set the innerHTML of the new block node
                                         var block = dojo.withGlobal(this.editor.window, 'getAncestorElement', dijit._editor.selection, [this.blockNodeForEnter]);
@@ -78 +78 @@
                         }
                         this._checkListLater = false;
-                }else if(this._pressedEnterInBlock){
+                }
+                if(this._pressedEnterInBlock){
                         //the new created is the original current P, so we have previousSibling below
                         this.removeTrailingBr(this._pressedEnterInBlock.previousSibling);
@@ -135 +136 @@
 
                 if((this._checkListLater = (block.blockNode && block.blockNode.tagName == 'LI'))){
+                    if(dojo.isMoz){
+                                //press enter in middle of P may leave a trailing <br/>, let's remove it later
+                                this._pressedEnterInBlock = block.blockNode;
+                        }
                         return true;
                 }

dijit/trunk/_editor/RichText.js

@@ -1419 +1419 @@
         },
 
-        _srcInImgRegex  : /(?:(<img(?=\s).*?\ssrc=)("|')(.*?)\2)|(?:(<img\s.*?src=)([^"'][^ >]+))/gi ,
-        _hrefInARegex   : /(?:(<a(?=\s).*?\shref=)("|')(.*?)\2)|(?:(<a\s.*?href=)([^"'][^ >]+))/gi ,
-
         _preFixUrlAttributes: function(/* String */ html){
-                return html.replace(this._hrefInARegex, '$1$4$2$3$5$2 _djrealurl=$2$3$5$2')
-                        .replace(this._srcInImgRegex, '$1$4$2$3$5$2 _djrealurl=$2$3$5$2'); // String
+                return html.replace(/(?:(<img(?=\s).*?\ssrc=)("|')(.*?)\2)|(?:(<img\s.*?src=)([^"'][^ >]+))/gi, 
+                        '$1$4$2$3$5$2 _djrealurl=$2$3$5$2')
+                        .replace(/(?:(<a(?=\s).*?\shref=)("|')(.*?)\2)|(?:(<a\s.*?href=)([^"'][^ >]+))/gi,
+                            '$1$4$2$3$5$2 _djrealurl=$2$3$5$2'); // String
         }
 });