'+cfg.text+"
";};
- if(!Ext.isEmpty(cfg.scripts)){me.loadScripts = cfg.scripts;};
- if(!Ext.isEmpty(cfg.timeout)){me.timeout = cfg.timeout;};
- }
- me.showLoading();
-
- if(!discardUrl){
- me.defaultUrl = url;
- }
- if(Ext.isFunction(url)){
- url = url.call(me);
- }
-
- var o = Ext.apply({}, {
- url : url,
- params: (Ext.isFunction(params) && callerScope) ? params.createDelegate(callerScope) : params,
- success: processSuccess,
- failure: processFailure,
- scope: me,
- callback: undefined,
- timeout: (me.timeout*1000),
- disableCaching: me.disableCaching,
- argument: {
- "options": cfg,
- "url": url,
- "form": null,
- "callback": callback,
- "scope": callerScope || window,
- "params": params
- }
- }, cfg);
-
- me.transaction = Ext.Ajax.request(o);
- }
- },
+ getDefaultRenderer: function() {
+ return new Ext.Updater.BasicRenderer();
+ },
-
- formUpdate : function(form, url, reset, callback){
- var me = this;
- if(me.fireEvent(BEFOREUPDATE, me.el, form, url) !== false){
- if(Ext.isFunction(url)){
- url = url.call(me);
- }
- form = Ext.getDom(form)
- me.transaction = Ext.Ajax.request({
- form: form,
- url:url,
- success: processSuccess,
- failure: processFailure,
- scope: me,
- timeout: (me.timeout*1000),
- argument: {
- "url": url,
- "form": form,
- "callback": callback,
- "reset": reset
- }
- });
- me.showLoading.defer(1, me);
- }
- },
-
-
- startAutoRefresh : function(interval, url, params, callback, refreshNow){
- var me = this;
- if(refreshNow){
- me.update(url || me.defaultUrl, params, callback, true);
- }
- if(me.autoRefreshProcId){
- clearInterval(me.autoRefreshProcId);
- }
- me.autoRefreshProcId = setInterval(me.update.createDelegate(me, [url || me.defaultUrl, params, callback, true]), interval * 1000);
- },
-
-
- stopAutoRefresh : function(){
- if(this.autoRefreshProcId){
- clearInterval(this.autoRefreshProcId);
- delete this.autoRefreshProcId;
- }
- },
-
-
- isAutoRefreshing : function(){
- return !!this.autoRefreshProcId;
- },
-
-
- showLoading : function(){
- if(this.showLoadIndicator){
- this.el.dom.innerHTML = this.indicatorText;
- }
- },
-
-
- abort : function(){
- if(this.transaction){
- Ext.Ajax.abort(this.transaction);
- }
- },
-
-
- isUpdating : function(){
- return this.transaction ? Ext.Ajax.isLoading(this.transaction) : false;
- },
-
-
- refresh : function(callback){
- if(this.defaultUrl){
- this.update(this.defaultUrl, null, callback, true);
- }
- }
+
+ setDefaultUrl : function(defaultUrl){
+ this.defaultUrl = defaultUrl;
+ },
+
+
+ getEl : function(){
+ return this.el;
+ },
+
+
+ update : function(url, params, callback, discardUrl){
+ var me = this,
+ cfg,
+ callerScope;
+
+ if(me.fireEvent(BEFOREUPDATE, me.el, url, params) !== false){
+ if(Ext.isObject(url)){
+ cfg = url;
+ url = cfg.url;
+ params = params || cfg.params;
+ callback = callback || cfg.callback;
+ discardUrl = discardUrl || cfg.discardUrl;
+ callerScope = cfg.scope;
+ if(!Ext.isEmpty(cfg.nocache)){me.disableCaching = cfg.nocache;};
+ if(!Ext.isEmpty(cfg.text)){me.indicatorText = ''+cfg.text+"
";};
+ if(!Ext.isEmpty(cfg.scripts)){me.loadScripts = cfg.scripts;};
+ if(!Ext.isEmpty(cfg.timeout)){me.timeout = cfg.timeout;};
+ }
+ me.showLoading();
+
+ if(!discardUrl){
+ me.defaultUrl = url;
+ }
+ if(Ext.isFunction(url)){
+ url = url.call(me);
+ }
+
+ var o = Ext.apply({}, {
+ url : url,
+ params: (Ext.isFunction(params) && callerScope) ? params.createDelegate(callerScope) : params,
+ success: processSuccess,
+ failure: processFailure,
+ scope: me,
+ callback: undefined,
+ timeout: (me.timeout*1000),
+ disableCaching: me.disableCaching,
+ argument: {
+ "options": cfg,
+ "url": url,
+ "form": null,
+ "callback": callback,
+ "scope": callerScope || window,
+ "params": params
+ }
+ }, cfg);
+
+ me.transaction = Ext.Ajax.request(o);
+ }
+ },
+
+
+ formUpdate : function(form, url, reset, callback){
+ var me = this;
+ if(me.fireEvent(BEFOREUPDATE, me.el, form, url) !== false){
+ if(Ext.isFunction(url)){
+ url = url.call(me);
+ }
+ form = Ext.getDom(form);
+ me.transaction = Ext.Ajax.request({
+ form: form,
+ url:url,
+ success: processSuccess,
+ failure: processFailure,
+ scope: me,
+ timeout: (me.timeout*1000),
+ argument: {
+ "url": url,
+ "form": form,
+ "callback": callback,
+ "reset": reset
+ }
+ });
+ me.showLoading.defer(1, me);
+ }
+ },
+
+
+ startAutoRefresh : function(interval, url, params, callback, refreshNow){
+ var me = this;
+ if(refreshNow){
+ me.update(url || me.defaultUrl, params, callback, true);
+ }
+ if(me.autoRefreshProcId){
+ clearInterval(me.autoRefreshProcId);
+ }
+ me.autoRefreshProcId = setInterval(me.update.createDelegate(me, [url || me.defaultUrl, params, callback, true]), interval * 1000);
+ },
+
+
+ stopAutoRefresh : function(){
+ if(this.autoRefreshProcId){
+ clearInterval(this.autoRefreshProcId);
+ delete this.autoRefreshProcId;
+ }
+ },
+
+
+ isAutoRefreshing : function(){
+ return !!this.autoRefreshProcId;
+ },
+
+
+ showLoading : function(){
+ if(this.showLoadIndicator){
+ this.el.dom.innerHTML = this.indicatorText;
+ }
+ },
+
+
+ abort : function(){
+ if(this.transaction){
+ Ext.Ajax.abort(this.transaction);
+ }
+ },
+
+
+ isUpdating : function(){
+ return this.transaction ? Ext.Ajax.isLoading(this.transaction) : false;
+ },
+
+
+ refresh : function(callback){
+ if(this.defaultUrl){
+ this.update(this.defaultUrl, null, callback, true);
+ }
+ }
}
}());
Ext.Updater.defaults = {
- timeout : 30,
+ timeout : 30,
disableCaching : false,
@@ -6690,7 +6994,7 @@ Ext.Updater.defaults = {
loadScripts : false,
- sslBlankUrl : Ext.SSL_SECURE_URL
+ sslBlankUrl : Ext.SSL_SECURE_URL
};
@@ -6706,7 +7010,7 @@ Ext.Updater.BasicRenderer = function(){};
Ext.Updater.BasicRenderer.prototype = {
- render : function(el, response, updateManager, callback){
+ render : function(el, response, updateManager, callback){
el.update(response.responseText, updateManager.loadScripts, callback);
}
};
@@ -6740,14 +7044,14 @@ Date.formatCodeToRegex = function(character, currentGroup) {
Date.parseCodes[character] = p;
}
- return p? Ext.applyIf({
- c: p.c? xf(p.c, currentGroup || "{0}") : p.c
+ return p ? Ext.applyIf({
+ c: p.c ? xf(p.c, currentGroup || "{0}") : p.c
}, p) : {
g:0,
c:null,
s:Ext.escapeRe(character)
}
-}
+};
var $f = Date.formatCodeToRegex;
@@ -6984,15 +7288,15 @@ Ext.apply(Date, {
"dt = (new Date()).clearTime();",
- "y = y >= 0? y : Ext.num(def.y, dt.getFullYear());",
- "m = m >= 0? m : Ext.num(def.m - 1, dt.getMonth());",
- "d = d >= 0? d : Ext.num(def.d, dt.getDate());",
+ "y = Ext.num(y, Ext.num(def.y, dt.getFullYear()));",
+ "m = Ext.num(m, Ext.num(def.m - 1, dt.getMonth()));",
+ "d = Ext.num(d, Ext.num(def.d, dt.getDate()));",
- "h = h || Ext.num(def.h, dt.getHours());",
- "i = i || Ext.num(def.i, dt.getMinutes());",
- "s = s || Ext.num(def.s, dt.getSeconds());",
- "ms = ms || Ext.num(def.ms, dt.getMilliseconds());",
+ "h = Ext.num(h, Ext.num(def.h, dt.getHours()));",
+ "i = Ext.num(i, Ext.num(def.i, dt.getMinutes()));",
+ "s = Ext.num(s, Ext.num(def.s, dt.getSeconds()));",
+ "ms = Ext.num(ms, Ext.num(def.ms, dt.getMilliseconds()));",
"if(z >= 0 && y >= 0){",
@@ -7051,7 +7355,7 @@ Ext.apply(Date, {
}
}
- Date.parseRegexes[regexNum] = new RegExp("^" + regex.join('') + "$", "i");
+ Date.parseRegexes[regexNum] = new RegExp("^" + regex.join('') + "$");
Date.parseFunctions[format] = new Function("input", "strict", xf(code, regexNum, calc.join('')));
}
}(),
@@ -7534,6 +7838,7 @@ if (Ext.isSafari && (navigator.userAgent.match(/WebKit\/(\d+)/)[1] || NaN) < 420
+
Ext.util.MixedCollection = function(allowFunctions, keyFn){
this.items = [];
this.map = {};
@@ -7717,7 +8022,7 @@ Ext.extend(Ext.util.MixedCollection, Ext.util.Observable, {
item : function(key){
var mk = this.map[key],
item = mk !== undefined ? mk : (typeof key == 'number') ? this.items[key] : undefined;
- return !Ext.isFunction(item) || this.allowFunctions ? item : null;
+ return typeof item != 'function' || this.allowFunctions ? item : null;
},
@@ -7761,17 +8066,29 @@ Ext.extend(Ext.util.MixedCollection, Ext.util.Observable, {
_sort : function(property, dir, fn){
- var i,
- len,
- dsc = String(dir).toUpperCase() == 'DESC' ? -1 : 1,
- c = [], k = this.keys, items = this.items;
+ var i, len,
+ dsc = String(dir).toUpperCase() == 'DESC' ? -1 : 1,
- fn = fn || function(a, b){
- return a-b;
+
+ c = [],
+ keys = this.keys,
+ items = this.items;
+
+
+ fn = fn || function(a, b) {
+ return a - b;
};
+
+
for(i = 0, len = items.length; i < len; i++){
- c[c.length] = {key: k[i], value: items[i], index: i};
+ c[c.length] = {
+ key : keys[i],
+ value: items[i],
+ index: i
+ };
}
+
+
c.sort(function(a, b){
var v = fn(a[property], b[property]) * dsc;
if(v === 0){
@@ -7779,10 +8096,13 @@ Ext.extend(Ext.util.MixedCollection, Ext.util.Observable, {
}
return v;
});
+
+
for(i = 0, len = c.length; i < len; i++){
items[i] = c[i].value;
- k[i] = c[i].key;
+ keys[i] = c[i].key;
}
+
this.fireEvent('sort', this);
},
@@ -7792,6 +8112,40 @@ Ext.extend(Ext.util.MixedCollection, Ext.util.Observable, {
},
+ reorder: function(mapping) {
+ this.suspendEvents();
+
+ var items = this.items,
+ index = 0,
+ length = items.length,
+ order = [],
+ remaining = [];
+
+
+ for (oldIndex in mapping) {
+ order[mapping[oldIndex]] = items[oldIndex];
+ }
+
+ for (index = 0; index < length; index++) {
+ if (mapping[index] == undefined) {
+ remaining.push(items[index]);
+ }
+ }
+
+ for (index = 0; index < length; index++) {
+ if (order[index] == undefined) {
+ order[index] = remaining.shift();
+ }
+ }
+
+ this.clear();
+ this.addAll(order);
+
+ this.resumeEvents();
+ this.fireEvent('sort', this);
+ },
+
+
keySort : function(dir, fn){
this._sort('key', dir, fn || function(a, b){
var v1 = String(a).toUpperCase(), v2 = String(b).toUpperCase();
@@ -7871,6 +8225,7 @@ Ext.extend(Ext.util.MixedCollection, Ext.util.Observable, {
if (!value.exec) {
var er = Ext.escapeRe;
value = String(value);
+
if (anyMatch === true) {
value = er(value);
} else {
@@ -7897,6 +8252,7 @@ Ext.extend(Ext.util.MixedCollection, Ext.util.Observable, {
});
Ext.util.MixedCollection.prototype.get = Ext.util.MixedCollection.prototype.item;
+
Ext.util.JSON = new (function(){
var useHasOwn = !!{}.hasOwnProperty,
isNative = function() {
@@ -8002,6 +8358,7 @@ Ext.util.JSON = new (function(){
return a.join("");
};
+
this.encodeDate = function(o){
return '"' + o.getFullYear() + "-" +
pad(o.getMonth() + 1) + "-" +
@@ -8047,7 +8404,7 @@ Ext.util.Format = function(){
stripTagsRE = /<\/?[^>]+>/gi,
stripScriptsRe = /(?:'); @@ -8280,31 +8642,31 @@ Ext.XTemplate = function(){ Ext.XTemplate.superclass.constructor.apply(this, arguments); var me = this, - s = me.html, - re = /
| ',
+ ' | ',
+ '',
+ '
| ',
+ '
"); + }, + + + sortErrors: function() { + var fields = this.items; + + this.fieldErrors.sort("ASC", function(a, b) { + var findByName = function(key) { + return function(field) { + return field.getName() == key; + }; + }; + + var aIndex = fields.findIndexBy(findByName(a.field)), + bIndex = fields.findIndexBy(findByName(b.field)); + + return aIndex < bIndex ? -1 : 1; + }); + }, + + + reset: function() { + this.eachItem(function(item) { + item.reset(); + }); + + + + (function() { + this.clearInvalid(); + }).defer(50, this); + }, + + + clearInvalidChildren: function() { + this.eachItem(function(item) { + item.clearInvalid(); + }); + }, + + + buildLabel: function(segments) { + return segments.join(", "); + }, + + + isDirty: function(){ + + if (this.disabled || !this.rendered) { + return false; + } + + var dirty = false; + this.eachItem(function(item){ + if(item.isDirty()){ + dirty = true; + return false; + } + }); + return dirty; + }, + + + eachItem: function(fn, scope) { + if(this.items && this.items.each){ + this.items.each(fn, scope || this); + } + }, + + + onResize: function(adjWidth, adjHeight, rawWidth, rawHeight) { + var innerCt = this.innerCt; + + if (this.rendered && innerCt.rendered) { + innerCt.setSize(adjWidth, adjHeight); + } + + Ext.form.CompositeField.superclass.onResize.apply(this, arguments); + }, + + + doLayout: function(shallow, force) { + if (this.rendered) { + var innerCt = this.innerCt; + + innerCt.forceLayout = this.ownerCt.forceLayout; + innerCt.doLayout(shallow, force); + } + }, + + + beforeDestroy: function(){ + Ext.destroy(this.innerCt); + + Ext.form.CompositeField.superclass.beforeDestroy.call(this); + }, + + + setReadOnly : function(readOnly) { + readOnly = readOnly || true; + + if(this.rendered){ + this.eachItem(function(item){ + item.setReadOnly(readOnly); + }); + } + this.readOnly = readOnly; + }, + + onShow : function() { + Ext.form.CompositeField.superclass.onShow.call(this); + this.doLayout(); + }, + + + onDisable : function(){ + this.eachItem(function(item){ + item.disable(); + }); + }, + + + onEnable : function(){ + this.eachItem(function(item){ + item.enable(); + }); + } +}); + +Ext.reg('compositefield', Ext.form.CompositeField); + Ext.form.Radio = Ext.extend(Ext.form.Checkbox, { inputType: 'radio', @@ -38053,7 +40382,7 @@ Ext.form.Radio = Ext.extend(Ext.form.Checkbox, { setValue : function(v){ if (typeof v == 'boolean') { Ext.form.Radio.superclass.setValue.call(this, v); - } else { + } else if (this.rendered) { var r = this.getCheckEl().child('input[name=' + this.el.dom.name + '][value=' + v + ']', true); if(r){ Ext.getCmp(r.id).setValue(true); @@ -38061,7 +40390,7 @@ Ext.form.Radio = Ext.extend(Ext.form.Checkbox, { } return this; }, - + getCheckEl: function(){ if(this.inGroup){ @@ -38181,31 +40510,32 @@ Ext.form.Hidden = Ext.extend(Ext.form.Field, { clearInvalid : Ext.emptyFn }); Ext.reg('hidden', Ext.form.Hidden); -Ext.form.BasicForm = function(el, config){ - Ext.apply(this, config); - if(Ext.isString(this.paramOrder)){ - this.paramOrder = this.paramOrder.split(/[\s,|]/); - } - - this.items = new Ext.util.MixedCollection(false, function(o){ - return o.getItemId(); - }); - this.addEvents( - - 'beforeaction', - - 'actionfailed', +Ext.form.BasicForm = Ext.extend(Ext.util.Observable, { + + constructor: function(el, config){ + Ext.apply(this, config); + if(Ext.isString(this.paramOrder)){ + this.paramOrder = this.paramOrder.split(/[\s,|]/); + } - 'actioncomplete' - ); + this.items = new Ext.util.MixedCollection(false, function(o){ + return o.getItemId(); + }); + this.addEvents( + + 'beforeaction', + + 'actionfailed', + + 'actioncomplete' + ); - if(el){ - this.initEl(el); - } - Ext.form.BasicForm.superclass.constructor.call(this); -}; + if(el){ + this.initEl(el); + } + Ext.form.BasicForm.superclass.constructor.call(this); + }, -Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { @@ -38222,7 +40552,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { paramsAsHash: false, - + waitTitle: 'Please Wait...', @@ -38256,14 +40586,14 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { }, - destroy: function() { - this.items.each(function(f){ - Ext.destroy(f); - }); - if(this.el){ - this.el.removeAllListeners(); - this.el.remove(); + destroy: function(bound){ + if(bound !== true){ + this.items.each(function(f){ + Ext.destroy(f); + }); + Ext.destroy(this.el); } + this.items.clear(); this.purgeListeners(); }, @@ -38304,8 +40634,9 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { submit : function(options){ + options = options || {}; if(this.standardSubmit){ - var v = this.isValid(); + var v = options.clientValidation === false || this.isValid(); if(v){ var el = this.el.dom; if(this.url && Ext.isEmpty(el.action)){ @@ -38349,6 +40680,12 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { beforeAction : function(action){ + + this.items.each(function(f){ + if(f.isFormField && f.syncValue){ + f.syncValue(); + } + }); var o = action.options; if(o.waitMsg){ if(this.waitMsgTarget === true){ @@ -38389,15 +40726,23 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { }, - findField : function(id){ + findField : function(id) { var field = this.items.get(id); - if(!Ext.isObject(field)){ - this.items.each(function(f){ - if(f.isFormField && (f.dataIndex == id || f.id == id || f.getName() == id)){ - field = f; - return false; + + if (!Ext.isObject(field)) { + + var findMatchingField = function(f) { + if (f.isFormField) { + if (f.dataIndex == id || f.id == id || f.getName() == id) { + field = f; + return false; + } else if (f.isComposite && f.rendered) { + return f.items.each(findMatchingField); + } } - }); + }; + + this.items.each(findMatchingField); } return field || null; }, @@ -38405,7 +40750,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { markInvalid : function(errors){ - if(Ext.isArray(errors)){ + if (Ext.isArray(errors)) { for(var i = 0, len = errors.length; i < len; i++){ var fieldError = errors[i]; var f = this.findField(fieldError.id); @@ -38413,7 +40758,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { f.markInvalid(fieldError.msg); } } - }else{ + } else { var field, id; for(id in errors){ if(!Ext.isFunction(errors[id]) && (field = this.findField(id))){ @@ -38421,6 +40766,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { } } } + return this; }, @@ -38466,12 +40812,12 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { n, key, val; - this.items.each(function(f){ - if(dirtyOnly !== true || f.isDirty()){ + this.items.each(function(f) { + if (dirtyOnly !== true || f.isDirty()) { n = f.getName(); key = o[n]; val = f.getValue(); - + if(Ext.isDefined(key)){ if(Ext.isArray(key)){ o[n].push(val); @@ -38508,7 +40854,6 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { return this; }, - remove : function(field){ this.items.remove(field); @@ -38516,6 +40861,11 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { }, + cleanDestroyed : function() { + this.items.filterBy(function(o) { return !!o.isDestroyed; }).each(this.remove, this); + }, + + render : function(){ this.items.each(function(f){ if(f.isFormField && !f.rendered && document.getElementById(f.id)){ @@ -38554,6 +40904,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, { Ext.BasicForm = Ext.form.BasicForm; + Ext.FormPanel = Ext.extend(Ext.Panel, { @@ -38657,9 +41008,7 @@ Ext.FormPanel = Ext.extend(Ext.Panel, { beforeDestroy : function(){ this.stopMonitoring(); - - Ext.destroy(this.form); - this.form.items.clear(); + this.form.destroy(true); Ext.FormPanel.superclass.beforeDestroy.call(this); }, @@ -38720,16 +41069,18 @@ Ext.FormPanel = Ext.extend(Ext.Panel, { }, - processRemove : function(c){ - - if(this.isField(c)){ - this.form.remove(c); - - }else if(c.findBy){ - var isDestroyed = function(o) { - return !!o.isDestroyed; + processRemove: function(c){ + if(!this.destroying){ + + if(this.isField(c)){ + this.form.remove(c); + + }else if (c.findBy){ + Ext.each(c.findBy(this.isField), this.form.remove, this.form); + if (c.isDestroyed) { + this.form.cleanDestroyed(); + } } - this.form.items.filterBy(isDestroyed, this.form).each(this.form.remove, this.form); } }, @@ -38822,7 +41173,7 @@ Ext.form.FieldSet = Ext.extend(Ext.Panel, { this.el = document.createElement('fieldset'); this.el.id = this.id; if (this.title || this.header || this.checkboxToggle) { - this.el.appendChild(document.createElement('legend')).className = 'x-fieldset-header'; + this.el.appendChild(document.createElement('legend')).className = this.baseCls + '-header'; } } @@ -38897,7 +41248,6 @@ Ext.form.FieldSet = Ext.extend(Ext.Panel, { }); Ext.reg('fieldset', Ext.form.FieldSet); - Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { enableFormat : true, @@ -38964,7 +41314,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { 'push', 'editmodechange' - ) + ); }, @@ -38987,7 +41337,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { createToolbar : function(editor){ var items = []; var tipsEnabled = Ext.QuickTips && Ext.QuickTips.isEnabled(); - + function btn(id, toggle, handler){ return { @@ -39013,7 +41363,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { html: this.createFontOptions() } }); - + items.push( fontSelectItem, '-' @@ -39124,16 +41474,16 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { ); } } - + var tb = new Ext.Toolbar({ renderTo: this.wrap.dom.firstChild, items: items }); - + if (fontSelectItem) { this.fontSelect = fontSelectItem.el; - + this.mon(this.fontSelect, 'change', function(){ var font = this.fontSelect.dom.value; this.relayCmd('fontname', font); @@ -39141,15 +41491,13 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { }, this); } - this.mon(tb.el, 'click', function(e){ e.preventDefault(); }); - - - + this.tb = tb; + this.tb.doLayout(); }, onDisable: function(){ @@ -39163,20 +41511,26 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { }, setReadOnly: function(readOnly){ + + Ext.form.HtmlEditor.superclass.setReadOnly.call(this, readOnly); if(this.initialized){ - var newDM = readOnly ? 'off' : 'on', - doc = this.getDoc(); - if(String(doc.designMode).toLowerCase() != newDM){ - doc.designMode = newDM; + if(Ext.isIE){ + this.getEditorBody().contentEditable = !readOnly; + }else{ + this.setDesignMode(!readOnly); + } + var bd = this.getEditorBody(); + if(bd){ + bd.style.cursor = this.readOnly ? 'default' : 'text'; } - this.disableItems(!readOnly); + this.disableItems(readOnly); } - Ext.form.HtmlEditor.superclass.setReadOnly.call(this, readOnly); }, getDocMarkup : function(){ - return ''; + var h = Ext.fly(this.iframe).getHeight() - this.iframePad * 2; + return String.format('', this.iframePad, h); }, @@ -39202,7 +41556,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { this.el.dom.setAttribute('tabIndex', -1); this.el.addClass('x-hidden'); if(Ext.isIE){ - this.el.applyStyles('margin-top:-1px;margin-bottom:-1px;') + this.el.applyStyles('margin-top:-1px;margin-bottom:-1px;'); } this.wrap = this.el.wrap({ cls:'x-html-editor-wrap', cn:{cls:'x-html-editor-tb'} @@ -39211,8 +41565,8 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { this.createToolbar(this); this.disableItems(true); - - + + this.tb.doLayout(); this.createIFrame(); @@ -39227,9 +41581,9 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { var iframe = document.createElement('iframe'); iframe.name = Ext.id(); iframe.frameBorder = '0'; - iframe.src = Ext.SSL_SECURE_URL; - this.wrap.dom.appendChild(iframe); + iframe.style.overflow = 'auto'; + this.wrap.dom.appendChild(iframe); this.iframe = iframe; this.monitorTask = Ext.TaskMgr.start({ @@ -39253,7 +41607,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { var doc = this.getDoc(); if(doc.body || doc.readyState == 'complete'){ Ext.TaskMgr.stop(task); - doc.designMode="on"; + this.setDesignMode(true); this.initEditor.defer(10, this); } }, @@ -39271,12 +41625,32 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { if(!doc){ return; } - if(!doc.editorInitialized || String(doc.designMode).toLowerCase() != 'on'){ + if(!doc.editorInitialized || this.getDesignMode() != 'on'){ this.initFrame(); } } }, + + setDesignMode : function(mode){ + var doc ; + if(doc = this.getDoc()){ + if(this.readOnly){ + mode = false; + } + doc.designMode = (/on|true/i).test(String(mode).toLowerCase()) ?'on':'off'; + } + + }, + + + getDesignMode : function(){ + var doc = this.getDoc(); + if(!doc){ return ''; } + return String(doc.designMode).toLowerCase(); + + }, + disableItems: function(disabled){ if(this.fontSelect){ this.fontSelect.dom.disabled = disabled; @@ -39312,45 +41686,55 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { toggleSourceEdit : function(sourceEditMode){ - if(sourceEditMode === undefined){ + var iframeHeight, + elHeight, + ls; + + if (sourceEditMode === undefined) { sourceEditMode = !this.sourceEditMode; } this.sourceEditMode = sourceEditMode === true; var btn = this.tb.getComponent('sourceedit'); - - if(btn.pressed !== this.sourceEditMode){ + + if (btn.pressed !== this.sourceEditMode) { btn.toggle(this.sourceEditMode); - if(!btn.xtbHidden){ + if (!btn.xtbHidden) { return; } } - if(this.sourceEditMode){ + if (this.sourceEditMode) { + + ls = this.getSize(); + + iframeHeight = Ext.get(this.iframe).getHeight(); + this.disableItems(true); this.syncValue(); this.iframe.className = 'x-hidden'; this.el.removeClass('x-hidden'); this.el.dom.removeAttribute('tabIndex'); this.el.focus(); - }else{ - if(this.initialized && !this.readOnly){ - this.disableItems(false); + this.el.dom.style.height = iframeHeight + 'px'; + } + else { + elHeight = parseInt(this.el.dom.style.height, 10); + if (this.initialized) { + this.disableItems(this.readOnly); } this.pushValue(); this.iframe.className = ''; this.el.addClass('x-hidden'); this.el.dom.setAttribute('tabIndex', -1); this.deferFocus(); - } - var lastSize = this.lastSize; - if(lastSize){ - delete this.lastSize; - this.setSize(lastSize); + + this.setSize(ls); + this.iframe.style.height = elHeight + 'px'; } this.fireEvent('editmodechange', this, this.sourceEditMode); }, - createLink : function(){ + createLink : function() { var url = prompt(this.createLinkText, this.defaultLinkValue); if(url && url != 'http:/'+'/'){ this.relayCmd('createlink', url); @@ -39426,14 +41810,12 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { this.getEditorBody().innerHTML = v; if(Ext.isGecko){ - var d = this.getDoc(), - mode = d.designMode.toLowerCase(); - - d.designMode = mode.toggle('on', 'off'); - d.designMode = mode; + this.setDesignMode(false); + this.setDesignMode(true); } this.fireEvent('push', this, v); } + } }, @@ -39456,15 +41838,15 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { try{ var dbody = this.getEditorBody(), - ss = this.el.getStyles('font-size', 'font-family', 'background-image', 'background-repeat'), + ss = this.el.getStyles('font-size', 'font-family', 'background-image', 'background-repeat', 'background-color', 'color'), doc, fn; - + ss['background-attachment'] = 'fixed'; dbody.bgProperties = 'fixed'; Ext.DomHelper.applyStyles(dbody, ss); - + doc = this.getDoc(); if(doc){ @@ -39518,7 +41900,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { this.wrap.remove(); } } - + if(this.el){ this.el.removeAllListeners(); this.el.remove(); @@ -39529,7 +41911,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { onFirstFocus : function(){ this.activated = true; - this.disableItems(false); + this.disableItems(this.readOnly); if(Ext.isGecko){ this.win.focus(); var s = this.win.getSelection(); @@ -39596,7 +41978,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { return; } - var btns = this.tb.items.map, + var btns = this.tb.items.map, doc = this.getDoc(); if(this.enableFont && !Ext.isSafari2){ @@ -39698,7 +42080,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { fixKeys : function(){ if(Ext.isIE){ return function(e){ - var k = e.getKey(), + var k = e.getKey(), doc = this.getDoc(), r; if(k == e.TAB){ @@ -39863,6 +42245,7 @@ Ext.form.HtmlEditor = Ext.extend(Ext.form.Field, { }); Ext.reg('htmleditor', Ext.form.HtmlEditor); + Ext.form.TimeField = Ext.extend(Ext.form.ComboBox, { minValue : undefined, @@ -39877,7 +42260,7 @@ Ext.form.TimeField = Ext.extend(Ext.form.ComboBox, { format : "g:i A", - altFormats : "g:ia|g:iA|g:i a|g:i A|h:i|g:i|H:i|ga|ha|gA|h a|g a|g A|gi|hi|gia|hia|g|H", + altFormats : "g:ia|g:iA|g:i a|g:i A|h:i|g:i|H:i|ga|ha|gA|h a|g a|g A|gi|hi|gia|hia|g|H|gi a|hi a|giA|hiA|gi A|hi A", increment: 15, @@ -39887,12 +42270,14 @@ Ext.form.TimeField = Ext.extend(Ext.form.ComboBox, { triggerAction: 'all', typeAhead: false, - + initDate: '1/1/2008', + initDateFormat: 'j/n/Y', + initComponent : function(){ if(Ext.isDefined(this.minValue)){ @@ -39906,7 +42291,7 @@ Ext.form.TimeField = Ext.extend(Ext.form.ComboBox, { } Ext.form.TimeField.superclass.initComponent.call(this); }, - + setMinValue: function(value, initial){ this.setLimit(value, true, initial); @@ -39918,13 +42303,13 @@ Ext.form.TimeField = Ext.extend(Ext.form.ComboBox, { this.setLimit(value, false, initial); return this; }, - + generateStore: function(initial){ var min = this.minValue || new Date(this.initDate).clearTime(), max = this.maxValue || new Date(this.initDate).clearTime().add('mi', (24 * 60) - 1), times = []; - + while(min <= max){ times.push(min.dateFormat(this.format)); min = min.add('mi', this.increment); @@ -39942,14 +42327,14 @@ Ext.form.TimeField = Ext.extend(Ext.form.ComboBox, { } if(d){ var val = new Date(this.initDate).clearTime(); - val.setHours(d.getHours(), d.getMinutes(), isMin ? 0 : 59, 0); + val.setHours(d.getHours(), d.getMinutes(), d.getSeconds(), d.getMilliseconds()); this[isMin ? 'minValue' : 'maxValue'] = val; if(!initial){ this.generateStore(); } } }, - + getValue : function(){ var v = Ext.form.TimeField.superclass.getValue.call(this); @@ -39963,24 +42348,141 @@ Ext.form.TimeField = Ext.extend(Ext.form.ComboBox, { validateValue : Ext.form.DateField.prototype.validateValue, - parseDate : Ext.form.DateField.prototype.parseDate, + formatDate : Ext.form.DateField.prototype.formatDate, - - beforeBlur : function(){ - var v = this.parseDate(this.getRawValue()); - if(v){ - this.setValue(v.dateFormat(this.format)); + parseDate: function(value) { + if (!value || Ext.isDate(value)) { + return value; } - Ext.form.TimeField.superclass.beforeBlur.call(this); - } + var id = this.initDate + ' ', + idf = this.initDateFormat + ' ', + v = Date.parseDate(id + value, idf + this.format), + af = this.altFormats; + + if (!v && af) { + if (!this.altFormatsArray) { + this.altFormatsArray = af.split("|"); + } + for (var i = 0, afa = this.altFormatsArray, len = afa.length; i < len && !v; i++) { + v = Date.parseDate(id + value, idf + afa[i]); + } + } + + return v; + } +}); +Ext.reg('timefield', Ext.form.TimeField); +Ext.form.SliderField = Ext.extend(Ext.form.Field, { + + + useTips : true, + + + tipText : null, + + + actionMode: 'wrap', + + + initComponent : function() { + var cfg = Ext.copyTo({ + id: this.id + '-slider' + }, this.initialConfig, ['vertical', 'minValue', 'maxValue', 'decimalPrecision', 'keyIncrement', 'increment', 'clickToChange', 'animate']); + + + if (this.useTips) { + var plug = this.tipText ? {getText: this.tipText} : {}; + cfg.plugins = [new Ext.slider.Tip(plug)]; + } + this.slider = new Ext.Slider(cfg); + Ext.form.SliderField.superclass.initComponent.call(this); + }, + + + onRender : function(ct, position){ + this.autoCreate = { + id: this.id, + name: this.name, + type: 'hidden', + tag: 'input' + }; + Ext.form.SliderField.superclass.onRender.call(this, ct, position); + this.wrap = this.el.wrap({cls: 'x-form-field-wrap'}); + this.resizeEl = this.positionEl = this.wrap; + this.slider.render(this.wrap); + }, + + + onResize : function(w, h, aw, ah){ + Ext.form.SliderField.superclass.onResize.call(this, w, h, aw, ah); + this.slider.setSize(w, h); + }, + + + initEvents : function(){ + Ext.form.SliderField.superclass.initEvents.call(this); + this.slider.on('change', this.onChange, this); + }, + + + onChange : function(slider, v){ + this.setValue(v, undefined, true); + }, + + + onEnable : function(){ + Ext.form.SliderField.superclass.onEnable.call(this); + this.slider.enable(); + }, + + + onDisable : function(){ + Ext.form.SliderField.superclass.onDisable.call(this); + this.slider.disable(); + }, + + + beforeDestroy : function(){ + Ext.destroy(this.slider); + Ext.form.SliderField.superclass.beforeDestroy.call(this); + }, + + + alignErrorIcon : function(){ + this.errorIcon.alignTo(this.slider.el, 'tl-tr', [2, 0]); + }, + + + setMinValue : function(v){ + this.slider.setMinValue(v); + return this; + }, + setMaxValue : function(v){ + this.slider.setMaxValue(v); + return this; + }, + setValue : function(v, animate, silent){ + + + if(!silent){ + this.slider.setValue(v, animate); + } + return Ext.form.SliderField.superclass.setValue.call(this, this.slider.getValue()); + }, + + + getValue : function(){ + return this.slider.getValue(); + } }); -Ext.reg('timefield', Ext.form.TimeField); + +Ext.reg('sliderfield', Ext.form.SliderField); Ext.form.Label = Ext.extend(Ext.BoxComponent, { @@ -40039,6 +42541,8 @@ Ext.form.Action.prototype = { + + type : 'default', @@ -40136,10 +42640,20 @@ Ext.extend(Ext.form.Action.Submit, Ext.form.Action, { run : function(){ - var o = this.options; - var method = this.getMethod(); - var isGet = method == 'GET'; + var o = this.options, + method = this.getMethod(), + isGet = method == 'GET'; if(o.clientValidation === false || this.form.isValid()){ + if (o.submitEmptyText === false) { + var fields = this.form.items, + emptyFields = []; + fields.each(function(f) { + if (f.el.getValue() == f.emptyText) { + emptyFields.push(f); + f.el.dom.value = ""; + } + }); + } Ext.Ajax.request(Ext.apply(this.createCallback(o), { form:this.form.el.dom, url:this.getUrl(isGet), @@ -40148,6 +42662,13 @@ Ext.extend(Ext.form.Action.Submit, Ext.form.Action, { params:!isGet ? this.getParams() : null, isUpload: this.form.fileUpload })); + if (o.submitEmptyText === false) { + Ext.each(emptyFields, function(f) { + if (f.applyEmptyText) { + f.applyEmptyText(); + } + }); + } }else if (o.clientValidation !== false){ this.failureType = Ext.form.Action.CLIENT_INVALID; this.form.afterAction(this, false); @@ -40277,7 +42798,7 @@ Ext.form.Action.DirectLoad = Ext.extend(Ext.form.Action.Load, { this.result = result; return result; }, - + success : function(response, trans){ if(trans.type == Ext.Direct.exceptions.SERVER){ response = {}; @@ -40320,7 +42841,7 @@ Ext.form.Action.DirectSubmit = Ext.extend(Ext.form.Action.Submit, { this.result = result; return result; }, - + success : function(response, trans){ if(trans.type == Ext.Direct.exceptions.SERVER){ response = {}; @@ -40352,7 +42873,7 @@ Ext.form.VTypes = function(){ 'emailText' : 'This field should be an e-mail address in the format "user@example.com"', - 'emailMask' : /[a-z0-9_\.\-@]/i, + 'emailMask' : /[a-z0-9_\.\-@\+]/i, 'url' : function(v){ @@ -40360,7 +42881,7 @@ Ext.form.VTypes = function(){ }, 'urlText' : 'This field should be a URL in the format "http:/'+'/www.example.com"', - + 'alpha' : function(v){ return alpha.test(v); @@ -40380,6 +42901,7 @@ Ext.form.VTypes = function(){ 'alphanumMask' : /[a-z0-9_]/i }; }(); + Ext.grid.GridPanel = Ext.extend(Ext.Panel, { autoExpandColumn : false, @@ -40421,13 +42943,13 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { trackMouseOver : true, - stateEvents : ['columnmove', 'columnresize', 'sortchange'], + stateEvents : ['columnmove', 'columnresize', 'sortchange', 'groupchange'], view : null, - + bubbleEvents: [], - + @@ -40495,13 +43017,13 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { 'rowmousedown', 'headermousedown', - + 'groupmousedown', - + 'rowbodymousedown', - + 'containermousedown', @@ -40525,12 +43047,12 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { 'containerclick', 'containerdblclick', - + 'rowbodyclick', 'rowbodydblclick', - + 'rowcontextmenu', @@ -40552,6 +43074,8 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { 'sortchange', + 'groupchange', + 'reconfigure', 'viewready' @@ -40599,23 +43123,40 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { applyState : function(state){ var cm = this.colModel, - cs = state.columns; + cs = state.columns, + store = this.store, + s, + c, + oldIndex; + if(cs){ for(var i = 0, len = cs.length; i < len; i++){ - var s = cs[i], - c = cm.getColumnById(s.id); + s = cs[i]; + c = cm.getColumnById(s.id); if(c){ c.hidden = s.hidden; c.width = s.width; - var oldIndex = cm.getIndexById(s.id); + oldIndex = cm.getIndexById(s.id); if(oldIndex != i){ cm.moveColumn(oldIndex, i); } } } } - if(state.sort && this.store){ - this.store[this.store.remoteSort ? 'setDefaultSort' : 'sort'](state.sort.field, state.sort.direction); + if(store){ + s = state.sort; + if(s){ + store[store.remoteSort ? 'setDefaultSort' : 'sort'](s.field, s.direction); + } + s = state.group; + if(store.groupBy){ + if(s){ + store.groupBy(s); + }else{ + store.clearGrouping(); + } + } + } var o = Ext.apply({}, state); delete o.columns; @@ -40624,7 +43165,11 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { }, getState : function(){ - var o = {columns: []}; + var o = {columns: []}, + store = this.store, + ss, + gs; + for(var i = 0, c; (c = this.colModel.config[i]); i++){ o.columns[i] = { id: c.id, @@ -40634,11 +43179,17 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { o.columns[i].hidden = true; } } - if(this.store){ - var ss = this.store.getSortState(); + if(store){ + ss = store.getSortState(); if(ss){ o.sort = ss; } + if(store.getGroupState){ + gs = store.getGroupState(); + if(gs){ + o.group = gs; + } + } } return o; }, @@ -40650,7 +43201,10 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { this.on('bodyresize', v.layout, v); v.layout(); if(this.deferRowRender){ - v.afterRender.defer(10, this.view); + if (!this.deferRowRenderTask){ + this.deferRowRenderTask = new Ext.util.DelayedTask(v.afterRender, this.view); + } + this.deferRowRenderTask.delay(10); }else{ v.afterRender(); } @@ -40680,6 +43234,9 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { onDestroy : function(){ + if (this.deferRowRenderTask && this.deferRowRenderTask.cancel){ + this.deferRowRenderTask.cancel(); + } if(this.rendered){ Ext.destroy(this.view, this.loadMask); }else if(this.store && this.store.autoDestroy){ @@ -40692,31 +43249,6 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { processEvent : function(name, e){ - this.fireEvent(name, e); - var t = e.getTarget(), - v = this.view, - header = v.findHeaderIndex(t); - - if(header !== false){ - this.fireEvent('header' + name, this, header, e); - }else{ - var row = v.findRowIndex(t), - cell, - body; - if(row !== false){ - this.fireEvent('row' + name, this, row, e); - cell = v.findCellIndex(t); - body = v.findRowBody(t); - if(cell !== false){ - this.fireEvent('cell' + name, this, row, cell, e); - } - if(body){ - this.fireEvent('rowbody' + name, this, row, e); - } - }else{ - this.fireEvent('container' + name, this, e); - } - } this.view.processEvent(name, e); }, @@ -40742,11 +43274,12 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { walkCells : function(row, col, step, fn, scope){ - var cm = this.colModel, - clen = cm.getColumnCount(), - ds = this.store, - rlen = ds.getCount(), + var cm = this.colModel, + clen = cm.getColumnCount(), + ds = this.store, + rlen = ds.getCount(), first = true; + if(step < 0){ if(col < 0){ row--; @@ -40788,14 +43321,6 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { }, - onResize : function(){ - Ext.grid.GridPanel.superclass.onResize.apply(this, arguments); - if(this.viewReady){ - this.view.layout(); - } - }, - - getGridEl : function(){ return this.body; }, @@ -40889,24 +43414,36 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, { Ext.reg('grid', Ext.grid.GridPanel); Ext.grid.GridView = Ext.extend(Ext.util.Observable, { + + + + + deferEmptyText : true, + scrollOffset : undefined, + autoFill : false, + forceFit : false, + sortClasses : ['sort-asc', 'sort-desc'], + sortAscText : 'Sort Ascending', + sortDescText : 'Sort Descending', + columnsText : 'Columns', @@ -40923,7 +43460,7 @@ Ext.grid.GridView = Ext.extend(Ext.util.Observable, { cellSelectorDepth : 4, rowSelectorDepth : 10, - + rowBodySelectorDepth : 10, @@ -40931,35 +43468,35 @@ Ext.grid.GridView = Ext.extend(Ext.util.Observable, { cellSelector : 'td.x-grid3-cell', rowSelector : 'div.x-grid3-row', - + rowBodySelector : 'div.x-grid3-row-body', - + firstRowCls: 'x-grid3-row-first', lastRowCls: 'x-grid3-row-last', rowClsRe: /(?:^|\s+)x-grid3-row-(first|last|alt)(?:\s+|$)/g, - + constructor : function(config){ Ext.apply(this, config); - - this.addEvents( - - 'beforerowremoved', - - 'beforerowsinserted', - - 'beforerefresh', - - 'rowremoved', - - 'rowsinserted', - - 'rowupdated', - - 'refresh' - ); - Ext.grid.GridView.superclass.constructor.call(this); + + this.addEvents( + + 'beforerowremoved', + + 'beforerowsinserted', + + 'beforerefresh', + + 'rowremoved', + + 'rowsinserted', + + 'rowupdated', + + 'refresh' + ); + Ext.grid.GridView.superclass.constructor.call(this); }, @@ -40969,31 +43506,31 @@ Ext.grid.GridView = Ext.extend(Ext.util.Observable, { var ts = this.templates || {}; if(!ts.master){ ts.master = new Ext.Template( - '
',
- '',
- ' ',
- ' ',
- '
'
- );
+ '',
+ '',
+ ' ',
+ ' ',
+ '
'
+ );
}
if(!ts.header){
ts.header = new Ext.Template(
- '{body} |
{body} |