From: edward <edward@roojs.com>
Date: Tue, 9 Jan 2018 06:27:42 +0000 (+0800)
Subject: roojs-core.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=1f56047841f699451f270b19eed1973ddcf10d64

roojs-core.js
roojs-core-debug.js
---

diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index 3d26a89863..1c5b1aa7a4 100644
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -7190,22 +7190,23 @@ if(opt.anim.isAnimated()){
                 }
                 
                 if(parent.dom.nodeName.toLowerCase() == 'body'){
+                    
+                    alert('is android : ' + Roo.isAndroid);
+                    alert('is ios : ' + Roo.isIOS);
+
+                    if(Roo.isAndroid){
+                        alert('Is Android');
+                        return Roo.get(document.documentElement);
+                    }
+
+                    if(!Roo.isAndroid){
+                        alert('not android');
+                    }
+
                     return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body);
                 }
             }
             
-            alert('is android : ' + Roo.isAndroid);
-            alert('is ios : ' + Roo.isIOS);
-            
-            if(Roo.isAndroid){
-                alert('Is Android');
-                return Roo.get(document.documentElement);
-            }
-            
-            if(!Roo.isAndroid){
-                alert('not android');
-            }
-            
             return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body);
         },
 
diff --git a/roojs-core.js b/roojs-core.js
index b4b2c31ea6..3ec47c698d 100644
--- a/roojs-core.js
+++ b/roojs-core.js
@@ -307,8 +307,8 @@ if(!L){return null;}var id=L.id;if(K!==true&&id&&Roo.Element.cache[id]){return R
 return this;},enableDisplayMode:function(J){this.setVisibilityMode(El.DISPLAY);if(typeof J!="undefined"){this.originalDisplay=J;}return this;},findParent:function(J,K,L){var p=this.dom,b=document.body,M=0,dq=Roo.DomQuery,N;K=K||50;if(typeof K!="number"){N=Roo.getDom(K);
 K=10;}while(p&&p.nodeType==1&&M<K&&p!=b&&p!=N){if(dq.is(p,J)){return L?Roo.get(p):p;}M++;p=p.parentNode;}return null;},findParentNode:function(J,K,L){var p=Roo.fly(this.dom.parentNode,'_internal');return p?p.findParent(J,K,L):null;},findScrollableParent:function(){var J=/(auto|scroll)/;
 if(this.getStyle('position')==='fixed'){return Roo.isAndroid?Roo.get(document.documentElement):Roo.get(document.body);}var K=this.getStyle('position')==="absolute";for(var L=this;(L=Roo.get(L.dom.parentNode));){if(K&&L.getStyle('position')==="static"){continue;
-}if(J.test(L.getStyle('overflow')+L.getStyle('overflow-x')+L.getStyle('overflow-y'))){return L;}if(L.dom.nodeName.toLowerCase()=='body'){return Roo.isAndroid?Roo.get(document.documentElement):Roo.get(document.body);}}alert('is android : '+Roo.isAndroid);alert('is ios : '+Roo.isIOS);
-if(Roo.isAndroid){alert('Is Android');return Roo.get(document.documentElement);}if(!Roo.isAndroid){alert('not android');}return Roo.isAndroid?Roo.get(document.documentElement):Roo.get(document.body);},up:function(J,K){return this.findParentNode(J,K,true);
+}if(J.test(L.getStyle('overflow')+L.getStyle('overflow-x')+L.getStyle('overflow-y'))){return L;}if(L.dom.nodeName.toLowerCase()=='body'){alert('is android : '+Roo.isAndroid);alert('is ios : '+Roo.isIOS);if(Roo.isAndroid){alert('Is Android');return Roo.get(document.documentElement);
+}if(!Roo.isAndroid){alert('not android');}return Roo.isAndroid?Roo.get(document.documentElement):Roo.get(document.body);}}return Roo.isAndroid?Roo.get(document.documentElement):Roo.get(document.body);},up:function(J,K){return this.findParentNode(J,K,true);
 },is:function(J){return Roo.DomQuery.is(this.dom,J);},animate:function(J,K,L,M,N){this.anim(J,{duration:K,callback:L,easing:M},N);return this;},anim:function(J,K,L,M,N,cb){L=L||'run';K=K||{};var O=Roo.lib.Anim[L](this.dom,J,(K.duration||M)||.35,(K.easing||N)||'easeOut',function(){Roo.callback(cb,this);
 Roo.callback(K.callback,K.scope||this,[this,K]);},this);K.anim=O;return O;},preanim:function(a,i){return !a[i]?false:(typeof a[i]=="object"?a[i]:{duration:a[i+1],callback:a[i+2],easing:a[i+3]});},clean:function(J){if(this.isCleaned&&J!==true){return this;
 }var ns=/\S/;var d=this.dom,n=d.firstChild,ni=-1;while(n){var nx=n.nextSibling;if(n.nodeType==3&&!ns.test(n.nodeValue)){d.removeChild(n);}else{n.nodeIndex=++ni;}n=nx;}this.isCleaned=true;return this;},calcOffsetsTo:function(el){el=Roo.get(el);var d=el.dom;