colorbrewer/colorbrewer-bg.css

[roojs1] / Roo.js

diff --git a/Roo.js b/Roo.js
index a7fc688..6fe2b2b 100644 (file)
--- a/Roo.js
+++ b/Roo.js
@@ -68,7 +68,7 @@ Roo.apply = function(o, c, defaults){
             document.execCommand("BackgroundImageCache", false, true);
         }catch(e){}
     }
-
+    
     Roo.apply(Roo, {
         /**
          * True if the browser is in strict mode
@@ -336,16 +336,16 @@ Roo.factory(conf, Roo.data);
             }
             var buf = [];
             for(var key in o){
-                var ov = o[key], k = encodeURIComponent(key);
+                var ov = o[key], k = Roo.encodeURIComponent(key);
                 var type = typeof ov;
                 if(type == 'undefined'){
                     buf.push(k, "=&");
                 }else if(type != "function" && type != "object"){
-                    buf.push(k, "=", encodeURIComponent(ov), "&");
+                    buf.push(k, "=", Roo.encodeURIComponent(ov), "&");
                 }else if(ov instanceof Array){
                     if (ov.length) {
                            for(var i = 0, len = ov.length; i < len; i++) {
-                               buf.push(k, "=", encodeURIComponent(ov[i] === undefined ? '' : ov[i]), "&");
+                               buf.push(k, "=", Roo.encodeURIComponent(ov[i] === undefined ? '' : ov[i]), "&");
                            }
                        } else {
                            buf.push(k, "=&");
@@ -357,14 +357,14 @@ Roo.factory(conf, Roo.data);
         },
          /**
          * Safe version of encodeURIComponent
-         * @param {String} str
+         * @param {String} data 
          * @return {String} 
          */
         
-        encodeURIComponent : function (str)
+        encodeURIComponent : function (data)
         {
             try {
-                return encodeURIComponent(str);
+                return encodeURIComponent(data);
             } catch(e) {} // should be an uri encode error.
             
             if (data == '' || data == null){
@@ -382,30 +382,31 @@ Roo.factory(conf, Roo.data);
                 var bs = new Array();
                 if (c > 0x10000){
                         // 4 bytes
-                        bs[0] = 0xF0 | ((c & 0x1C0000) >>> 18);
-                        bs[1] = 0x80 | ((c & 0x3F000) >>> 12);
-                        bs[2] = 0x80 | ((c & 0xFC0) >>> 6);
+                    bs[0] = 0xF0 | ((c & 0x1C0000) >>> 18);
+                    bs[1] = 0x80 | ((c & 0x3F000) >>> 12);
+                    bs[2] = 0x80 | ((c & 0xFC0) >>> 6);
                     bs[3] = 0x80 | (c & 0x3F);
                 }else if (c > 0x800){
                          // 3 bytes
-                         bs[0] = 0xE0 | ((c & 0xF000) >>> 12);
-                         bs[1] = 0x80 | ((c & 0xFC0) >>> 6);
-                        bs[2] = 0x80 | (c & 0x3F);
+                    bs[0] = 0xE0 | ((c & 0xF000) >>> 12);
+                    bs[1] = 0x80 | ((c & 0xFC0) >>> 6);
+                    bs[2] = 0x80 | (c & 0x3F);
                 }else if (c > 0x80){
                        // 2 bytes
-                        bs[0] = 0xC0 | ((c & 0x7C0) >>> 6);
-                       bs[1] = 0x80 | (c & 0x3F);
+                    bs[0] = 0xC0 | ((c & 0x7C0) >>> 6);
+                    bs[1] = 0x80 | (c & 0x3F);
                 }else{
                         // 1 byte
-                     bs[0] = c;
+                    bs[0] = c;
                 }
                 for(var j=0; j<bs.length; j++){
                     var b = bs[j];
                     var hex = nibble_to_hex((b & 0xF0) >>> 4) 
-                       + nibble_to_hex(b &0x0F);buffer += '%'+hex;
+                            + nibble_to_hex(b &0x0F);
+                    buffer += '%'+hex;
                }
             }
-            return encodeURIComponent(buffer);    
+            return buffer;    
              
         },