X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2FElement.js;h=a55c6da3ea908bd4ef9f3e01c86a2af33417bb83;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hp=368bb4032833bb43ed6e820af2bbfec9e4bbb4bc;hpb=03049c2f81eb2629d2716621f8665dd8e75c8821;p=roojs1 diff --git a/Roo/Element.js b/Roo/Element.js index 368bb40328..a55c6da3ea 100644 --- a/Roo/Element.js +++ b/Roo/Element.js @@ -209,19 +209,6 @@ if(opt.anim.isAnimated()){ } if(parent.dom.nodeName.toLowerCase() == 'body'){ - - alert('is android : ' + Roo.isAndroid); - alert('is ios : ' + Roo.isIOS); - - if(Roo.isAndroid){ - alert('Is Android'); - return Roo.get(document.documentElement); - } - - if(!Roo.isAndroid){ - alert('not android'); - } - return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body); } } @@ -2125,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); @@ -2146,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);