Roo/Element.js
authoredward <edward@roojs.com>
Wed, 22 Nov 2017 03:54:27 +0000 (11:54 +0800)
committeredward <edward@roojs.com>
Wed, 22 Nov 2017 03:54:27 +0000 (11:54 +0800)
Roo/Element.js

index 527e6e2..9b0b2c4 100644 (file)
@@ -194,9 +194,16 @@ if(opt.anim.isAnimated()){
             
             while (
                     el && 
-                    !el.isScrollable() && 
-                    D.getViewHeight() - el.dom.clientHeight <= 15 &&
-                    D.getViewWidth() - el.dom.clientWidth <= 15 &&
+                    (
+                        !el.isScrollable() ||
+                        (
+                            el.isScrollable() &&
+                            (
+                                D.getViewHeight() - el.dom.clientHeight > 15 || 
+                                D.getViewWidth() - el.dom.clientWidth > 15
+                            )
+                        )
+                    ) &&
                     el.dom.nodeName.toLowerCase() != 'body'
             ){
                 el = Roo.get(el.dom.parentNode);