X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/25ef3491bd9ae007ff1fc2b0d7943e6eaaccf775..92c2b89db26be16707f4a805d3303ab2531006e1:/src/widgets/Window.js diff --git a/src/widgets/Window.js b/src/widgets/Window.js index 6eff473e..e4d967e8 100644 --- a/src/widgets/Window.js +++ b/src/widgets/Window.js @@ -1,6 +1,6 @@ /*! - * Ext JS Library 3.0.3 - * 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 */ @@ -50,8 +50,13 @@ Ext.Window = Ext.extend(Ext.Panel, { * A reference to the WindowGroup that should manage this window (defaults to {@link Ext.WindowMgr}). */ /** - * @cfg {String/Number/Button} defaultButton - * The id / index of a button or a button instance to focus when this window received the focus. + * @cfg {String/Number/Component} defaultButton + *
Specifies a Component to receive focus when this Window is focussed.
+ *This may be one of:
this
reference) in which the callback is executed. Defaults to this Window.
* @return {Ext.Window} this
*/
show : function(animateTarget, cb, scope){
@@ -523,13 +524,16 @@ Ext.Window = Ext.extend(Ext.Panel, {
// private
afterShow : function(isAnim){
+ if (this.isDestroyed){
+ return false;
+ }
this.proxy.hide();
this.el.setStyle('display', 'block');
this.el.show();
if(this.maximized){
this.fitContainer();
}
- if(Ext.isMac && Ext.isGecko){ // work around stupid FF 2.0/Mac scroll bar bug
+ if(Ext.isMac && Ext.isGecko2){ // work around stupid FF 2.0/Mac scroll bar bug
this.cascade(this.setAutoScroll);
}
@@ -547,6 +551,7 @@ Ext.Window = Ext.extend(Ext.Panel, {
var sz = this.getSize();
this.onResize(sz.width, sz.height);
}
+ this.onShow();
this.fireEvent('show', this);
},
@@ -571,7 +576,7 @@ Ext.Window = Ext.extend(Ext.Panel, {
* @param {String/Element} animateTarget (optional) The target element or id to which the window should
* animate while hiding (defaults to null with no animation)
* @param {Function} callback (optional) A callback function to call after the window is hidden
- * @param {Object} scope (optional) The scope in which to execute the callback
+ * @param {Object} scope (optional) The scope (this
reference) in which the callback is executed. Defaults to this Window.
* @return {Ext.Window} this
*/
hide : function(animateTarget, cb, scope){
@@ -607,6 +612,7 @@ Ext.Window = Ext.extend(Ext.Panel, {
if(this.keyMap){
this.keyMap.disable();
}
+ this.onHide();
this.fireEvent('hide', this);
},
@@ -626,6 +632,18 @@ Ext.Window = Ext.extend(Ext.Panel, {
}));
},
+ /**
+ * Method that is called immediately before the show
event is fired.
+ * Defaults to Ext.emptyFn
.
+ */
+ onShow : Ext.emptyFn,
+
+ /**
+ * Method that is called immediately before the hide
event is fired.
+ * Defaults to Ext.emptyFn
.
+ */
+ onHide : Ext.emptyFn,
+
// private
onWindowResize : function(){
if(this.maximized){
@@ -683,7 +701,7 @@ Ext.Window = Ext.extend(Ext.Panel, {
if(show !== false){
this.el.show();
this.focus();
- if(Ext.isMac && Ext.isGecko){ // work around stupid FF 2.0/Mac scroll bar bug
+ if(Ext.isMac && Ext.isGecko2){ // work around stupid FF 2.0/Mac scroll bar bug
this.cascade(this.setAutoScroll);
}
}
@@ -723,7 +741,7 @@ Ext.Window = Ext.extend(Ext.Panel, {
}
}
},
-
+
// private
doClose : function(){
this.fireEvent('close', this);
@@ -773,9 +791,14 @@ Ext.Window = Ext.extend(Ext.Panel, {
*/
restore : function(){
if(this.maximized){
+ var t = this.tools;
this.el.removeClass('x-window-maximized');
- this.tools.restore.hide();
- this.tools.maximize.show();
+ if(t.restore){
+ t.restore.hide();
+ }
+ if(t.maximize){
+ t.maximize.show();
+ }
this.setPosition(this.restorePos[0], this.restorePos[1]);
this.setSize(this.restoreSize.width, this.restoreSize.height);
delete this.restorePos;
@@ -786,8 +809,8 @@ Ext.Window = Ext.extend(Ext.Panel, {
if(this.dd){
this.dd.unlock();
}
- if(this.collapsible){
- this.tools.toggle.show();
+ if(this.collapsible && t.toggle){
+ t.toggle.show();
}
this.container.removeClass('x-window-maximized-ct');
@@ -808,7 +831,7 @@ Ext.Window = Ext.extend(Ext.Panel, {
// private
fitContainer : function(){
- var vs = this.container.getViewSize();
+ var vs = this.container.getViewSize(false);
this.setSize(vs.width, vs.height);
},
@@ -831,7 +854,7 @@ Ext.Window = Ext.extend(Ext.Panel, {
/**
* Aligns the window to the specified element
* @param {Mixed} element The element to align to.
- * @param {String} position The position to align to (see {@link Ext.Element#alignTo} for more details).
+ * @param {String} position (optional, defaults to "tl-bl?") The position to align to (see {@link Ext.Element#alignTo} for more details).
* @param {Array} offsets (optional) Offset the positioning by [x, y]
* @return {Ext.Window} this
*/
@@ -865,7 +888,6 @@ Ext.Window = Ext.extend(Ext.Panel, {
Ext.EventManager.on(window, 'scroll', this.doAnchor, this,
{buffer: tm == 'number' ? monitorScroll : 50});
}
- this.doAnchor();
return this;
},