You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/26 01:36:12 UTC

svn commit: r989405 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js

Author: ivaynberg
Date: Wed Aug 25 23:36:11 2010
New Revision: 989405

URL: http://svn.apache.org/viewvc?rev=989405&view=rev
Log:

Issue: WICKET-2254

Modified:
    wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js

Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=989405&r1=989404&r2=989405&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js Wed Aug 25 23:36:11 2010
@@ -493,6 +493,15 @@ Wicket.Window.prototype = { 
 		var modalWidth = this.window.offsetWidth;
 		var modalHeight = this.window.offsetHeight;
 		
+		if (modalWidth > width - 10) { 
+			this.window.style.width = (width - 10) + "px"; 
+			modalWidth = this.window.offsetWidth; 
+		} 
+		if (modalHeight > height - 40) { 
+			this.content.style.height = (height - 40) + "px"; 
+			modalHeight = this.window.offsetHeight; 
+		} 
+		
 		var left = (width / 2) - (modalWidth / 2) + scLeft;
 		var top = (height / 2) - (modalHeight / 2) + scTop;
 		if (left < 0) left = 0;