Author: nbelaevski
Date: 2011-01-31 12:24:35 -0500 (Mon, 31 Jan 2011)
New Revision: 21337
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js
Log:
https://issues.jboss.org/browse/RF-10382
Modified:
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js
===================================================================
---
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2011-01-31
17:19:56 UTC (rev 21336)
+++
trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2011-01-31
17:24:35 UTC (rev 21337)
@@ -143,6 +143,17 @@
getMinimumSize : function(size) {
return Math.max(size, 2 * this.getInitialSize() + 2);
},
+
+ __getParsedOption: function(options, name) {
+ var value = parseInt(options[name], 10);
+
+ if (value < 0 || isNaN(value)) {
+ value = this[name];
+ }
+
+ return value;
+ },
+
destroy: function() {
this._contentElement = null;
@@ -268,8 +279,8 @@
$.extend(this.userOptions, opts);
}
- this.currentMinHeight = this.getMinimumSize((options.minHeight ||
options.minHeight == 0) ? options.minHeight : this.minHeight);
- this.currentMinWidth = this.getMinimumSize((options.minWidth ||
options.minWidth == 0) ? options.minWidth : this.minWidth);
+ this.currentMinHeight =
this.getMinimumSize(this.__getParsedOption(options, 'minHeight'));
+ this.currentMinWidth =
this.getMinimumSize(this.__getParsedOption(options, 'minWidth'));
var eContentElt = this.getContentElement();