projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow string based values for comboboxarray
[roojs1]
/
Roo
/
Element.js
diff --git
a/Roo/Element.js
b/Roo/Element.js
index
b8131a7
..
a55c6da
100644
(file)
--- a/
Roo/Element.js
+++ b/
Roo/Element.js
@@
-188,52
+188,32
@@
if(opt.anim.isAnimated()){
/**
* Looks at the scrollable parent element
*/
/**
* Looks at the scrollable parent element
*/
- findScrollableParent : function()
{
-
+ findScrollableParent : function()
+ {
var overflowRegex = /(auto|scroll)/;
if(this.getStyle('position') === 'fixed'){
var overflowRegex = /(auto|scroll)/;
if(this.getStyle('position') === 'fixed'){
- return Roo.get(document.body);
+ return Roo.
isAndroid ? Roo.get(document.documentElement) : Roo.
get(document.body);
}
var excludeStaticParent = this.getStyle('position') === "absolute";
}
var excludeStaticParent = this.getStyle('position') === "absolute";
- for (var parent = this; (parent = Roo.get(parent.dom.parentNode))){
+ for (var parent = this; (parent = Roo.get(parent.dom.parentNode))
;
){
- }
-
- while (
- el &&
- !el.isScrollable() &&
-
- (
- !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);
+ if (excludeStaticParent && parent.getStyle('position') === "static") {
+ continue;
+ }
- Roo.log(el);
- Roo.log(el.getStyle('overflow') + el.getStyle('overflow-x') + el.getStyle('overflow-y'));
- Roo.log(el.getStyle('overflow'));
- Roo.log(el.getStyle('overflow-y'));
- Roo.log(el.getStyle('overflow-x'));
+ if (overflowRegex.test(parent.getStyle('overflow') + parent.getStyle('overflow-x') + parent.getStyle('overflow-y'))){
+ return parent;
+ }
+ if(parent.dom.nodeName.toLowerCase() == 'body'){
+ return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body);
+ }
}
}
- if(!el.isScrollable()){
- return null;
- }
-
- return el;
+ return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body);
},
/**
},
/**
@@
-2132,6
+2112,7
@@
if(opt.anim.isAnimated()){
if(!this._mask){
this._mask = Roo.DomHelper.append(this.dom, {cls:"roo-el-mask"}, true);
}
if(!this._mask){
this._mask = Roo.DomHelper.append(this.dom, {cls:"roo-el-mask"}, true);
}
+
this.addClass("x-masked");
this._mask.setDisplayed(true);
this.addClass("x-masked");
this._mask.setDisplayed(true);
@@
-2153,12
+2134,23
@@
if(opt.anim.isAnimated()){
if(typeof msg == 'string'){
if(!this._maskMsg){
if(typeof msg == 'string'){
if(!this._maskMsg){
- this._maskMsg = Roo.DomHelper.append(this.dom, {cls:"roo-el-mask-msg", cn:{tag:'div'}}, true);
+ this._maskMsg = Roo.DomHelper.append(this.dom, {
+ cls: "roo-el-mask-msg",
+ cn: [
+ {
+ tag: 'i',
+ cls: 'fa fa-spinner fa-spin'
+ },
+ {
+ tag: 'div'
+ }
+ ]
+ }, true);
}
var mm = this._maskMsg;
mm.dom.className = msgCls ? "roo-el-mask-msg " + msgCls : "roo-el-mask-msg";
}
var mm = this._maskMsg;
mm.dom.className = msgCls ? "roo-el-mask-msg " + msgCls : "roo-el-mask-msg";
- if (mm.dom.
fir
stChild) { // weird IE issue?
- mm.dom.
fir
stChild.innerHTML = msg;
+ if (mm.dom.
la
stChild) { // weird IE issue?
+ mm.dom.
la
stChild.innerHTML = msg;
}
mm.setDisplayed(true);
mm.center(this);
}
mm.setDisplayed(true);
mm.center(this);