From: edward Date: Wed, 22 Nov 2017 03:22:44 +0000 (+0800) Subject: roojs-core.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=8c4fb128f01af0092b91209ca6308a5d2cdfe101 roojs-core.js roojs-core-debug.js --- diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 41024b5f2a..a86771ff98 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -7168,7 +7168,7 @@ if(opt.anim.isAnimated()){ */ findScrollableParent : function(){ - var el = Roo.get(this.el.dom.parentNode);; + var el = Roo.get(this.dom.parentNode); while (el && !el.isScrollable() && el.dom.nodeName.toLowerCase() != 'body'){ el = Roo.get(el.dom.parentNode); diff --git a/roojs-core.js b/roojs-core.js index eb27392311..cfed0e790d 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -305,9 +305,9 @@ return Roo.isSafari?(A[k]||k):k;},getPageX:function(){return this.xy[0];},getPag (function(){var D=Roo.lib.Dom;var E=Roo.lib.Event;var A=Roo.lib.Anim;var B={};var C=/(-[a-z])/gi;var F=function(m,a){return a.charAt(1).toUpperCase();};var G=document.defaultView;Roo.Element=function(J,K){var L=typeof J=="string"?document.getElementById(J):J; 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