allow string based values for comboboxarray

[roojs1] / Roo / Element.js

diff --git a/Roo/Element.js b/Roo/Element.js
index 14be4ee..a55c6da 100644 (file)
--- a/Roo/Element.js
+++ b/Roo/Element.js
@@ -193,7 +193,6 @@ if(opt.anim.isAnimated()){
             var overflowRegex = /(auto|scroll)/;
             
             if(this.getStyle('position') === 'fixed'){
-                alert('first');
                 return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body);
             }
             
@@ -206,28 +205,14 @@ if(opt.anim.isAnimated()){
                 }
                 
                 if (overflowRegex.test(parent.getStyle('overflow') + parent.getStyle('overflow-x') + parent.getStyle('overflow-y'))){
-                    alert('middle');
                     return parent;
                 }
                 
                 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);
                 }
             }
-            alert('last');
+            
             return Roo.isAndroid ? Roo.get(document.documentElement) : Roo.get(document.body);
         },
 
@@ -2127,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);
             
@@ -2148,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);