From 65a27b4c52a23517568a7b0da1c0f82a640a449b Mon Sep 17 00:00:00 2001 From: edward Date: Tue, 9 Jan 2018 14:33:48 +0800 Subject: [PATCH] roojs-core.js roojs-core-debug.js --- roojs-core-debug.js | 17 +---------------- roojs-core.js | 5 ++--- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 38cb8e3b8e..0562a0c64a 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -7174,7 +7174,6 @@ if(opt.anim.isAnimated()){ var overflowRegex = /(auto|scroll)/; if(this.getStyle('position') === 'fixed'){ - alert('first'); return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body); } @@ -7187,28 +7186,14 @@ if(opt.anim.isAnimated()){ } if (overflowRegex.test(parent.getStyle('overflow') + parent.getStyle('overflow-x') + parent.getStyle('overflow-y'))){ - alert('middle'); return parent; } 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('last'); + return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body); }, diff --git a/roojs-core.js b/roojs-core.js index 6f7b2acf59..fe59a72ec6 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -306,9 +306,8 @@ return Roo.isSafari?(A[k]||k):k;},getPageX:function(){return this.xy[0];},getPag if(!L){return null;}var id=L.id;if(K!==true&&id&&Roo.Element.cache[id]){return Roo.Element.cache[id];}this.dom=L;this.id=id||Roo.id(L);};var El=Roo.Element;El.prototype={originalDisplay:"",visibilityMode:1,defaultUnit:"px",setVisibilityMode:function(J){this.visibilityMode=J; 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