// gets dom node based on id
@@ -503,11 +513,29 @@ function(el){
* @param {Mixed} el
* @return HTMLElement
*/
- getDom : function(el){
+ getDom : function(el, strict){
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 (typeof el == 'string') {
+ 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;
+ }
+ }
},
/**
@@ -517,6 +545,22 @@ function(el){
getBody : function(){
return Ext.get(DOC.body || DOC.documentElement);
},
+
+ /**
+ * Returns the current document body as an {@link Ext.Element}.
+ * @return Ext.Element The document body
+ */
+ getHead : function() {
+ var head;
+
+ return function() {
+ if (head == undefined) {
+ head = Ext.get(DOC.getElementsByTagName("head")[0]);
+ }
+
+ return head;
+ };
+ }(),
/**
* Removes a DOM node from the document.
@@ -538,7 +582,7 @@ function(el){
d.innerHTML = '';
delete Ext.elCache[n.id];
}
- }
+ };
}() : function(n){
if(n && n.parentNode && n.tagName != 'BODY'){
(Ext.enableNestedListenerRemoval) ? Ext.EventManager.purgeElement(n, true) : Ext.EventManager.removeAll(n);
@@ -641,7 +685,7 @@ function(el){
* @return {Boolean}
*/
isElement : function(v) {
- return !!v && v.tagName;
+ return v ? !!v.tagName : false;
},
/**
@@ -1009,7 +1053,7 @@ Ext.ns("Ext.grid", "Ext.list", "Ext.dd", "Ext.tree", "Ext.form", "Ext.menu",
*/
Ext.apply(Ext, function(){
- var E = Ext,
+ var E = Ext,
idSeed = 0,
scrollWidth = null;
@@ -1022,13 +1066,13 @@ Ext.apply(Ext, function(){
emptyFn : function(){},
/**
- * URL to a 1x1 transparent gif image used by Ext to create inline icons with CSS background images.
+ * URL to a 1x1 transparent gif image used by Ext to create inline icons with CSS background images.
* In older versions of IE, this defaults to "http://extjs.com/s.gif" and you should change this to a URL on your server.
* For other browsers it uses an inline data URL.
* @type String
*/
BLANK_IMAGE_URL : Ext.isIE6 || Ext.isIE7 || Ext.isAir ?
- 'http:/' + '/extjs.com/s.gif' :
+ 'http:/' + '/www.extjs.com/s.gif' :
'data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==',
extendX : function(supr, fn){
@@ -1050,7 +1094,7 @@ Ext.apply(Ext, function(){
* @return {Number} Value, if numeric, else defaultValue
*/
num : function(v, defaultValue){
- v = Number(Ext.isEmpty(v) || Ext.isBoolean(v) ? NaN : v);
+ v = Number(Ext.isEmpty(v) || Ext.isArray(v) || typeof v == 'boolean' || (typeof v == 'string' && v.trim().length == 0) ? NaN : v);
return isNaN(v) ? defaultValue : v;
},
@@ -1093,13 +1137,13 @@ Ext.addBehaviors({
'#foo a@click' : function(e, t){
// do something
},
-
+
// add the same listener to multiple selectors (separated by comma BEFORE the @)
'#foo a, #bar span.some-class@mouseover' : function(){
// do something
}
});
- *
// Example 1:
Ext.partition([true, false, true, true, false]); // [[true, true, true], [false, false]]
@@ -1380,14 +1424,14 @@ Ext.invoke(Ext.query("p"), "getAttribute", "id");
* See the {@link #start} method for details about how to configure a task object.
* Also see {@link Ext.util.DelayedTask}. * * @constructor @@ -1775,21 +1820,25 @@ Ext.util.TaskRunner = function(interval){ /** * Starts a new task. * @method start - * @param {Object} task A config object that supports the following properties:run : Functionargs argument if specified. If a
- * particular scope is required, be sure to specify it using the scope argument.A config object that supports the following properties:
run : FunctionThe function to execute each time the task is invoked. The
+ * function will be called at each interval and passed the args argument if specified, and the
+ * current invocation count if not.
If a particular scope (this reference) is required, be sure to specify it using the scope argument.
Return false from this function to terminate the task.
interval : Numberargs : Arrayrun.run. If not specified, the current invocation count is passed.
* scope : Objectrun function. Defaults to the task config object.duration : Numberduration : Numberrepeat : Numberrepeat : NumberBefore each invocation, Ext injects the property taskRunCount into the task object so
+ * that calculations based on the repeat count can be performed.
See the {@link #start} method for details about how to configure a task object.
* @singleton */ Ext.TaskMgr = new Ext.util.TaskRunner();if(typeof jQuery == "undefined"){ @@ -1865,7 +1915,7 @@ Ext.lib.Dom = { isAncestor : function(p, c){ var ret = false; - + p = Ext.getDom(p); c = Ext.getDom(c); if (p && c) { @@ -1875,10 +1925,10 @@ Ext.lib.Dom = { return !!(p.compareDocumentPosition(c) & 16); } else { while (c = c.parentNode) { - ret = c == p || ret; + ret = c == p || ret; } - } - } + } + } return ret; }, @@ -2106,15 +2156,15 @@ Ext.lib.Ajax = function(){ } }; }; - + var createResponse = function(cb, xhr){ var headerObj = {}, - headerStr, + headerStr, t, s; try { - headerStr = xhr.getAllResponseHeaders(); + headerStr = xhr.getAllResponseHeaders(); Ext.each(headerStr.replace(/\r\n/g, '\n').split('\n'), function(v){ t = v.indexOf(':'); if(t >= 0){ @@ -2126,7 +2176,7 @@ Ext.lib.Ajax = function(){ } }); } catch(e) {} - + return { responseText: xhr.responseText, responseXML : xhr.responseXML, @@ -2296,9 +2346,10 @@ Ext.lib.Anim = function(){ if (args.top.from) e.setTop(args.top.from); break; + // jQuery can't handle callback, scope, and xy arguments, so break here case 'callback': case 'scope': - // jQuery can't handle callback and scope arguments, so break here + case 'xy': break; default: