Changeset 8175 for trunk/src/html

Timestamp:

04/19/07 07:12:07 (21 months ago)

Author:

liucougar

Message:

fixed contentEditable issue
added enable property initial value
updated plugins to work correctly

Files:

• trunk/src/html/range.js (modified) (8 diffs)

trunk/src/html/range.js

@@ -149 +149 @@
 }
 
+dojo.html.range.adjacentNoneTextNode=function(startnode, next){
+        var node = startnode;
+        var len = (0-startnode.length) || 0;
+        var prop = next?'nextSibling':'previousSibling';
+        while(node){
+                if(node.nodeType!=3){
+                        break;
+                }
+                len += node.length
+                node = node[prop];
+        }
+        return [node,len];
+}
 
 dojo.html.range._w3c = Boolean(window['getSelection']);
@@ -163 +176 @@
                 return win.getSelection();
         }else{//IE
-                if(!dojo.html.range.ie.cachedSelection[win]){
+                var id=win.__W3CRange;
+                if(!id || !dojo.html.range.ie.cachedSelection[id]){
                         var s = new dojo.html.range.ie.selection(win);
-                        dojo.html.range.ie.cachedSelection[win] = s;
-                }else{
-                        var s = dojo.html.range.ie.cachedSelection[win];
+                        //use win as the key in an object is not reliable, which
+                        //can leads to quite odd behaviors. thus we generate a
+                        //string and use it as a key in the cache
+                        id=(new Date).getTime();
+                        while(id in dojo.html.range.ie.cachedSelection){
+                                id=id+1;
+                        }
+                        id=String(id);
+                        dojo.html.range.ie.cachedSelection[id] = s;
+                }else{
+                        var s = dojo.html.range.ie.cachedSelection[id];
                 }
                 if(!ignoreUpdate){
@@ -175 +197 @@
         }
 }
-
+                
 if(!dojo.html.range._w3c){
         dojo.html.range.ie={
@@ -202 +224 @@
                                         //TODO: multiple range selection(?)
                                         return new dojo.html.range.W3CRange(dojo.html.range.ie.decomposeControlRange(r));
-                                }else if(type=="TEXT"){
+                                }else{
                                         return new dojo.html.range.W3CRange(dojo.html.range.ie.decomposeTextRange(r));
-                                }else{ //NONE
-                                        return null;
                                 }
                         };
@@ -265 +285 @@
                 //                      try{
                                                 if(calOffset && startnode){
-                                                        var prevnode = dojo.html.range.ie.adjacentNoneTextNode(startnode)[0];
+                                                        var prevnode = dojo.html.range.adjacentNoneTextNode(startnode)[0];
                                                         if(prevnode){
                                                                 startnode = prevnode.nextSibling;
@@ -271 +291 @@
                                                                 startnode = parentNode.firstChild; //firstChild must be a text node
                                                         }
-                                                        var prevnodeobj = dojo.html.range.ie.adjacentNoneTextNode(startnode);
+                                                        var prevnodeobj = dojo.html.range.adjacentNoneTextNode(startnode);
                                                         prevnode = prevnodeobj[0];
                                                         var lenoffset = prevnodeobj[1];
@@ -304 +324 @@
                         }
                         return [startnode, startOffset];
-                },
-                adjacentNoneTextNode: function(startnode, next){
-                        var node = startnode;
-                        var len = (0-startnode.length) || 0;
-                        var prop = next?'nextSibling':'previousSibling';
-                        while(node){
-                                if(node.nodeType!=3){
-                                        break;
-                                }
-                                len += node.length
-                                node = node[prop];
-                        }
-                        return [node,len];
                 },
                 setEndPoint: function(range, container, offset){
@@ -361 +368 @@
                         }
                         if(container.nodeType==3){
-                                var prevnodeobj = dojo.html.range.ie.adjacentNoneTextNode(container);
+                                var prevnodeobj = dojo.html.range.adjacentNoneTextNode(container);
                                 var prevnode = prevnodeobj[0], len = prevnodeobj[1];
                                 if(prevnode){
                                         atmrange.moveToElementText(prevnode);
                                         atmrange.collapse(false);
+                                        //if contentEditable is not inherit, the above collapse won't make the end point
+                                        //in the correctly position: it always has a -1 offset, so compensate it
+                                        if(prevnode.contentEditable!='inherit'){
+                                                len++;
+                                        }
                                 }else{
                                         atmrange.moveToElementText(container.parentNode);
                                         atmrange.collapse(true);
                                 }
+
                                 offset += len;
                                 if(offset>0){