Roo.js

[roojs1] / Roo.js

diff --git a/Roo.js b/Roo.js
index 1c8a900..a7c7a8b 100644 (file)
--- a/Roo.js
+++ b/Roo.js
@@ -60,8 +60,16 @@ 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 =  (function() {
+            try {  
+                document.createEvent("TouchEvent");  
+                return true;  
+            } catch (e) {  
+                return false;  
+            } 
+            
+        })();
     // remove css image flicker
        if(isIE && !isIE7){
         try{
@@ -121,24 +129,6 @@ Roo.apply = function(o, c, defaults){
 
         emptyFn : function(){},
         
-        /**
-         *  Clone the object
-         *
-         *
-         */
-        clone : function(obj){
-            if (obj === null || typeof obj !== 'object') {
-                return obj;
-            }
-
-            var temp = obj.constructor(); // give temp the original obj's constructor
-            for (var key in obj) {
-                temp[key] = cloneObject(obj[key]);
-            }
-
-            return temp;
-        },
-        
         /**
          * Copies all the properties of config to obj if they don't already exist.
          * @param {Object} obj The receiver of the properties
@@ -633,6 +623,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,
@@ -662,4 +654,7 @@ Roo.factory(conf, Roo.data);
 })();
 
 Roo.namespace("Roo", "Roo.util", "Roo.grid", "Roo.dd", "Roo.tree", "Roo.data",
-                "Roo.form", "Roo.menu", "Roo.state", "Roo.lib", "Roo.layout", "Roo.app", "Roo.ux");
+                "Roo.form", "Roo.menu", "Roo.state", "Roo.lib", "Roo.layout",
+                "Roo.app", "Roo.ux",
+                "Roo.bootstrap",
+                "Roo.bootstrap.dash");