From 003e09c01b6e23c158e0c65ba078dd7e7a2d214d Mon Sep 17 00:00:00 2001 From: edward Date: Wed, 29 Nov 2017 17:20:06 +0800 Subject: [PATCH] roojs-core.js roojs-core-debug.js --- roojs-core-debug.js | 5 ++++- roojs-core.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 4776c33a9d..8eae637d95 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -7182,7 +7182,10 @@ if(opt.anim.isAnimated()){ continue; } - if (overflowRegex.test(parent.getStyle('overflow') + parent.getStyle('overflow-x') + parent.getStyle('overflow-y'))){ + if ( + parent.dom.nodeName.toLowerCase() != 'body' || + overflowRegex.test(parent.getStyle('overflow') + parent.getStyle('overflow-x') + parent.getStyle('overflow-y')) + ){ return parent; } } diff --git a/roojs-core.js b/roojs-core.js index 77235631ce..4d15797859 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -306,7 +306,7 @@ 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