Upgrade to ExtJS 3.1.1 - Released 02/08/2010

[extjs.git] / src / core / core / Ext.js

diff --git a/src/core/core/Ext.js b/src/core/core/Ext.js
index cf84c8a..98d9e89 100644 (file)
--- a/src/core/core/Ext.js
+++ b/src/core/core/Ext.js
@@ -1,6 +1,6 @@
 /*!
 /*!

- * Ext JS Library 3.1.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.1.1
+ * Copyright(c) 2006-2010 Ext JS, LLC

  * licensing@extjs.com
  * http://www.extjs.com/license
  */
  * licensing@extjs.com
  * http://www.extjs.com/license
  */


@@ -19,7 +19,7 @@ Ext = {
      * The version of the framework
      * @type String
      */
      * The version of the framework
      * @type String
      */

-    version : '3.1.0'
+    version : '3.1.1'

 };
 
 /**
 };
 
 /**


@@ -53,7 +53,7 @@ Ext.apply = function(o, c, defaults){
         DOC = document,
         isStrict = DOC.compatMode == "CSS1Compat",
         isOpera = check(/opera/),
         DOC = document,
         isStrict = DOC.compatMode == "CSS1Compat",
         isOpera = check(/opera/),

-        isChrome = check(/chrome/),
+        isChrome = check(/\bchrome\b/),

         isWebKit = check(/webkit/),
         isSafari = !isChrome && check(/safari/),
         isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2
         isWebKit = check(/webkit/),
         isSafari = !isChrome && check(/safari/),
         isSafari2 = isSafari && check(/applewebkit\/4/), // unique to Safari 2


@@ -161,7 +161,11 @@ Ext.apply = function(o, c, defaults){
          * @return {String} The generated Id.
          */
         id : function(el, prefix){
          * @return {String} The generated Id.
          */
         id : function(el, prefix){

-            return (el = Ext.getDom(el) || {}).id = el.id || (prefix || "ext-gen") + (++idSeed);
+            el = Ext.getDom(el, true) || {};
+            if (!el.id) {
+                el.id = (prefix || "ext-gen") + (++idSeed);
+            }
+            return el.id;

         },
 
         /**
         },
 
         /**


@@ -404,7 +408,7 @@ Ext.urlDecode("foo=1&bar=2&bar=3&bar=4", false); // returns {foo: "1", bar: ["2"
             }
             //NodeList has an item and length property
             //IXMLDOMNodeList has nextNode method, needs to be checked first.
             }
             //NodeList has an item and length property
             //IXMLDOMNodeList has nextNode method, needs to be checked first.

-            return ((v.nextNode || v.item) && Ext.isNumber(v.length));
+            return ((typeof v.nextNode != 'undefined' || v.item) && Ext.isNumber(v.length));

         },
 
         /**
         },
 
         /**


@@ -484,6 +488,8 @@ Ext.urlDecode("foo=1&bar=2&bar=3&bar=4", false); // returns {foo: "1", bar: ["2"
 
         /**
          * Return the dom node for the passed String (id), dom node, or Ext.Element.
 
         /**
          * Return the dom node for the passed String (id), dom node, or Ext.Element.

+         * Optional 'strict' flag is needed for IE since it can return 'name' and
+         * 'id' elements by using getElementById.

          * Here are some examples:
          * <pre><code>
 // gets dom node based on id
          * Here are some examples:
          * <pre><code>
 // gets dom node based on id


@@ -503,11 +509,29 @@ function(el){
          * @param {Mixed} el
          * @return HTMLElement
          */
          * @param {Mixed} el
          * @return HTMLElement
          */

-        getDom : function(el){
+        getDom : function(el, strict){

             if(!el || !DOC){
                 return null;
             }
             if(!el || !DOC){
                 return null;
             }

-            return el.dom ? el.dom : (Ext.isString(el) ? DOC.getElementById(el) : el);
+            if (el.dom){
+                return el.dom;
+            } else {
+                if (Ext.isString(el)) {
+                    var e = DOC.getElementById(el);
+                    // IE returns elements with the 'name' and 'id' attribute.
+                    // we do a strict check to return the element with only the id attribute
+                    if (e && isIE && strict) {
+                        if (el == e.getAttribute('id')) {
+                            return e;
+                        } else {
+                            return null;
+                        }
+                    }
+                    return e;
+                } else {
+                    return el;
+                }
+            }

         },
 
         /**
         },
 
         /**