Author: nbelaevski
Date: 2009-03-31 13:26:13 -0400 (Tue, 31 Mar 2009)
New Revision: 13321
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
https://jira.jboss.org/jira/browse/RF-6027
Modified:
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
---
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-03-31
16:12:10 UTC (rev 13320)
+++
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-03-31
17:26:13 UTC (rev 13321)
@@ -203,9 +203,9 @@
destroy: function() {
- if( this.shown && this.options.autosized && this.observerSize)
- {
- window.clearInterval(this.observerSize);
+ if (this.observerSize) {
+ window.clearInterval(this.observerSize);
+ this.observerSize = null;
}
this._contentElement = null;
@@ -650,7 +650,7 @@
element.style.visibility = "hidden";
Element.show(element);
- this.correctShadowSizeEx();
+ this.correctShadowSize();
if (options.left) {
var _left;
@@ -797,7 +797,7 @@
this.shown = false;
- if (this.options.autosized) {
+ if (this.observerSize) {
window.clearInterval(this.observerSize);
this.observerSize = null;
}
@@ -904,7 +904,7 @@
Element.setStyle(eCdiv, cssHash);
- this.correctShadowSizeEx();
+ this.correctShadowSize();
Object.extend(this.userOptions, cssHash);
Object.extend(this.userOptions, cssHashWH);
@@ -979,12 +979,7 @@
}
},
- correctShadowSize: function(event) {
- this.correctShadowSizeEx();
- this.observerSize = null;
- },
-
- correctShadowSizeEx: function() {
+ correctShadowSize: function() {
var eShadowDiv = $(this.shadowDiv);
if (!eShadowDiv) {
return;