You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/12/17 11:41:35 UTC

svn commit: r1422839 - in /myfaces/tomahawk/trunk: core/src/main/java/org/apache/myfaces/custom/popup/ core/src/main/resources/org/apache/myfaces/custom/popup/resource/ core20/src/main/java/org/apache/myfaces/custom/popup/ core20/src/main/javascript/oa...

Author: werpu
Date: Mon Dec 17 10:41:34 2012
New Revision: 1422839

URL: http://svn.apache.org/viewvc?rev=1422839&view=rev
Log:
 TOMAHAWK-1648

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
    myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/popup/resource/JSPopup.js
    myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
    myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.popup/JSPopup.js

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java?rev=1422839&r1=1422838&r2=1422839&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java Mon Dec 17 10:41:34 2012
@@ -174,7 +174,7 @@ public class HtmlPopupRenderer
         ResponseWriter writer = context.getResponseWriter();
         writer.startElement(HTML.SCRIPT_ELEM, uiComponent);
         writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
-        writer.writeText("var "+popupId+"=new orgApacheMyfacesPopup('"+clientId+"',"+
+        writer.writeText("var "+popupId+"=new org.apache.myfaces.Popup('"+clientId+"',"+
                 (displayAtDistanceX==null?-5:displayAtDistanceX.intValue())+","+
                 (displayAtDistanceY==null?-5:displayAtDistanceY.intValue())+");",null);
         writer.endElement(HTML.SCRIPT_ELEM);

Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/popup/resource/JSPopup.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/popup/resource/JSPopup.js?rev=1422839&r1=1422838&r2=1422839&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/popup/resource/JSPopup.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/popup/resource/JSPopup.js Mon Dec 17 10:41:34 2012
@@ -1,152 +1,152 @@
-var orgApacheMyfacesPopupCurrentlyOpenedPopup;
-var orgApacheMyfacesPopupFrameUnder;
+window.org = window.org || {};
+org.apache = org.apache || {};
+org.apache.myfaces = org.apache.myfaces || {};
+
+//org.apache.myfaces.popupCurrentlyOpenedPopup;
+//org.apache.myfaces.popupFrameUnder;
+if (!org.apache.myfaces.Popup) {
+
+    org.apache.myfaces.popupFrameUnder = null;
+    org.apache.myfaces.popupCurrentlyOpenedPopup = null;
+
+    org.apache.myfaces.Popup = function (popupId, displayAtDistanceX, displayAtDistanceY) {
+        this.popupId = popupId;
+        this.displayAtDistanceX = displayAtDistanceX;
+        this.displayAtDistanceY = displayAtDistanceY;
+        this.isIE6 = document.all && !window.opera && !window.XMLHttpRequest;
+    };                              
+
+    org.apache.myfaces.Popup.prototype.display = function (ev) {
+
+        if (org.apache.myfaces.popupCurrentlyOpenedPopup != null)
+            org.apache.myfaces.popupCurrentlyOpenedPopup.style.display = "none";
+
+        //var elem;
+        var x;
+        var y;
+
+        if (window.event) /*ie eventing system active*/
+        {
+            if (org.apache.myfaces.popupFrameUnder != null)
+                org.apache.myfaces.popupFrameUnder.style.display = "none";
+
+            //elem = window.event.srcElement;
+            x = window.event.clientX;
+            x += this.popupGetScrollingX();
+            y = window.event.clientY;
+            y += this.popupGetScrollingY();
+        }
+        else {
+            //elem = ev.target;
+            x = ev.pageX;
+            y = ev.pageY;
+        }
+
+        x += this.displayAtDistanceX;
+        y += this.displayAtDistanceY;
+
+        var popupElem = document.getElementById(this.popupId);
+
+        if (popupElem.style.display != "block") {
+            popupElem.style.display = "block";
+            popupElem.style.left = "" + x + "px";
+            popupElem.style.top = "" + y + "px";
+            org.apache.myfaces.popupCurrentlyOpenedPopup = popupElem;
+        }
+        this.ieIFrameFix();
+    };
+
+    /**
+     * hide function which
+     * hides the popup from the browser
+     */
+    org.apache.myfaces.Popup.prototype.hide = function () {
+        var popupElem = document.getElementById(this.popupId);
+        popupElem.style.display = "none";
+
+        if (document.all && (org.apache.myfaces.popupFrameUnder != null)) { /*ie specific popup under fix*/
+            org.apache.myfaces.popupFrameUnder.style.display = "none";
+        }
+        this.ieIFrameFix();
+    };
+
+    /**
+     * simple redisplay
+     * displays an already existing hidden popup
+     */
+    org.apache.myfaces.Popup.prototype.redisplay = function () {
+        var popupElem = document.getElementById(this.popupId);
+        popupElem.style.display = "block";
+        org.apache.myfaces.popupCurrentlyOpenedPopup = popupElem;
+        this.ieIFrameFix();
+    };
+
+    org.apache.myfaces.Popup.prototype.popupGetScrollingX = function () {
+        if (self.pageXOffset) {
+            return self.pageXOffset;
+        } else if (document.documentElement && document.documentElement.scrollLeft) {
+            return document.documentElement.scrollLeft;
+        } else if (document.body) {
+            return document.body.scrollLeft;
+        } else {
+            return 0;
+        }
+    };
+
+    org.apache.myfaces.Popup.prototype.popupGetScrollingY = function () {
+        if (self.pageYOffset) {
+            return self.pageYOffset;
+        } else if (document.documentElement && document.documentElement.scrollTop) {
+            return document.documentElement.scrollTop;
+        } else if (document.body) {
+            return document.body.scrollTop;
+        } else {
+            return 0;
+        }
+    };
+
+    /**
+     * fix for the div over control bug in ie6
+     */
+    org.apache.myfaces.Popup.prototype.ieIFrameFix = function () {
+        if (this.isIE6) { //IE6 only
+            if (org.apache.myfaces.popupCurrentlyOpenedPopup == null) return false;
+            var iframe = document.getElementById(org.apache.myfaces.popupCurrentlyOpenedPopup.id + "_IFRAME");
+
+            if (iframe == null) {
+                org.apache.myfaces.popupFrameUnder = document.createElement("<iframe src='javascript:false;' id='" + org.apache.myfaces.popupCurrentlyOpenedPopup.id + "_IFRAME' style='visibility:hidden; position: absolute; top:0px;left:0px; filter:alpha(Opacity=0);' frameborder='0' scroll='none' />");
+                document.body.insertBefore(org.apache.myfaces.popupFrameUnder);
+            } else {
+                org.apache.myfaces.popupFrameUnder = iframe;
+            }
+
+            var popup = org.apache.myfaces.popupCurrentlyOpenedPopup;
+            iframe = org.apache.myfaces.popupFrameUnder;
+
+            if (popup != null &&
+                    (popup.style.display == "block")) {
+
+                popup.style.zIndex = 99;
+                iframe.style.zIndex = popup.style.zIndex - 1;
+                iframe.style.width = popup.offsetWidth;
+                iframe.style.height = popup.offsetHeight;
+                iframe.style.top = popup.style.top;
+                iframe.style.left = popup.style.left;
+
+                iframe.style.marginTop = popup.style.marginTop;
+                iframe.style.marginLeft = popup.style.marginLeft;
+                iframe.style.marginRight = popup.style.marginRight;
+                iframe.style.marginBottem = popup.style.marginBottom;
+
+                iframe.style.display = "block";
+                iframe.style.visibility = "visible";
+                /*we have to set an explicit visible otherwise it wont work*/
+
+            } else {
+                iframe.style.display = "none";
+            }
+        }
+        return false;
+    };
 
-/**
-* fix for the div over control bug in ie
-*/
-function orgApacheMyfacesPopupfixIE() {
-    if(document.all && !window.opera && !window.XMLHttpRequest) {
-    	if(orgApacheMyfacesPopupCurrentlyOpenedPopup == null) return false;
-    	var iframe = document.getElementById(orgApacheMyfacesPopupCurrentlyOpenedPopup.id+"_IFRAME");
-
-
-		if(iframe == null) {
-			orgApacheMyfacesPopupFrameUnder = document.createElement("<iframe src='javascript:false;' id='"+orgApacheMyfacesPopupCurrentlyOpenedPopup.id+"_IFRAME' style='visibility:hidden; position: absolute; top:0px;left:0px; filter:alpha(Opacity=0);' frameborder='0' scroll='none' />");
-	   		document.body.insertBefore(orgApacheMyfacesPopupFrameUnder);
-   		} else {
-   			orgApacheMyfacesPopupFrameUnder = iframe;
-   		}
-
-		var popup  = orgApacheMyfacesPopupCurrentlyOpenedPopup;
-   		iframe = orgApacheMyfacesPopupFrameUnder;
-
-   		if(popup != null &&
-   			(popup.style.display == "block")) {
-
-			popup.style.zIndex	= 99;
-   			iframe.style.zIndex = popup.style.zIndex - 1;
-   			iframe.style.width 	= popup.offsetWidth;
-	    	iframe.style.height = popup.offsetHeight;
-	    	iframe.style.top 	= popup.style.top;
-    		iframe.style.left 	= popup.style.left;
-    		
-    		iframe.style.marginTop 		= popup.style.marginTop;
-    		iframe.style.marginLeft 	= popup.style.marginLeft;
-    		iframe.style.marginRight 	= popup.style.marginRight;
-    		iframe.style.marginBottem 	= popup.style.marginBottom;
-    		
-			iframe.style.display = "block";
-			iframe.style.visibility = "visible"; /*we have to set an explicit visible otherwise it wont work*/
-
-   		} else {
-   			iframe.style.display = "none";
-   		}
-    }
-    return false;
-}
-
-
-function orgApacheMyfacesPopup(popupId,displayAtDistanceX,displayAtDistanceY)
-{
-    this.popupId = popupId;
-    this.displayAtDistanceX=displayAtDistanceX;
-    this.displayAtDistanceY=displayAtDistanceY;
-    this.display = orgApacheMyfacesPopupDisplay;
-    this.hide = orgApacheMyfacesPopupHide;
-    this.redisplay=orgApacheMyfacesPopupRedisplay;
-}
-
-function orgApacheMyfacesPopupDisplay(ev)
-{
-
-    if(orgApacheMyfacesPopupCurrentlyOpenedPopup!=null)
-        orgApacheMyfacesPopupCurrentlyOpenedPopup.style.display="none";
-
-    var elem;
-    var x;
-    var y;
-
-    if(document.all) /*ie browser detection already in place*/
-    {
-		if(orgApacheMyfacesPopupFrameUnder!=null)
-			orgApacheMyfacesPopupFrameUnder.style.display="none";
-
-        elem = window.event.srcElement;
-        x=window.event.clientX;
-        x+=orgApacheMyfacesPopupGetScrollingX();
-        y=window.event.clientY;
-        y+=orgApacheMyfacesPopupGetScrollingY();
-    }
-    else
-    {
-        elem = ev.target;
-        x=ev.pageX;
-        y=ev.pageY;
-    }
-
-    x+=this.displayAtDistanceX;
-    y+=this.displayAtDistanceY;
-
-    var popupElem = document.getElementById(this.popupId);
-
-    if(popupElem.style.display!="block")
-    {
-        popupElem.style.display="block";
-        popupElem.style.left=""+x+"px";
-        popupElem.style.top=""+y+"px";
-        orgApacheMyfacesPopupCurrentlyOpenedPopup = popupElem;
-    }
-    orgApacheMyfacesPopupfixIE();
-}
-
-
-/**
-* hide function which
-* hides the popup from the browser
-*/
-function orgApacheMyfacesPopupHide()
-{
-    var popupElem = document.getElementById(this.popupId);
-    popupElem.style.display="none";
-
-	if(document.all && (orgApacheMyfacesPopupFrameUnder != null)) { /*ie specific popup under fix*/
-		orgApacheMyfacesPopupFrameUnder.style.display = "none";
-	}
-	orgApacheMyfacesPopupfixIE();
-}
-
-/**
-* simple redisplay
-* displays an already existing hidden popup
-*/
-function orgApacheMyfacesPopupRedisplay()
-{
-    var popupElem = document.getElementById(this.popupId);
-    popupElem.style.display="block";
-    orgApacheMyfacesPopupCurrentlyOpenedPopup = popupElem;
-	orgApacheMyfacesPopupfixIE();
-}
-
-function orgApacheMyfacesPopupGetScrollingX() {
-    if (self.pageXOffset) {
-        return self.pageXOffset;
-    } else if (document.documentElement && document.documentElement.scrollLeft) {
-        return document.documentElement.scrollLeft;
-    } else if (document.body) {
-        return document.body.scrollLeft;
-    } else {
-        return 0;
-    }
-}
-
-function orgApacheMyfacesPopupGetScrollingY() {
-    if (self.pageYOffset) {
-        return self.pageYOffset;
-    } else if (document.documentElement && document.documentElement.scrollTop) {
-        return document.documentElement.scrollTop;
-    } else if (document.body) {
-        return document.body.scrollTop;
-    } else {
-        return 0;
-    }
 }
\ No newline at end of file

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java?rev=1422839&r1=1422838&r2=1422839&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java (original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java Mon Dec 17 10:41:34 2012
@@ -223,7 +223,7 @@ public class HtmlPopupRenderer
         ResponseWriter writer = context.getResponseWriter();
         writer.startElement(HTML.SCRIPT_ELEM, uiComponent);
         writer.writeAttribute(HTML.SCRIPT_TYPE_ATTR,HTML.SCRIPT_TYPE_TEXT_JAVASCRIPT,null);
-        writer.writeText("var "+popupId+"=new orgApacheMyfacesPopup('"+clientId+"',"+
+        writer.writeText("var "+popupId+"=new org.apache.myfaces.Popup('"+clientId+"',"+
                 (displayAtDistanceX==null?-5:displayAtDistanceX.intValue())+","+
                 (displayAtDistanceY==null?-5:displayAtDistanceY.intValue())+");",null);
         writer.endElement(HTML.SCRIPT_ELEM);

Modified: myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.popup/JSPopup.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.popup/JSPopup.js?rev=1422839&r1=1422838&r2=1422839&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.popup/JSPopup.js (original)
+++ myfaces/tomahawk/trunk/core20/src/main/javascript/oam.custom.popup/JSPopup.js Mon Dec 17 10:41:34 2012
@@ -1,152 +1,152 @@
-var orgApacheMyfacesPopupCurrentlyOpenedPopup;
-var orgApacheMyfacesPopupFrameUnder;
+window.org = window.org || {};
+org.apache = org.apache || {};
+org.apache.myfaces = org.apache.myfaces || {};
+
+//org.apache.myfaces.popupCurrentlyOpenedPopup;
+//org.apache.myfaces.popupFrameUnder;
+if (!org.apache.myfaces.Popup) {
+
+    org.apache.myfaces.popupFrameUnder = null;
+    org.apache.myfaces.popupCurrentlyOpenedPopup = null;
+
+    org.apache.myfaces.Popup = function (popupId, displayAtDistanceX, displayAtDistanceY) {
+        this.popupId = popupId;
+        this.displayAtDistanceX = displayAtDistanceX;
+        this.displayAtDistanceY = displayAtDistanceY;
+        this.isIE6 = document.all && !window.opera && !window.XMLHttpRequest;
+    };
+
+    org.apache.myfaces.Popup.prototype.display = function (ev) {
+
+        if (org.apache.myfaces.popupCurrentlyOpenedPopup != null)
+            org.apache.myfaces.popupCurrentlyOpenedPopup.style.display = "none";
+
+        //var elem;
+        var x;
+        var y;
+
+        if (window.event) /*ie eventing system active*/
+        {
+            if (org.apache.myfaces.popupFrameUnder != null)
+                org.apache.myfaces.popupFrameUnder.style.display = "none";
+
+            //elem = window.event.srcElement;
+            x = window.event.clientX;
+            x += this.popupGetScrollingX();
+            y = window.event.clientY;
+            y += this.popupGetScrollingY();
+        }
+        else {
+            //elem = ev.target;
+            x = ev.pageX;
+            y = ev.pageY;
+        }
+
+        x += this.displayAtDistanceX;
+        y += this.displayAtDistanceY;
+
+        var popupElem = document.getElementById(this.popupId);
+
+        if (popupElem.style.display != "block") {
+            popupElem.style.display = "block";
+            popupElem.style.left = "" + x + "px";
+            popupElem.style.top = "" + y + "px";
+            org.apache.myfaces.popupCurrentlyOpenedPopup = popupElem;
+        }
+        this.ieIFrameFix();
+    };
+
+    /**
+     * hide function which
+     * hides the popup from the browser
+     */
+    org.apache.myfaces.Popup.prototype.hide = function () {
+        var popupElem = document.getElementById(this.popupId);
+        popupElem.style.display = "none";
+
+        if (document.all && (org.apache.myfaces.popupFrameUnder != null)) { /*ie specific popup under fix*/
+            org.apache.myfaces.popupFrameUnder.style.display = "none";
+        }
+        this.ieIFrameFix();
+    };
+
+    /**
+     * simple redisplay
+     * displays an already existing hidden popup
+     */
+    org.apache.myfaces.Popup.prototype.redisplay = function () {
+        var popupElem = document.getElementById(this.popupId);
+        popupElem.style.display = "block";
+        org.apache.myfaces.popupCurrentlyOpenedPopup = popupElem;
+        this.ieIFrameFix();
+    };
+
+    org.apache.myfaces.Popup.prototype.popupGetScrollingX = function () {
+        if (self.pageXOffset) {
+            return self.pageXOffset;
+        } else if (document.documentElement && document.documentElement.scrollLeft) {
+            return document.documentElement.scrollLeft;
+        } else if (document.body) {
+            return document.body.scrollLeft;
+        } else {
+            return 0;
+        }
+    };
+
+    org.apache.myfaces.Popup.prototype.popupGetScrollingY = function () {
+        if (self.pageYOffset) {
+            return self.pageYOffset;
+        } else if (document.documentElement && document.documentElement.scrollTop) {
+            return document.documentElement.scrollTop;
+        } else if (document.body) {
+            return document.body.scrollTop;
+        } else {
+            return 0;
+        }
+    };
+
+    /**
+     * fix for the div over control bug in ie6
+     */
+    org.apache.myfaces.Popup.prototype.ieIFrameFix = function () {
+        if (this.isIE6) { //IE6 only
+            if (org.apache.myfaces.popupCurrentlyOpenedPopup == null) return false;
+            var iframe = document.getElementById(org.apache.myfaces.popupCurrentlyOpenedPopup.id + "_IFRAME");
+
+            if (iframe == null) {
+                org.apache.myfaces.popupFrameUnder = document.createElement("<iframe src='javascript:false;' id='" + org.apache.myfaces.popupCurrentlyOpenedPopup.id + "_IFRAME' style='visibility:hidden; position: absolute; top:0px;left:0px; filter:alpha(Opacity=0);' frameborder='0' scroll='none' />");
+                document.body.insertBefore(org.apache.myfaces.popupFrameUnder);
+            } else {
+                org.apache.myfaces.popupFrameUnder = iframe;
+            }
+
+            var popup = org.apache.myfaces.popupCurrentlyOpenedPopup;
+            iframe = org.apache.myfaces.popupFrameUnder;
+
+            if (popup != null &&
+                    (popup.style.display == "block")) {
+
+                popup.style.zIndex = 99;
+                iframe.style.zIndex = popup.style.zIndex - 1;
+                iframe.style.width = popup.offsetWidth;
+                iframe.style.height = popup.offsetHeight;
+                iframe.style.top = popup.style.top;
+                iframe.style.left = popup.style.left;
+
+                iframe.style.marginTop = popup.style.marginTop;
+                iframe.style.marginLeft = popup.style.marginLeft;
+                iframe.style.marginRight = popup.style.marginRight;
+                iframe.style.marginBottem = popup.style.marginBottom;
+
+                iframe.style.display = "block";
+                iframe.style.visibility = "visible";
+                /*we have to set an explicit visible otherwise it wont work*/
+
+            } else {
+                iframe.style.display = "none";
+            }
+        }
+        return false;
+    };
 
-/**
-* fix for the div over control bug in ie
-*/
-function orgApacheMyfacesPopupfixIE() {
-    if(document.all && !window.opera && !window.XMLHttpRequest) { //IE6 only
-    	if(orgApacheMyfacesPopupCurrentlyOpenedPopup == null) return false;
-    	var iframe = document.getElementById(orgApacheMyfacesPopupCurrentlyOpenedPopup.id+"_IFRAME");
-
-
-		if(iframe == null) {
-			orgApacheMyfacesPopupFrameUnder = document.createElement("<iframe src='javascript:false;' id='"+orgApacheMyfacesPopupCurrentlyOpenedPopup.id+"_IFRAME' style='visibility:hidden; position: absolute; top:0px;left:0px; filter:alpha(Opacity=0);' frameborder='0' scroll='none' />");
-	   		document.body.insertBefore(orgApacheMyfacesPopupFrameUnder);
-   		} else {
-   			orgApacheMyfacesPopupFrameUnder = iframe;
-   		}
-
-		var popup  = orgApacheMyfacesPopupCurrentlyOpenedPopup;
-   		iframe = orgApacheMyfacesPopupFrameUnder;
-
-   		if(popup != null &&
-   			(popup.style.display == "block")) {
-
-			popup.style.zIndex	= 99;
-   			iframe.style.zIndex = popup.style.zIndex - 1;
-   			iframe.style.width 	= popup.offsetWidth;
-	    	iframe.style.height = popup.offsetHeight;
-	    	iframe.style.top 	= popup.style.top;
-    		iframe.style.left 	= popup.style.left;
-    		
-    		iframe.style.marginTop 		= popup.style.marginTop;
-    		iframe.style.marginLeft 	= popup.style.marginLeft;
-    		iframe.style.marginRight 	= popup.style.marginRight;
-    		iframe.style.marginBottem 	= popup.style.marginBottom;
-    		
-			iframe.style.display = "block";
-			iframe.style.visibility = "visible"; /*we have to set an explicit visible otherwise it wont work*/
-
-   		} else {
-   			iframe.style.display = "none";
-   		}
-    }
-    return false;
-}
-
-
-function orgApacheMyfacesPopup(popupId,displayAtDistanceX,displayAtDistanceY)
-{
-    this.popupId = popupId;
-    this.displayAtDistanceX=displayAtDistanceX;
-    this.displayAtDistanceY=displayAtDistanceY;
-    this.display = orgApacheMyfacesPopupDisplay;
-    this.hide = orgApacheMyfacesPopupHide;
-    this.redisplay=orgApacheMyfacesPopupRedisplay;
-}
-
-function orgApacheMyfacesPopupDisplay(ev)
-{
-
-    if(orgApacheMyfacesPopupCurrentlyOpenedPopup!=null)
-        orgApacheMyfacesPopupCurrentlyOpenedPopup.style.display="none";
-
-    var elem;
-    var x;
-    var y;
-
-    if(document.all) /*ie browser detection already in place*/
-    {
-		if(orgApacheMyfacesPopupFrameUnder!=null)
-			orgApacheMyfacesPopupFrameUnder.style.display="none";
-
-        elem = window.event.srcElement;
-        x=window.event.clientX;
-        x+=orgApacheMyfacesPopupGetScrollingX();
-        y=window.event.clientY;
-        y+=orgApacheMyfacesPopupGetScrollingY();
-    }
-    else
-    {
-        elem = ev.target;
-        x=ev.pageX;
-        y=ev.pageY;
-    }
-
-    x+=this.displayAtDistanceX;
-    y+=this.displayAtDistanceY;
-
-    var popupElem = document.getElementById(this.popupId);
-
-    if(popupElem.style.display!="block")
-    {
-        popupElem.style.display="block";
-        popupElem.style.left=""+x+"px";
-        popupElem.style.top=""+y+"px";
-        orgApacheMyfacesPopupCurrentlyOpenedPopup = popupElem;
-    }
-    orgApacheMyfacesPopupfixIE();
-}
-
-
-/**
-* hide function which
-* hides the popup from the browser
-*/
-function orgApacheMyfacesPopupHide()
-{
-    var popupElem = document.getElementById(this.popupId);
-    popupElem.style.display="none";
-
-	if(document.all && (orgApacheMyfacesPopupFrameUnder != null)) { /*ie specific popup under fix*/
-		orgApacheMyfacesPopupFrameUnder.style.display = "none";
-	}
-	orgApacheMyfacesPopupfixIE();
-}
-
-/**
-* simple redisplay
-* displays an already existing hidden popup
-*/
-function orgApacheMyfacesPopupRedisplay()
-{
-    var popupElem = document.getElementById(this.popupId);
-    popupElem.style.display="block";
-    orgApacheMyfacesPopupCurrentlyOpenedPopup = popupElem;
-	orgApacheMyfacesPopupfixIE();
-}
-
-function orgApacheMyfacesPopupGetScrollingX() {
-    if (self.pageXOffset) {
-        return self.pageXOffset;
-    } else if (document.documentElement && document.documentElement.scrollLeft) {
-        return document.documentElement.scrollLeft;
-    } else if (document.body) {
-        return document.body.scrollLeft;
-    } else {
-        return 0;
-    }
-}
-
-function orgApacheMyfacesPopupGetScrollingY() {
-    if (self.pageYOffset) {
-        return self.pageYOffset;
-    } else if (document.documentElement && document.documentElement.scrollTop) {
-        return document.documentElement.scrollTop;
-    } else if (document.body) {
-        return document.body.scrollTop;
-    } else {
-        return 0;
-    }
 }
\ No newline at end of file