Changeset 13657

Timestamp:

05/09/08 18:14:56 (7 months ago)

Author:

peller

Message:

Tolerate IE returning attribute values as Numbers. Refs #6720

Files:

• dijit/trunk/_editor/html.js (modified) (7 diffs)

dijit/trunk/_editor/html.js

@@ -1 +1 @@
 dojo.provide("dijit._editor.html");
 
-dijit._editor.escapeXml=function(/*String*/str, /*Boolean*/noSingleQuotes){
+dijit._editor.escapeXml=function(/*String*/str, /*Boolean?*/noSingleQuotes){
         //summary:
         //              Adds escape sequences for special characters in XML: &<>"'
@@ -16 +16 @@
         switch(node.nodeType){
                 case 1: //element node
-                        output = '<'+node.nodeName.toLowerCase();
+                        output = '<' + node.nodeName.toLowerCase();
 
                         //store the list of attributes and sort it to have the
@@ -23 +23 @@
                         if(dojo.isIE && node.outerHTML){
                                 var s = node.outerHTML;
-                                s = s.substr(0,s.indexOf('>'));
-                                s = s.replace(/(['"])[^"']*\1/g, '');//to make the following regexp safe
+                                s = s.substr(0, s.indexOf('>'))
+                                        .replace(/(['"])[^"']*\1/g, ''); //to make the following regexp safe
                                 var reg = /([^\s=]+)=/g;
                                 var m, key;
                                 while((m = reg.exec(s))){
-                                        key=m[1];
+                                        key = m[1];
                                         if(key.substr(0,3) != '_dj'){
                                                 if(key == 'src' || key == 'href'){
@@ -36 +36 @@
                                                         }
                                                 }
-                                                if(key=='style'){
-                                                        attrarray.push([key, node.style.cssText.toLowerCase()]);
-                                                }else{
-                                                        attrarray.push([key, key=='class'?node.className:node.getAttribute(key)]);
+                                                var val;
+                                                switch(key){
+                                                        case 'style':
+                                                                val = node.style.cssText.toLowerCase();
+                                                                break;
+                                                        case 'class':
+                                                                val = node.className;
+                                                                break;
+                                                        default:
+                                                                val = node.getAttribute(key);
                                                 }
+                                                attrarray.push([key, val]);
                                         }
                                 }
                         }else{
-                                var attr, i=0, attrs = node.attributes;
-                                while((attr=attrs[i++])){
+                                var attr, i = 0;
+                                while((attr = node.attributes[i++])){
                                         //ignore all attributes starting with _dj which are
                                         //internal temporary attributes used by the editor
-                                        var n=attr.name;
+                                        var n = attr.name;
                                         if(n.substr(0,3) != '_dj' /*&&
                                                 (attr.specified == undefined || attr.specified)*/){
@@ -64 +71 @@
                                 return a[0]<b[0]?-1:(a[0]==b[0]?0:1);
                         });
-                        i=0;
-                        while((attr=attrarray[i++])){
-                                output += ' '+attr[0]+'="'+dijit._editor.escapeXml(attr[1],true)+'"';
+                        var j = 0;
+                        while((attr = attrarray[j++])){
+                                output += ' ' + attr[0] + '="' +
+                                        (dojo.isString(attr[1]) ? dijit._editor.escapeXml(attr[1], true) : attr[1]) + '"';
                         }
                         if(node.childNodes.length){
@@ -76 +84 @@
                 case 3: //text
                         // FIXME:
-                        output = dijit._editor.escapeXml(node.nodeValue,true);
+                        output = dijit._editor.escapeXml(node.nodeValue, true);
                         break;
                 case 8: //comment
                         // FIXME:
-                        output = '<!--'+dijit._editor.escapeXml(node.nodeValue,true)+'-->';
+                        output = '<!--' + dijit._editor.escapeXml(node.nodeValue, true) + '-->';
                         break;
                 default:
-                        output = "Element not recognized - Type: " + node.nodeType + " Name: " + node.nodeName;
+                        output = "<!-- Element not recognized - Type: " + node.nodeType + " Name: " + node.nodeName + "-->";
         }
         return output;
@@ -92 +100 @@
         var out = "";
         if(!dom){ return out; }
-        var nodes = dom["childNodes"]||dom;
-        var i=0;
-        var node;
-        while((node=nodes[i++])){
+        var nodes = dom["childNodes"] || dom;
+        var node, i = 0;
+        while((node = nodes[i++])){
                 out += dijit._editor.getNodeHtml(node);
         }