Roo.js

[roojs1] / Roo.js

diff --git a/Roo.js b/Roo.js
index 727b751..866dfbd 100644 (file)
--- a/Roo.js
+++ b/Roo.js
@@ -60,15 +60,15 @@ Roo.apply = function(o, c, defaults){
         isWindows = (ua.indexOf("windows") != -1 || ua.indexOf("win32") != -1),
         isMac = (ua.indexOf("macintosh") != -1 || ua.indexOf("mac os x") != -1),
         isLinux = (ua.indexOf("linux") != -1),
-        isSecure = window.location.href.toLowerCase().indexOf("https") === 0;
-
+        isSecure = window.location.href.toLowerCase().indexOf("https") === 0,
+        isTouch =  'ontouchstart' in window || window.DocumentTouch && document instanceof DocumentTouch;
     // remove css image flicker
        if(isIE && !isIE7){
         try{
             document.execCommand("BackgroundImageCache", false, true);
         }catch(e){}
     }
-
+    
     Roo.apply(Roo, {
         /**
          * True if the browser is in strict mode
@@ -120,7 +120,7 @@ Roo.apply = function(o, c, defaults){
         BLANK_IMAGE_URL : "http:/"+"/localhost/s.gif",
 
         emptyFn : function(){},
-
+        
         /**
          * Copies all the properties of config to obj if they don't already exist.
          * @param {Object} obj The receiver of the properties
@@ -294,6 +294,8 @@ Roo.factory(conf, Roo.data);
          
         factory : function(c, ns)
         {
+            Roo.log('factory');
+            Roo.log(c);
             // no xtype, no ns or c.xns - or forced off by c.xns
             if (!c.xtype   || (!ns && !c.xns) ||  (c.xns === false)) { // not enough info...
                 return c;
@@ -397,8 +399,7 @@ Roo.factory(conf, Roo.data);
                     bs[1] = 0x80 | (c & 0x3F);
                 }else{
                         // 1 byte
-                    buffer += data.charAt(i);
-                    continue;
+                    bs[0] = c;
                 }
                 for(var j=0; j<bs.length; j++){
                     var b = bs[j];
@@ -616,6 +617,8 @@ Roo.factory(conf, Roo.data);
         isLinux : isLinux,
         /** @type Boolean */
         isMac : isMac,
+        /** @type Boolean */
+        isTouch : isTouch,
 
         /**
          * By default, Ext intelligently decides whether floating elements should be shimmed. If you are using flash,