X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FElement.js;h=a55c6da3ea908bd4ef9f3e01c86a2af33417bb83;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hp=82b8da3d9b7cd0695e4a9fbfe0dd26e92b7dcbe2;hpb=00dabd9c05a746df169430fc9e9f9fadb11c2d57;p=roojs1 diff --git a/Roo/Element.js b/Roo/Element.js index 82b8da3d9b..a55c6da3ea 100644 --- a/Roo/Element.js +++ b/Roo/Element.js @@ -209,11 +209,11 @@ if(opt.anim.isAnimated()){ } if(parent.dom.nodeName.toLowerCase() == 'body'){ - return Roo.isIOS ? Roo.get(document.body) : Roo.get(document.documentElement); + return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body); } } - return Roo.isIOS ? Roo.get(document.body) : Roo.get(document.documentElement); + return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body); }, /** @@ -2112,6 +2112,7 @@ if(opt.anim.isAnimated()){ if(!this._mask){ this._mask = Roo.DomHelper.append(this.dom, {cls:"roo-el-mask"}, true); } + this.addClass("x-masked"); this._mask.setDisplayed(true); @@ -2133,12 +2134,23 @@ if(opt.anim.isAnimated()){ 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"; - if (mm.dom.firstChild) { // weird IE issue? - mm.dom.firstChild.innerHTML = msg; + if (mm.dom.lastChild) { // weird IE issue? + mm.dom.lastChild.innerHTML = msg; } mm.setDisplayed(true); mm.center(this);