[richfaces-svn-commits] JBoss Rich Faces SVN: r728 - trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-05-10 20:45:00 -0400 (Thu, 10 May 2007)
New Revision: 728

Modified:
   trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
   trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js
Log:
http://jira.jboss.com/jira/browse/RF-153 fixed

Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js	2007-05-10 18:25:35 UTC (rev 727)
+++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js	2007-05-11 00:45:00 UTC (rev 728)
@@ -449,8 +449,6 @@
 		var cssHash = {};
 		var cssHashWH = {};
 
-		var winSize = Richfaces.getWindowSize();
-
 		var vetoeChange = false;
 		var newSize;
 		// Avoid currentStyle bug in opera
@@ -465,7 +463,6 @@
 		if (newSize >= this.minWidth) {
 			if (diff.deltaWidth) {
 				cssHashWH.width = newSize + 'px';
-				maxX = winSize.width - newSize -1;
 			}
 		} else {
 			if (diff.deltaWidth) {

Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js
===================================================================
--- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js	2007-05-10 18:25:35 UTC (rev 727)
+++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanelBorders.js	2007-05-11 00:45:00 UTC (rev 728)
@@ -28,10 +28,6 @@
 		this.dragX = event.clientX;
 		this.dragY = event.clientY;
 
-		this.startX = event.clientX-Richfaces.getComputedStyleSize(this.modalPanel.cdiv, "left");
-		this.startY = event.clientY-Richfaces.getComputedStyleSize(this.modalPanel.cdiv, "top");
-		this.winSize = Richfaces.getWindowSize();
-		
 		Event.observe(document, 'mousemove', this.boundDoDrag);
 		Event.observe(document, 'mouseup', this.boundEndDrag);
 		
@@ -49,41 +45,27 @@
 		var evtX = event.clientX;
 		var evtY = event.clientY;
 
-		if (evtX<0) evtX=0;
-		if (evtY<0) evtY=0;
-		if (evtX>=this.winSize.width) evtX=this.winSize.width-1;
-		if (evtY>=this.winSize.height) evtY=this.winSize.height-1;
+		var winSize = Richfaces.getWindowSize();
 
+		//window.status = "" + evtX + " " + evtY;
+		
+		if (evtX < 0) {
+			evtX = 0;
+		} else if (evtX >= winSize.width) {
+			evtX = winSize.width - 1;
+		}
+		
+		if (evtY < 0) {
+			evtY = 0;
+		} else if (evtY >= winSize.height) {
+			evtY = winSize.height - 1;
+		}
+
 		var dx = evtX - this.dragX;
 		var dy = evtY - this.dragY;
 		
 		if (dx != 0 || dy != 0) {
 			var diff = this.sizer.doDiff(dx, dy);
-			if (diff.deltaWidth == 0 && diff.deltaHeight==0) {
-				var delX = evtX-Richfaces.getComputedStyleSize(this.modalPanel.cdiv, "left");
-				if (dx>0) {
-					if (delX<this.startX) {
-						dx = Math.max(delX+dx-this.startX,0);
-					}
-				} else {
-					if (delX>this.startX) {
-						dx = Math.min(delX+dx-this.startX,0);
-					}
-				}
-				diff.deltaX = dx;
-				var delY = evtY-Richfaces.getComputedStyleSize(this.modalPanel.cdiv, "top");
-				if (dy>0) {
-					if (delY<this.startY) {
-						dy = Math.max(delY+dy-this.startY,0);
-					}
-				} else {
-					if (delY>this.startY) {
-						dy = Math.min(delY+dy-this.startY,0);
-					}
-				}
-				diff.deltaY = dy;
-			} 
-			
 			var vetoes = this.modalPanel.doResizeOrMove(diff);
 
 			if (!vetoes.x) {