/**
* @class Ext
*/
-Ext.ns("Ext.grid", "Ext.dd", "Ext.tree", "Ext.form", "Ext.menu",
+Ext.ns("Ext.grid", "Ext.list", "Ext.dd", "Ext.tree", "Ext.form", "Ext.menu",
"Ext.state", "Ext.layout", "Ext.app", "Ext.ux", "Ext.chart", "Ext.direct");
/**
* Namespace alloted for extensions to the framework.
@@ -18,7 +19,9 @@ Ext.ns("Ext.grid", "Ext.dd", "Ext.tree", "Ext.form", "Ext.menu",
*/
Ext.apply(Ext, function(){
- var E = Ext, idSeed = 0;
+ var E = Ext,
+ idSeed = 0,
+ scrollWidth = null;
return {
/**
@@ -34,7 +37,7 @@ Ext.apply(Ext, function(){
* For other browsers it uses an inline data URL.
* @type String
*/
- BLANK_IMAGE_URL : Ext.isIE6 || Ext.isIE7 ?
+ BLANK_IMAGE_URL : Ext.isIE6 || Ext.isIE7 || Ext.isAir ?
'http:/' + '/extjs.com/s.gif' :
'data:image/gif;base64,R0lGODlhAQABAID/AMDAwAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==',
@@ -50,15 +53,6 @@ Ext.apply(Ext, function(){
return Ext.get(document);
},
- /**
- * Returns true if the passed object is a JavaScript date object, otherwise false.
- * @param {Object} object The object to test
- * @return {Boolean}
- */
- isDate : function(v){
- return Object.prototype.toString.apply(v) === '[object Date]';
- },
-
/**
* Utility method for validating that a value is numeric, returning the specified default value if it is not.
* @param {Mixed} value Should be a number, but any type will be handled appropriately
@@ -66,8 +60,8 @@ Ext.apply(Ext, function(){
* @return {Number} Value, if numeric, else defaultValue
*/
num : function(v, defaultValue){
- v = Number(v === null || typeof v == 'boolean'? NaN : v);
- return isNaN(v)? defaultValue : v;
+ v = Number(Ext.isEmpty(v) || Ext.isArray(v) || Ext.isBoolean(v) || (Ext.isString(v) && v.trim().length == 0) ? NaN : v);
+ return isNaN(v) ? defaultValue : v;
},
/**
@@ -93,7 +87,7 @@ Ext.apply(Ext, function(){
* @return {String}
*/
escapeRe : function(s) {
- return s.replace(/([.*+?^${}()|[\]\/\\])/g, "\\$1");
+ return s.replace(/([-.*+?^${}()|[\]\/\\])/g, "\\$1");
},
sequence : function(o, name, fn, scope){
@@ -140,6 +134,31 @@ Ext.addBehaviors({
cache = null;
}
},
+
+ /**
+ * Utility method for getting the width of the browser scrollbar. This can differ depending on
+ * operating system settings, such as the theme or font size.
+ * @param {Boolean} force (optional) true to force a recalculation of the value.
+ * @return {Number} The width of the scrollbar.
+ */
+ getScrollBarWidth: function(force){
+ if(!Ext.isReady){
+ return 0;
+ }
+
+ if(force === true || scrollWidth === null){
+ // Append our div, do our calculation and then remove it
+ var div = Ext.getBody().createChild('
'),
+ child = div.child('div', true);
+ var w1 = child.offsetWidth;
+ div.setStyle('overflow', (Ext.isWebKit || Ext.isGecko) ? 'auto' : 'scroll');
+ var w2 = child.offsetWidth;
+ div.remove();
+ // Need to add 2 to ensure we leave enough space
+ scrollWidth = w1 - w2 + 2;
+ }
+ return scrollWidth;
+ },
// deprecated
@@ -176,7 +195,7 @@ ImageComponent = Ext.extend(Ext.BoxComponent, {
* @return {Object} The modified object.
*/
copyTo : function(dest, source, names){
- if(typeof names == 'string'){
+ if(Ext.isString(names)){
names = names.split(/[,;\s]/);
}
Ext.each(names, function(name){
@@ -315,7 +334,7 @@ ImageComponent = Ext.extend(Ext.BoxComponent, {
* @return {Number} The mean.
*/
mean : function(arr){
- return Ext.sum(arr) / arr.length;
+ return arr.length > 0 ? Ext.sum(arr) / arr.length : undefined;
},
/**
@@ -378,7 +397,7 @@ Ext.invoke(Ext.query("p"), "getAttribute", "id");
var ret = [],
args = Array.prototype.slice.call(arguments, 2);
Ext.each(arr, function(v,i) {
- if (v && typeof v[methodName] == "function") {
+ if (v && Ext.isFunction(v[methodName])) {
ret.push(v[methodName].apply(v, args));
} else {
ret.push(undefined);
@@ -502,7 +521,7 @@ Ext.zip(
case RegExp: return 'regexp';
case Date: return 'date';
}
- if(typeof o.length == 'number' && typeof o.item == 'function') {
+ if(Ext.isNumber(o.length) && Ext.isFunction(o.item)) {
return 'nodelist';
}
}
@@ -526,7 +545,7 @@ Ext.zip(
};
}());
-/**
+/**
* @class Function
* These functions are available on every Function object (any JavaScript function).
*/
@@ -549,7 +568,8 @@ var sayGoodbye = sayHi.createSequence(function(name){
sayGoodbye('Fred'); // both alerts show
* @param {Function} fcn The function to sequence
- * @param {Object} scope (optional) The scope of the passed fcn (Defaults to scope of original function or window)
+ * @param {Object} scope (optional) The scope (this reference) in which the passed function is executed.
+ * If omitted, defaults to the scope in which the original function is called or the browser window.
* @return {Function} The new function
*/
createSequence : function(fcn, scope){
@@ -565,7 +585,7 @@ sayGoodbye('Fred'); // both alerts show
});
-/**
+/**
* @class String
* These functions are available as static methods on the JavaScript String object.
*/