Roo/form/ComboBoxArray.js

[roojs1] / Roo / Element.js

diff --git a/Roo/Element.js b/Roo/Element.js
index 93bb9f8..0731add 100644 (file)
--- a/Roo/Element.js
+++ b/Roo/Element.js
@@ -675,20 +675,10 @@ if(opt.anim.isAnimated()){
          * @param {String} style1 A style name
          * @param {String} style2 A style name
          * @param {String} etc.
-         * @param {String} all If param get all of the styles..
          * @return {Object} The style object
          */
         getStyles : function(){
-            
-            
-            
             var a = arguments, len = a.length, r = {};
-            Roo.log(a);
-            if(a == 'all'){
-                var s = this.attr('style').split(';');
-                Roo.log(s);
-                return r;
-            }
             for(var i = 0; i < len; i++){
                 r[a[i]] = this.getStyle(a[i]);
             }
@@ -2084,7 +2074,7 @@ if(opt.anim.isAnimated()){
          */
         mask : function(msg, msgCls)
         {
-            if(this.getStyle("position") == "static"){
+            if(this.getStyle("position") == "static" && this.dom.tagName !== 'BODY'){
                 this.setStyle("position", "relative");
             }
             if(!this._mask){
@@ -2722,7 +2712,7 @@ if(opt.anim.isAnimated()){
         
         /**
          * Sets or Returns the value the dom attribute value
-         * @param {String} name The attribute name
+         * @param {String|Object} name The attribute name (or object to set multiple attributes)
          * @param {String} value (optional) The value to set the attribute to
          * @return {String} The attribute value
          */
@@ -2731,6 +2721,14 @@ if(opt.anim.isAnimated()){
                 this.dom.setAttribute(name, arguments[1]);
                 return arguments[1];
             }
+            if (typeof(name) == 'object') {
+                for(var i in name) {
+                    this.attr(i, name[i]);
+                }
+                return name;
+            }
+            
+            
             if (!this.dom.hasAttribute(name)) {
                 return undefined;
             }