[embjopr-commits] EMBJOPR SVN: r809 - in branches/EmbJopr_1_3_1_MyFaces: core/src/main/webapp/WEB-INF and 4 other directories.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Thu Oct 22 13:59:17 EDT 2009
Author: smcgowan at redhat.com
Date: 2009-10-22 13:59:16 -0400 (Thu, 22 Oct 2009)
New Revision: 809
Modified:
branches/EmbJopr_1_3_1_MyFaces/core/pom.xml
branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/WEB-INF/web.xml
branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/js/embedded.js
branches/EmbJopr_1_3_1_MyFaces/jsfunit/pom.xml
branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml
branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java
Log:
changes for MyFaces
Modified: branches/EmbJopr_1_3_1_MyFaces/core/pom.xml
===================================================================
--- branches/EmbJopr_1_3_1_MyFaces/core/pom.xml 2009-10-22 17:40:19 UTC (rev 808)
+++ branches/EmbJopr_1_3_1_MyFaces/core/pom.xml 2009-10-22 17:59:16 UTC (rev 809)
@@ -185,6 +185,7 @@
</dependency>
<!-- ===== RichFaces ===== -->
+<!--
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
@@ -200,7 +201,29 @@
<artifactId>richfaces-ui</artifactId>
<version>${richfaces.version}</version>
</dependency>
+-->
+ <dependency>
+ <groupId>apache-myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.2.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>0.4-brew</version>
+ </dependency>
+
<!-- == 3rd Party Provided Dependencies ================ -->
<dependency>
<groupId>javax.servlet</groupId>
Modified: branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/WEB-INF/web.xml 2009-10-22 17:40:19 UTC (rev 808)
+++ branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/WEB-INF/web.xml 2009-10-22 17:59:16 UTC (rev 809)
@@ -19,6 +19,11 @@
~ License along with this program; if not, write to the Free Software
~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
+
+ <!--
+ This special version of web.xml allows Embedded Jopr to use MyFaces instead of
+ the built-in Mojarra JSF implementaiton.
+ -->
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -87,9 +92,14 @@
<param-value>.xhtml</param-value>
</context-param>
- <!-- JSF RI -->
+ <!-- MyFaces -->
+ <context-param>
+ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<listener>
- <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>
<!-- Facelets -->
Modified: branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/js/embedded.js
===================================================================
--- branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/js/embedded.js 2009-10-22 17:40:19 UTC (rev 808)
+++ branches/EmbJopr_1_3_1_MyFaces/core/src/main/webapp/js/embedded.js 2009-10-22 17:59:16 UTC (rev 809)
@@ -739,5 +739,1824 @@
}
};
+var Window = Class.create();
+
+Window.keepMultiModalWindow = false;
+Window.hasEffectLib = (typeof Effect != 'undefined');
+Window.resizeEffectDuration = 0.4;
+
+Window.prototype = {
+ // Constructor
+ // Available parameters : className, blurClassName, title, minWidth, minHeight, maxWidth, maxHeight, width, height, top, left, bottom, right, resizable, zIndex, opacity, recenterAuto, wiredDrag
+ // hideEffect, showEffect, showEffectOptions, hideEffectOptions, effectOptions, url, draggable, closable, minimizable, maximizable, parent, onload
+ // add all callbacks (if you do not use an observer)
+ // onDestroy onStartResize onStartMove onResize onMove onEndResize onEndMove onFocus onBlur onBeforeShow onShow onHide onMinimize onMaximize onClose
+
+ initialize: function() {
+ var id;
+ var optionIndex = 0;
+ // For backward compatibility like win= new Window("id", {...}) instead of win = new Window({id: "id", ...})
+ if (arguments.length > 0) {
+ if (typeof arguments[0] == "string" ) {
+ id = arguments[0];
+ optionIndex = 1;
+ }
+ else
+ id = arguments[0] ? arguments[0].id : null;
+ }
+
+ // Generate unique ID if not specified
+ if (!id)
+ id = "window_" + new Date().getTime();
+
+ if ($(id))
+ alert("Window " + id + " is already registered in the DOM! Make sure you use setDestroyOnClose() or destroyOnClose: true in the constructor");
+
+ this.options = Object.extend({
+ className: "dialog",
+ blurClassName: null,
+ minWidth: 100,
+ minHeight: 20,
+ resizable: true,
+ closable: true,
+ minimizable: true,
+ maximizable: true,
+ draggable: true,
+ userData: null,
+ showEffect: (Window.hasEffectLib ? Effect.Appear : Element.show),
+ hideEffect: (Window.hasEffectLib ? Effect.Fade : Element.hide),
+ showEffectOptions: {},
+ hideEffectOptions: {},
+ effectOptions: null,
+ parent: document.body,
+ title: " ",
+ url: null,
+ onload: Prototype.emptyFunction,
+ width: 200,
+ height: 300,
+ opacity: 1,
+ recenterAuto: true,
+ wiredDrag: false,
+ closeCallback: null,
+ destroyOnClose: false,
+ gridX: 1,
+ gridY: 1
+ }, arguments[optionIndex] || {});
+ if (this.options.blurClassName)
+ this.options.focusClassName = this.options.className;
+
+ if (typeof this.options.top == "undefined" && typeof this.options.bottom == "undefined")
+ this.options.top = this._round(Math.random()*500, this.options.gridY);
+ if (typeof this.options.left == "undefined" && typeof this.options.right == "undefined")
+ this.options.left = this._round(Math.random()*500, this.options.gridX);
+
+ if (this.options.effectOptions) {
+ Object.extend(this.options.hideEffectOptions, this.options.effectOptions);
+ Object.extend(this.options.showEffectOptions, this.options.effectOptions);
+ if (this.options.showEffect == Element.Appear)
+ this.options.showEffectOptions.to = this.options.opacity;
+ }
+ if (Window.hasEffectLib) {
+ if (this.options.showEffect == Effect.Appear)
+ this.options.showEffectOptions.to = this.options.opacity;
+
+ if (this.options.hideEffect == Effect.Fade)
+ this.options.hideEffectOptions.from = this.options.opacity;
+ }
+ if (this.options.hideEffect == Element.hide)
+ this.options.hideEffect = function(){ Element.hide(this.element); if (this.options.destroyOnClose) this.destroy(); }.bind(this)
+
+ if (this.options.parent != document.body)
+ this.options.parent = $(this.options.parent);
+
+ this.element = this._createWindow(id);
+ this.element.win = this;
+
+ // Bind event listener
+ this.eventMouseDown = this._initDrag.bindAsEventListener(this);
+ this.eventMouseUp = this._endDrag.bindAsEventListener(this);
+ this.eventMouseMove = this._updateDrag.bindAsEventListener(this);
+ this.eventOnLoad = this._getWindowBorderSize.bindAsEventListener(this);
+ this.eventMouseDownContent = this.toFront.bindAsEventListener(this);
+ this.eventResize = this._recenter.bindAsEventListener(this);
+
+ this.topbar = $(this.element.id + "_top");
+ this.bottombar = $(this.element.id + "_bottom");
+ this.content = $(this.element.id + "_content");
+
+ Event.observe(this.topbar, "mousedown", this.eventMouseDown);
+ Event.observe(this.bottombar, "mousedown", this.eventMouseDown);
+ Event.observe(this.content, "mousedown", this.eventMouseDownContent);
+ Event.observe(window, "load", this.eventOnLoad);
+ Event.observe(window, "resize", this.eventResize);
+ Event.observe(window, "scroll", this.eventResize);
+ Event.observe(this.options.parent, "scroll", this.eventResize);
+
+ if (this.options.draggable) {
+ var that = this;
+ [this.topbar, this.topbar.up().previous(), this.topbar.up().next()].each(function(element) {
+ element.observe("mousedown", that.eventMouseDown);
+ element.addClassName("top_draggable");
+ });
+ [this.bottombar.up(), this.bottombar.up().previous(), this.bottombar.up().next()].each(function(element) {
+ element.observe("mousedown", that.eventMouseDown);
+ element.addClassName("bottom_draggable");
+ });
+
+ }
+
+ if (this.options.resizable) {
+ this.sizer = $(this.element.id + "_sizer");
+ Event.observe(this.sizer, "mousedown", this.eventMouseDown);
+ }
+
+ this.useLeft = null;
+ this.useTop = null;
+ if (typeof this.options.left != "undefined") {
+ this.element.setStyle({left: parseFloat(this.options.left) + 'px'});
+ this.useLeft = true;
+ }
+ else {
+ this.element.setStyle({right: parseFloat(this.options.right) + 'px'});
+ this.useLeft = false;
+ }
+
+ if (typeof this.options.top != "undefined") {
+ this.element.setStyle({top: parseFloat(this.options.top) + 'px'});
+ this.useTop = true;
+ }
+ else {
+ this.element.setStyle({bottom: parseFloat(this.options.bottom) + 'px'});
+ this.useTop = false;
+ }
+
+ this.storedLocation = null;
+
+ this.setOpacity(this.options.opacity);
+ if (this.options.zIndex)
+ this.setZIndex(this.options.zIndex)
+
+ if (this.options.destroyOnClose)
+ this.setDestroyOnClose(true);
+
+ this._getWindowBorderSize();
+ this.width = this.options.width;
+ this.height = this.options.height;
+ this.visible = false;
+
+ this.constraint = false;
+ this.constraintPad = {top: 0, left:0, bottom:0, right:0};
+
+ if (this.width && this.height)
+ this.setSize(this.options.width, this.options.height);
+ this.setTitle(this.options.title)
+ Windows.register(this);
+ },
+
+ // Destructor
+ destroy: function() {
+ this._notify("onDestroy");
+ Event.stopObserving(this.topbar, "mousedown", this.eventMouseDown);
+ Event.stopObserving(this.bottombar, "mousedown", this.eventMouseDown);
+ Event.stopObserving(this.content, "mousedown", this.eventMouseDownContent);
+
+ Event.stopObserving(window, "load", this.eventOnLoad);
+ Event.stopObserving(window, "resize", this.eventResize);
+ Event.stopObserving(window, "scroll", this.eventResize);
+
+ Event.stopObserving(this.content, "load", this.options.onload);
+
+ if (this._oldParent) {
+ var content = this.getContent();
+ var originalContent = null;
+ for(var i = 0; i < content.childNodes.length; i++) {
+ originalContent = content.childNodes[i];
+ if (originalContent.nodeType == 1)
+ break;
+ originalContent = null;
+ }
+ if (originalContent)
+ this._oldParent.appendChild(originalContent);
+ this._oldParent = null;
+ }
+
+ if (this.sizer)
+ Event.stopObserving(this.sizer, "mousedown", this.eventMouseDown);
+
+ if (this.options.url)
+ this.content.src = null
+
+ if(this.iefix)
+ Element.remove(this.iefix);
+
+ Element.remove(this.element);
+ Windows.unregister(this);
+ },
+
+ // Sets close callback, if it sets, it should return true to be able to close the window.
+ setCloseCallback: function(callback) {
+ this.options.closeCallback = callback;
+ },
+
+ // Gets window content
+ getContent: function () {
+ return this.content;
+ },
+
+ // Sets the content with an element id
+ setContent: function(id, autoresize, autoposition) {
+ var element = $(id);
+ if (null == element) throw "Unable to find element '" + id + "' in DOM";
+ this._oldParent = element.parentNode;
+
+ var d = null;
+ var p = null;
+
+ if (autoresize)
+ d = Element.getDimensions(element);
+ if (autoposition)
+ p = Position.cumulativeOffset(element);
+
+ var content = this.getContent();
+ // Clear HTML (and even iframe)
+ this.setHTMLContent("");
+ content = this.getContent();
+
+ content.appendChild(element);
+ element.show();
+ if (autoresize)
+ this.setSize(d.width, d.height);
+ if (autoposition)
+ this.setLocation(p[1] - this.heightN, p[0] - this.widthW);
+ },
+
+ setHTMLContent: function(html) {
+ // It was an url (iframe), recreate a div content instead of iframe content
+ if (this.options.url) {
+ this.content.src = null;
+ this.options.url = null;
+
+ var content ="<div id=\"" + this.getId() + "_content\" class=\"" + this.options.className + "_content\"> </div>";
+ $(this.getId() +"_table_content").innerHTML = content;
+
+ this.content = $(this.element.id + "_content");
+ }
+
+ this.getContent().innerHTML = html;
+ },
+
+ setAjaxContent: function(url, options, showCentered, showModal) {
+ this.showFunction = showCentered ? "showCenter" : "show";
+ this.showModal = showModal || false;
+
+ options = options || {};
+
+ // Clear HTML (and even iframe)
+ this.setHTMLContent("");
+
+ this.onComplete = options.onComplete;
+ if (! this._onCompleteHandler)
+ this._onCompleteHandler = this._setAjaxContent.bind(this);
+ options.onComplete = this._onCompleteHandler;
+
+ new Ajax.Request(url, options);
+ options.onComplete = this.onComplete;
+ },
+
+ _setAjaxContent: function(originalRequest) {
+ Element.update(this.getContent(), originalRequest.responseText);
+ if (this.onComplete)
+ this.onComplete(originalRequest);
+ this.onComplete = null;
+ this[this.showFunction](this.showModal)
+ },
+
+ setURL: function(url) {
+ // Not an url content, change div to iframe
+ if (this.options.url)
+ this.content.src = null;
+ this.options.url = url;
+ var content= "<iframe frameborder='0' name='" + this.getId() + "_content' id='" + this.getId() + "_content' src='" + url + "' width='" + this.width + "' height='" + this.height + "'> </iframe>";
+ $(this.getId() +"_table_content").innerHTML = content;
+
+ this.content = $(this.element.id + "_content");
+ },
+
+ getURL: function() {
+ return this.options.url ? this.options.url : null;
+ },
+
+ refresh: function() {
+ if (this.options.url)
+ $(this.element.getAttribute('id') + '_content').src = this.options.url;
+ },
+
+ // Stores position/size in a cookie, by default named with window id
+ setCookie: function(name, expires, path, domain, secure) {
+ name = name || this.element.id;
+ this.cookie = [name, expires, path, domain, secure];
+
+ // Get cookie
+ var value = WindowUtilities.getCookie(name)
+ // If exists
+ if (value) {
+ var values = value.split(',');
+ var x = values[0].split(':');
+ var y = values[1].split(':');
+
+ var w = parseFloat(values[2]), h = parseFloat(values[3]);
+ var mini = values[4];
+ var maxi = values[5];
+
+ this.setSize(w, h);
+ if (mini == "true")
+ this.doMinimize = true; // Minimize will be done at onload window event
+ else if (maxi == "true")
+ this.doMaximize = true; // Maximize will be done at onload window event
+
+ this.useLeft = x[0] == "l";
+ this.useTop = y[0] == "t";
+
+ this.element.setStyle(this.useLeft ? {left: x[1]} : {right: x[1]});
+ this.element.setStyle(this.useTop ? {top: y[1]} : {bottom: y[1]});
+ }
+ },
+
+ // Gets window ID
+ getId: function() {
+ return this.element.id;
+ },
+
+ // Detroys itself when closing
+ setDestroyOnClose: function() {
+ this.options.destroyOnClose = true;
+ },
+
+ setConstraint: function(bool, padding) {
+ this.constraint = bool;
+ this.constraintPad = Object.extend(this.constraintPad, padding || {});
+ // Reset location to apply constraint
+ if (this.useTop && this.useLeft)
+ this.setLocation(parseFloat(this.element.style.top), parseFloat(this.element.style.left));
+ },
+
+ // initDrag event
+
+ _initDrag: function(event) {
+ // No resize on minimized window
+ if (Event.element(event) == this.sizer && this.isMinimized())
+ return;
+
+ // No move on maximzed window
+ if (Event.element(event) != this.sizer && this.isMaximized())
+ return;
+
+ if (Prototype.Browser.IE && this.heightN == 0)
+ this._getWindowBorderSize();
+
+ // Get pointer X,Y
+ this.pointer = [this._round(Event.pointerX(event), this.options.gridX), this._round(Event.pointerY(event), this.options.gridY)];
+ if (this.options.wiredDrag)
+ this.currentDrag = this._createWiredElement();
+ else
+ this.currentDrag = this.element;
+
+ // Resize
+ if (Event.element(event) == this.sizer) {
+ this.doResize = true;
+ this.widthOrg = this.width;
+ this.heightOrg = this.height;
+ this.bottomOrg = parseFloat(this.element.getStyle('bottom'));
+ this.rightOrg = parseFloat(this.element.getStyle('right'));
+ this._notify("onStartResize");
+ }
+ else {
+ this.doResize = false;
+
+ // Check if click on close button,
+ var closeButton = $(this.getId() + '_close');
+ if (closeButton && Position.within(closeButton, this.pointer[0], this.pointer[1])) {
+ this.currentDrag = null;
+ return;
+ }
+
+ this.toFront();
+
+ if (! this.options.draggable)
+ return;
+ this._notify("onStartMove");
+ }
+ // Register global event to capture mouseUp and mouseMove
+ Event.observe(document, "mouseup", this.eventMouseUp, false);
+ Event.observe(document, "mousemove", this.eventMouseMove, false);
+
+ // Add an invisible div to keep catching mouse event over iframes
+ WindowUtilities.disableScreen('__invisible__', '__invisible__', this.overlayOpacity);
+
+ // Stop selection while dragging
+ document.body.ondrag = function () { return false; };
+ document.body.onselectstart = function () { return false; };
+
+ this.currentDrag.show();
+ Event.stop(event);
+ },
+
+ _round: function(val, round) {
+ return round == 1 ? val : val = Math.floor(val / round) * round;
+ },
+
+ // updateDrag event
+ _updateDrag: function(event) {
+ var pointer = [this._round(Event.pointerX(event), this.options.gridX), this._round(Event.pointerY(event), this.options.gridY)];
+ var dx = pointer[0] - this.pointer[0];
+ var dy = pointer[1] - this.pointer[1];
+
+ // Resize case, update width/height
+ if (this.doResize) {
+ var w = this.widthOrg + dx;
+ var h = this.heightOrg + dy;
+
+ dx = this.width - this.widthOrg
+ dy = this.height - this.heightOrg
+
+ // Check if it's a right position, update it to keep upper-left corner at the same position
+ if (this.useLeft)
+ w = this._updateWidthConstraint(w)
+ else
+ this.currentDrag.setStyle({right: (this.rightOrg -dx) + 'px'});
+ // Check if it's a bottom position, update it to keep upper-left corner at the same position
+ if (this.useTop)
+ h = this._updateHeightConstraint(h)
+ else
+ this.currentDrag.setStyle({bottom: (this.bottomOrg -dy) + 'px'});
+
+ this.setSize(w , h);
+ this._notify("onResize");
+ }
+ // Move case, update top/left
+ else {
+ this.pointer = pointer;
+
+ if (this.useLeft) {
+ var left = parseFloat(this.currentDrag.getStyle('left')) + dx;
+ var newLeft = this._updateLeftConstraint(left);
+ // Keep mouse pointer correct
+ this.pointer[0] += newLeft-left;
+ this.currentDrag.setStyle({left: newLeft + 'px'});
+ }
+ else
+ this.currentDrag.setStyle({right: parseFloat(this.currentDrag.getStyle('right')) - dx + 'px'});
+
+ if (this.useTop) {
+ var top = parseFloat(this.currentDrag.getStyle('top')) + dy;
+ var newTop = this._updateTopConstraint(top);
+ // Keep mouse pointer correct
+ this.pointer[1] += newTop - top;
+ this.currentDrag.setStyle({top: newTop + 'px'});
+ }
+ else
+ this.currentDrag.setStyle({bottom: parseFloat(this.currentDrag.getStyle('bottom')) - dy + 'px'});
+
+ this._notify("onMove");
+ }
+ if (this.iefix)
+ this._fixIEOverlapping();
+
+ this._removeStoreLocation();
+ Event.stop(event);
+ },
+
+ // endDrag callback
+ _endDrag: function(event) {
+ // Remove temporary div over iframes
+ WindowUtilities.enableScreen('__invisible__');
+
+ if (this.doResize)
+ this._notify("onEndResize");
+ else
+ this._notify("onEndMove");
+
+ // Release event observing
+ Event.stopObserving(document, "mouseup", this.eventMouseUp,false);
+ Event.stopObserving(document, "mousemove", this.eventMouseMove, false);
+
+ Event.stop(event);
+
+ this._hideWiredElement();
+
+ // Store new location/size if need be
+ this._saveCookie()
+
+ // Restore selection
+ document.body.ondrag = null;
+ document.body.onselectstart = null;
+ },
+
+ _updateLeftConstraint: function(left) {
+ if (this.constraint && this.useLeft && this.useTop) {
+ var width = this.options.parent == document.body ? WindowUtilities.getPageSize().windowWidth : this.options.parent.getDimensions().width;
+
+ if (left < this.constraintPad.left)
+ left = this.constraintPad.left;
+ if (left + this.width + this.widthE + this.widthW > width - this.constraintPad.right)
+ left = width - this.constraintPad.right - this.width - this.widthE - this.widthW;
+ }
+ return left;
+ },
+
+ _updateTopConstraint: function(top) {
+ if (this.constraint && this.useLeft && this.useTop) {
+ var height = this.options.parent == document.body ? WindowUtilities.getPageSize().windowHeight : this.options.parent.getDimensions().height;
+
+ var h = this.height + this.heightN + this.heightS;
+
+ if (top < this.constraintPad.top)
+ top = this.constraintPad.top;
+ if (top + h > height - this.constraintPad.bottom)
+ top = height - this.constraintPad.bottom - h;
+ }
+ return top;
+ },
+
+ _updateWidthConstraint: function(w) {
+ if (this.constraint && this.useLeft && this.useTop) {
+ var width = this.options.parent == document.body ? WindowUtilities.getPageSize().windowWidth : this.options.parent.getDimensions().width;
+ var left = parseFloat(this.element.getStyle("left"));
+
+ if (left + w + this.widthE + this.widthW > width - this.constraintPad.right)
+ w = width - this.constraintPad.right - left - this.widthE - this.widthW;
+ }
+ return w;
+ },
+
+ _updateHeightConstraint: function(h) {
+ if (this.constraint && this.useLeft && this.useTop) {
+ var height = this.options.parent == document.body ? WindowUtilities.getPageSize().windowHeight : this.options.parent.getDimensions().height;
+ var top = parseFloat(this.element.getStyle("top"));
+
+ if (top + h + this.heightN + this.heightS > height - this.constraintPad.bottom)
+ h = height - this.constraintPad.bottom - top - this.heightN - this.heightS;
+ }
+ return h;
+ },
+
+
+ // Creates HTML window code
+ _createWindow: function(id) {
+ var className = this.options.className;
+ var win = document.createElement("div");
+ win.setAttribute('id', id);
+ win.className = "dialog";
+
+ var content;
+ if (this.options.url)
+ content= "<iframe frameborder=\"0\" name=\"" + id + "_content\" id=\"" + id + "_content\" src=\"" + this.options.url + "\"> </iframe>";
+ else
+ content ="<div id=\"" + id + "_content\" class=\"" +className + "_content\"> </div>";
+
+ var closeDiv = this.options.closable ? "<div class='"+ className +"_close' id='"+ id +"_close' onclick='Windows.close(\""+ id +"\", event)'> </div>" : "";
+ var minDiv = this.options.minimizable ? "<div class='"+ className + "_minimize' id='"+ id +"_minimize' onclick='Windows.minimize(\""+ id +"\", event)'> </div>" : "";
+ var maxDiv = this.options.maximizable ? "<div class='"+ className + "_maximize' id='"+ id +"_maximize' onclick='Windows.maximize(\""+ id +"\", event)'> </div>" : "";
+ var seAttributes = this.options.resizable ? "class='" + className + "_sizer' id='" + id + "_sizer'" : "class='" + className + "_se'";
+ var blank = "../themes/default/blank.gif";
+
+ win.innerHTML = closeDiv + minDiv + maxDiv + "\
+ <table id='"+ id +"_row1' class=\"top table_window\">\
+ <tr>\
+ <td class='"+ className +"_nw'></td>\
+ <td class='"+ className +"_n'><div id='"+ id +"_top' class='"+ className +"_title title_window'>"+ this.options.title +"</div></td>\
+ <td class='"+ className +"_ne'></td>\
+ </tr>\
+ </table>\
+ <table id='"+ id +"_row2' class=\"mid table_window\">\
+ <tr>\
+ <td class='"+ className +"_w'></td>\
+ <td id='"+ id +"_table_content' class='"+ className +"_content' valign='top'>" + content + "</td>\
+ <td class='"+ className +"_e'></td>\
+ </tr>\
+ </table>\
+ <table id='"+ id +"_row3' class=\"bot table_window\">\
+ <tr>\
+ <td class='"+ className +"_sw'></td>\
+ <td class='"+ className +"_s'><div id='"+ id +"_bottom' class='status_bar'><span style='float:left; width:1px; height:1px'></span></div></td>\
+ <td " + seAttributes + "></td>\
+ </tr>\
+ </table>\
+ ";
+ Element.hide(win);
+ this.options.parent.insertBefore(win, this.options.parent.firstChild);
+ Event.observe($(id + "_content"), "load", this.options.onload);
+ return win;
+ },
+
+
+ changeClassName: function(newClassName) {
+ var className = this.options.className;
+ var id = this.getId();
+ $A(["_close", "_minimize", "_maximize", "_sizer", "_content"]).each(function(value) { this._toggleClassName($(id + value), className + value, newClassName + value) }.bind(this));
+ this._toggleClassName($(id + "_top"), className + "_title", newClassName + "_title");
+ $$("#" + id + " td").each(function(td) {td.className = td.className.sub(className,newClassName); });
+ this.options.className = newClassName;
+ },
+
+ _toggleClassName: function(element, oldClassName, newClassName) {
+ if (element) {
+ element.removeClassName(oldClassName);
+ element.addClassName(newClassName);
+ }
+ },
+
+ // Sets window location
+ setLocation: function(top, left) {
+ top = this._updateTopConstraint(top);
+ left = this._updateLeftConstraint(left);
+
+ var e = this.currentDrag || this.element;
+ e.setStyle({top: top + 'px'});
+ e.setStyle({left: left + 'px'});
+
+ this.useLeft = true;
+ this.useTop = true;
+ },
+
+ getLocation: function() {
+ var location = {};
+ if (this.useTop)
+ location = Object.extend(location, {top: this.element.getStyle("top")});
+ else
+ location = Object.extend(location, {bottom: this.element.getStyle("bottom")});
+ if (this.useLeft)
+ location = Object.extend(location, {left: this.element.getStyle("left")});
+ else
+ location = Object.extend(location, {right: this.element.getStyle("right")});
+
+ return location;
+ },
+
+ // Gets window size
+ getSize: function() {
+ return {width: this.width, height: this.height};
+ },
+
+ // Sets window size
+ setSize: function(width, height, useEffect) {
+ width = parseFloat(width);
+ height = parseFloat(height);
+
+ // Check min and max size
+ if (!this.minimized && width < this.options.minWidth)
+ width = this.options.minWidth;
+
+ if (!this.minimized && height < this.options.minHeight)
+ height = this.options.minHeight;
+
+ if (this.options. maxHeight && height > this.options. maxHeight)
+ height = this.options. maxHeight;
+
+ if (this.options. maxWidth && width > this.options. maxWidth)
+ width = this.options. maxWidth;
+
+
+ if (this.useTop && this.useLeft && Window.hasEffectLib && Effect.ResizeWindow && useEffect) {
+ new Effect.ResizeWindow(this, null, null, width, height, {duration: Window.resizeEffectDuration});
+ } else {
+ this.width = width;
+ this.height = height;
+ var e = this.currentDrag ? this.currentDrag : this.element;
+
+ e.setStyle({width: width + this.widthW + this.widthE + "px"})
+ e.setStyle({height: height + this.heightN + this.heightS + "px"})
+
+ // Update content size
+ if (!this.currentDrag || this.currentDrag == this.element) {
+ var content = $(this.element.id + '_content');
+ content.setStyle({height: height + 'px'});
+ content.setStyle({width: width + 'px'});
+ }
+ }
+ },
+
+ updateHeight: function() {
+ this.setSize(this.width, this.content.scrollHeight, true);
+ },
+
+ updateWidth: function() {
+ this.setSize(this.content.scrollWidth, this.height, true);
+ },
+
+ // Brings window to front
+ toFront: function() {
+ if (this.element.style.zIndex < Windows.maxZIndex)
+ this.setZIndex(Windows.maxZIndex + 1);
+ if (this.iefix)
+ this._fixIEOverlapping();
+ },
+
+ getBounds: function(insideOnly) {
+ if (! this.width || !this.height || !this.visible)
+ this.computeBounds();
+ var w = this.width;
+ var h = this.height;
+
+ if (!insideOnly) {
+ w += this.widthW + this.widthE;
+ h += this.heightN + this.heightS;
+ }
+ var bounds = Object.extend(this.getLocation(), {width: w + "px", height: h + "px"});
+ return bounds;
+ },
+
+ computeBounds: function() {
+ if (! this.width || !this.height) {
+ var size = WindowUtilities._computeSize(this.content.innerHTML, this.content.id, this.width, this.height, 0, this.options.className)
+ if (this.height)
+ this.width = size + 5
+ else
+ this.height = size + 5
+ }
+
+ this.setSize(this.width, this.height);
+ if (this.centered)
+ this._center(this.centerTop, this.centerLeft);
+ },
+
+ // Displays window modal state or not
+ show: function(modal) {
+ this.visible = true;
+ if (modal) {
+ // Hack for Safari !!
+ if (typeof this.overlayOpacity == "undefined") {
+ var that = this;
+ setTimeout(function() {that.show(modal)}, 10);
+ return;
+ }
+ Windows.addModalWindow(this);
+
+ this.modal = true;
+ this.setZIndex(Windows.maxZIndex + 1);
+ Windows.unsetOverflow(this);
+ }
+ else
+ if (!this.element.style.zIndex)
+ this.setZIndex(Windows.maxZIndex + 1);
+
+ // To restore overflow if need be
+ if (this.oldStyle)
+ this.getContent().setStyle({overflow: this.oldStyle});
+
+ this.computeBounds();
+
+ this._notify("onBeforeShow");
+ if (this.options.showEffect != Element.show && this.options.showEffectOptions)
+ this.options.showEffect(this.element, this.options.showEffectOptions);
+ else
+ this.options.showEffect(this.element);
+
+ this._checkIEOverlapping();
+ WindowUtilities.focusedWindow = this
+ this._notify("onShow");
+ },
+
+ // Displays window modal state or not at the center of the page
+ showCenter: function(modal, top, left) {
+ this.centered = true;
+ this.centerTop = top;
+ this.centerLeft = left;
+
+ this.show(modal);
+ },
+
+ isVisible: function() {
+ return this.visible;
+ },
+
+ _center: function(top, left) {
+ var windowScroll = WindowUtilities.getWindowScroll(this.options.parent);
+ var pageSize = WindowUtilities.getPageSize(this.options.parent);
+ if (typeof top == "undefined")
+ top = (pageSize.windowHeight - (this.height + this.heightN + this.heightS))/2;
+ top += windowScroll.top
+
+ if (typeof left == "undefined")
+ left = (pageSize.windowWidth - (this.width + this.widthW + this.widthE))/2;
+ left += windowScroll.left
+ this.setLocation(top, left);
+ this.toFront();
+ },
+
+ _recenter: function(event) {
+ if (this.centered) {
+ var pageSize = WindowUtilities.getPageSize(this.options.parent);
+ var windowScroll = WindowUtilities.getWindowScroll(this.options.parent);
+
+ // Check for this stupid IE that sends dumb events
+ if (this.pageSize && this.pageSize.windowWidth == pageSize.windowWidth && this.pageSize.windowHeight == pageSize.windowHeight &&
+ this.windowScroll.left == windowScroll.left && this.windowScroll.top == windowScroll.top)
+ return;
+ this.pageSize = pageSize;
+ this.windowScroll = windowScroll;
+ // set height of Overlay to take up whole page and show
+ if ($('overlay_modal'))
+ $('overlay_modal').setStyle({height: (pageSize.pageHeight + 'px')});
+
+ if (this.options.recenterAuto)
+ this._center(this.centerTop, this.centerLeft);
+ }
+ },
+
+ // Hides window
+ hide: function() {
+ this.visible = false;
+ if (this.modal) {
+ Windows.removeModalWindow(this);
+ Windows.resetOverflow();
+ }
+ // To avoid bug on scrolling bar
+ this.oldStyle = this.getContent().getStyle('overflow') || "auto"
+ this.getContent().setStyle({overflow: "hidden"});
+
+ this.options.hideEffect(this.element, this.options.hideEffectOptions);
+
+ if(this.iefix)
+ this.iefix.hide();
+
+ if (!this.doNotNotifyHide)
+ this._notify("onHide");
+ },
+
+ close: function() {
+ // Asks closeCallback if exists
+ if (this.visible) {
+ if (this.options.closeCallback && ! this.options.closeCallback(this))
+ return;
+
+ if (this.options.destroyOnClose) {
+ var destroyFunc = this.destroy.bind(this);
+ if (this.options.hideEffectOptions.afterFinish) {
+ var func = this.options.hideEffectOptions.afterFinish;
+ this.options.hideEffectOptions.afterFinish = function() {func();destroyFunc() }
+ }
+ else
+ this.options.hideEffectOptions.afterFinish = function() {destroyFunc() }
+ }
+ Windows.updateFocusedWindow();
+
+ this.doNotNotifyHide = true;
+ this.hide();
+ this.doNotNotifyHide = false;
+ this._notify("onClose");
+ }
+ },
+
+ minimize: function() {
+ if (this.resizing)
+ return;
+
+ var r2 = $(this.getId() + "_row2");
+
+ if (!this.minimized) {
+ this.minimized = true;
+
+ var dh = r2.getDimensions().height;
+ this.r2Height = dh;
+ var h = this.element.getHeight() - dh;
+
+ if (this.useLeft && this.useTop && Window.hasEffectLib && Effect.ResizeWindow) {
+ new Effect.ResizeWindow(this, null, null, null, this.height -dh, {duration: Window.resizeEffectDuration});
+ } else {
+ this.height -= dh;
+ this.element.setStyle({height: h + "px"});
+ r2.hide();
+ }
+
+ if (! this.useTop) {
+ var bottom = parseFloat(this.element.getStyle('bottom'));
+ this.element.setStyle({bottom: (bottom + dh) + 'px'});
+ }
+ }
+ else {
+ this.minimized = false;
+
+ var dh = this.r2Height;
+ this.r2Height = null;
+ if (this.useLeft && this.useTop && Window.hasEffectLib && Effect.ResizeWindow) {
+ new Effect.ResizeWindow(this, null, null, null, this.height + dh, {duration: Window.resizeEffectDuration});
+ }
+ else {
+ var h = this.element.getHeight() + dh;
+ this.height += dh;
+ this.element.setStyle({height: h + "px"})
+ r2.show();
+ }
+ if (! this.useTop) {
+ var bottom = parseFloat(this.element.getStyle('bottom'));
+ this.element.setStyle({bottom: (bottom - dh) + 'px'});
+ }
+ this.toFront();
+ }
+ this._notify("onMinimize");
+
+ // Store new location/size if need be
+ this._saveCookie()
+ },
+
+ maximize: function() {
+ if (this.isMinimized() || this.resizing)
+ return;
+
+ if (Prototype.Browser.IE && this.heightN == 0)
+ this._getWindowBorderSize();
+
+ if (this.storedLocation != null) {
+ this._restoreLocation();
+ if(this.iefix)
+ this.iefix.hide();
+ }
+ else {
+ this._storeLocation();
+ Windows.unsetOverflow(this);
+
+ var windowScroll = WindowUtilities.getWindowScroll(this.options.parent);
+ var pageSize = WindowUtilities.getPageSize(this.options.parent);
+ var left = windowScroll.left;
+ var top = windowScroll.top;
+
+ if (this.options.parent != document.body) {
+ windowScroll = {top:0, left:0, bottom:0, right:0};
+ var dim = this.options.parent.getDimensions();
+ pageSize.windowWidth = dim.width;
+ pageSize.windowHeight = dim.height;
+ top = 0;
+ left = 0;
+ }
+
+ if (this.constraint) {
+ pageSize.windowWidth -= Math.max(0, this.constraintPad.left) + Math.max(0, this.constraintPad.right);
+ pageSize.windowHeight -= Math.max(0, this.constraintPad.top) + Math.max(0, this.constraintPad.bottom);
+ left += Math.max(0, this.constraintPad.left);
+ top += Math.max(0, this.constraintPad.top);
+ }
+
+ var width = pageSize.windowWidth - this.widthW - this.widthE;
+ var height= pageSize.windowHeight - this.heightN - this.heightS;
+
+ if (this.useLeft && this.useTop && Window.hasEffectLib && Effect.ResizeWindow) {
+ new Effect.ResizeWindow(this, top, left, width, height, {duration: Window.resizeEffectDuration});
+ }
+ else {
+ this.setSize(width, height);
+ this.element.setStyle(this.useLeft ? {left: left} : {right: left});
+ this.element.setStyle(this.useTop ? {top: top} : {bottom: top});
+ }
+
+ this.toFront();
+ if (this.iefix)
+ this._fixIEOverlapping();
+ }
+ this._notify("onMaximize");
+
+ // Store new location/size if need be
+ this._saveCookie()
+ },
+
+ isMinimized: function() {
+ return this.minimized;
+ },
+
+ isMaximized: function() {
+ return (this.storedLocation != null);
+ },
+
+ setOpacity: function(opacity) {
+ if (Element.setOpacity)
+ Element.setOpacity(this.element, opacity);
+ },
+
+ setZIndex: function(zindex) {
+ this.element.setStyle({zIndex: zindex});
+ Windows.updateZindex(zindex, this);
+ },
+
+ setTitle: function(newTitle) {
+ if (!newTitle || newTitle == "")
+ newTitle = " ";
+
+ Element.update(this.element.id + '_top', newTitle);
+ },
+
+ getTitle: function() {
+ return $(this.element.id + '_top').innerHTML;
+ },
+
+ setStatusBar: function(element) {
+ var statusBar = $(this.getId() + "_bottom");
+
+ if (typeof(element) == "object") {
+ if (this.bottombar.firstChild)
+ this.bottombar.replaceChild(element, this.bottombar.firstChild);
+ else
+ this.bottombar.appendChild(element);
+ }
+ else
+ this.bottombar.innerHTML = element;
+ },
+
+ _checkIEOverlapping: function() {
+ if(!this.iefix && (navigator.appVersion.indexOf('MSIE')>0) && (navigator.userAgent.indexOf('Opera')<0) && (this.element.getStyle('position')=='absolute')) {
+ new Insertion.After(this.element.id, '<iframe id="' + this.element.id + '_iefix" '+ 'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' + 'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
+ this.iefix = $(this.element.id+'_iefix');
+ }
+ if(this.iefix)
+ setTimeout(this._fixIEOverlapping.bind(this), 50);
+ },
+
+ _fixIEOverlapping: function() {
+ Position.clone(this.element, this.iefix);
+ this.iefix.style.zIndex = this.element.style.zIndex - 1;
+ this.iefix.show();
+ },
+
+ _getWindowBorderSize: function(event) {
+ // Hack to get real window border size!!
+ var div = this._createHiddenDiv(this.options.className + "_n")
+ this.heightN = Element.getDimensions(div).height;
+ div.parentNode.removeChild(div)
+
+ var div = this._createHiddenDiv(this.options.className + "_s")
+ this.heightS = Element.getDimensions(div).height;
+ div.parentNode.removeChild(div)
+
+ var div = this._createHiddenDiv(this.options.className + "_e")
+ this.widthE = Element.getDimensions(div).width;
+ div.parentNode.removeChild(div)
+
+ var div = this._createHiddenDiv(this.options.className + "_w")
+ this.widthW = Element.getDimensions(div).width;
+ div.parentNode.removeChild(div);
+
+ var div = document.createElement("div");
+ div.className = "overlay_" + this.options.className ;
+ document.body.appendChild(div);
+ //alert("no timeout:\nopacity: " + div.getStyle("opacity") + "\nwidth: " + document.defaultView.getComputedStyle(div, null).width);
+ var that = this;
+
+ // Workaround for Safari!!
+ setTimeout(function() {that.overlayOpacity = ($(div).getStyle("opacity")); div.parentNode.removeChild(div);}, 10);
+
+ // Workaround for IE!!
+ if (Prototype.Browser.IE) {
+ this.heightS = $(this.getId() +"_row3").getDimensions().height;
+ this.heightN = $(this.getId() +"_row1").getDimensions().height;
+ }
+
+ // Safari size fix
+ if (Prototype.Browser.WebKit && Prototype.Browser.WebKitVersion < 420)
+ this.setSize(this.width, this.height);
+ if (this.doMaximize)
+ this.maximize();
+ if (this.doMinimize)
+ this.minimize();
+ },
+
+ _createHiddenDiv: function(className) {
+ var objBody = document.body;
+ var win = document.createElement("div");
+ win.setAttribute('id', this.element.id+ "_tmp");
+ win.className = className;
+ win.style.display = 'none';
+ win.innerHTML = '';
+ objBody.insertBefore(win, objBody.firstChild);
+ return win;
+ },
+
+ _storeLocation: function() {
+ if (this.storedLocation == null) {
+ this.storedLocation = {useTop: this.useTop, useLeft: this.useLeft,
+ top: this.element.getStyle('top'), bottom: this.element.getStyle('bottom'),
+ left: this.element.getStyle('left'), right: this.element.getStyle('right'),
+ width: this.width, height: this.height };
+ }
+ },
+
+ _restoreLocation: function() {
+ if (this.storedLocation != null) {
+ this.useLeft = this.storedLocation.useLeft;
+ this.useTop = this.storedLocation.useTop;
+
+ if (this.useLeft && this.useTop && Window.hasEffectLib && Effect.ResizeWindow)
+ new Effect.ResizeWindow(this, this.storedLocation.top, this.storedLocation.left, this.storedLocation.width, this.storedLocation.height, {duration: Window.resizeEffectDuration});
+ else {
+ this.element.setStyle(this.useLeft ? {left: this.storedLocation.left} : {right: this.storedLocation.right});
+ this.element.setStyle(this.useTop ? {top: this.storedLocation.top} : {bottom: this.storedLocation.bottom});
+ this.setSize(this.storedLocation.width, this.storedLocation.height);
+ }
+
+ Windows.resetOverflow();
+ this._removeStoreLocation();
+ }
+ },
+
+ _removeStoreLocation: function() {
+ this.storedLocation = null;
+ },
+
+ _saveCookie: function() {
+ if (this.cookie) {
+ var value = "";
+ if (this.useLeft)
+ value += "l:" + (this.storedLocation ? this.storedLocation.left : this.element.getStyle('left'))
+ else
+ value += "r:" + (this.storedLocation ? this.storedLocation.right : this.element.getStyle('right'))
+ if (this.useTop)
+ value += ",t:" + (this.storedLocation ? this.storedLocation.top : this.element.getStyle('top'))
+ else
+ value += ",b:" + (this.storedLocation ? this.storedLocation.bottom :this.element.getStyle('bottom'))
+
+ value += "," + (this.storedLocation ? this.storedLocation.width : this.width);
+ value += "," + (this.storedLocation ? this.storedLocation.height : this.height);
+ value += "," + this.isMinimized();
+ value += "," + this.isMaximized();
+ WindowUtilities.setCookie(value, this.cookie)
+ }
+ },
+
+ _createWiredElement: function() {
+ if (! this.wiredElement) {
+ if (Prototype.Browser.IE)
+ this._getWindowBorderSize();
+ var div = document.createElement("div");
+ div.className = "wired_frame " + this.options.className + "_wired_frame";
+
+ div.style.position = 'absolute';
+ this.options.parent.insertBefore(div, this.options.parent.firstChild);
+ this.wiredElement = $(div);
+ }
+ if (this.useLeft)
+ this.wiredElement.setStyle({left: this.element.getStyle('left')});
+ else
+ this.wiredElement.setStyle({right: this.element.getStyle('right')});
+
+ if (this.useTop)
+ this.wiredElement.setStyle({top: this.element.getStyle('top')});
+ else
+ this.wiredElement.setStyle({bottom: this.element.getStyle('bottom')});
+
+ var dim = this.element.getDimensions();
+ this.wiredElement.setStyle({width: dim.width + "px", height: dim.height +"px"});
+
+ this.wiredElement.setStyle({zIndex: Windows.maxZIndex+30});
+ return this.wiredElement;
+ },
+
+ _hideWiredElement: function() {
+ if (! this.wiredElement || ! this.currentDrag)
+ return;
+ if (this.currentDrag == this.element)
+ this.currentDrag = null;
+ else {
+ if (this.useLeft)
+ this.element.setStyle({left: this.currentDrag.getStyle('left')});
+ else
+ this.element.setStyle({right: this.currentDrag.getStyle('right')});
+
+ if (this.useTop)
+ this.element.setStyle({top: this.currentDrag.getStyle('top')});
+ else
+ this.element.setStyle({bottom: this.currentDrag.getStyle('bottom')});
+
+ this.currentDrag.hide();
+ this.currentDrag = null;
+ if (this.doResize)
+ this.setSize(this.width, this.height);
+ }
+ },
+
+ _notify: function(eventName) {
+ if (this.options[eventName])
+ this.options[eventName](this);
+ else
+ Windows.notify(eventName, this);
+ }
+};
+
+// Windows containers, register all page windows
+var Windows = {
+ windows: [],
+ modalWindows: [],
+ observers: [],
+ focusedWindow: null,
+ maxZIndex: 0,
+ overlayShowEffectOptions: {duration: 0.5},
+ overlayHideEffectOptions: {duration: 0.5},
+
+ addObserver: function(observer) {
+ this.removeObserver(observer);
+ this.observers.push(observer);
+ },
+
+ removeObserver: function(observer) {
+ this.observers = this.observers.reject( function(o) { return o==observer });
+ },
+
+ // onDestroy onStartResize onStartMove onResize onMove onEndResize onEndMove onFocus onBlur onBeforeShow onShow onHide onMinimize onMaximize onClose
+ notify: function(eventName, win) {
+ this.observers.each( function(o) {if(o[eventName]) o[eventName](eventName, win);});
+ },
+
+ // Gets window from its id
+ getWindow: function(id) {
+ return this.windows.detect(function(d) { return d.getId() ==id });
+ },
+
+ // Gets the last focused window
+ getFocusedWindow: function() {
+ return this.focusedWindow;
+ },
+
+ updateFocusedWindow: function() {
+ this.focusedWindow = this.windows.length >=2 ? this.windows[this.windows.length-2] : null;
+ },
+
+ // Registers a new window (called by Windows constructor)
+ register: function(win) {
+ this.windows.push(win);
+ },
+
+ // Add a modal window in the stack
+ addModalWindow: function(win) {
+ // Disable screen if first modal window
+ if (this.modalWindows.length == 0) {
+ WindowUtilities.disableScreen(win.options.className, 'overlay_modal', win.overlayOpacity, win.getId(), win.options.parent);
+ }
+ else {
+ // Move overlay over all windows
+ if (Window.keepMultiModalWindow) {
+ $('overlay_modal').style.zIndex = Windows.maxZIndex + 1;
+ Windows.maxZIndex += 1;
+ WindowUtilities._hideSelect(this.modalWindows.last().getId());
+ }
+ // Hide current modal window
+ else
+ this.modalWindows.last().element.hide();
+ // Fucking IE select issue
+ WindowUtilities._showSelect(win.getId());
+ }
+ this.modalWindows.push(win);
+ },
+
+ removeModalWindow: function(win) {
+ this.modalWindows.pop();
+
+ // No more modal windows
+ if (this.modalWindows.length == 0)
+ WindowUtilities.enableScreen();
+ else {
+ if (Window.keepMultiModalWindow) {
+ this.modalWindows.last().toFront();
+ WindowUtilities._showSelect(this.modalWindows.last().getId());
+ }
+ else
+ this.modalWindows.last().element.show();
+ }
+ },
+
+ // Registers a new window (called by Windows constructor)
+ register: function(win) {
+ this.windows.push(win);
+ },
+
+ // Unregisters a window (called by Windows destructor)
+ unregister: function(win) {
+ this.windows = this.windows.reject(function(d) { return d==win });
+ },
+
+ // Closes all windows
+ closeAll: function() {
+ this.windows.each( function(w) {Windows.close(w.getId())} );
+ },
+
+ closeAllModalWindows: function() {
+ WindowUtilities.enableScreen();
+ this.modalWindows.each( function(win) {if (win) win.close()});
+ },
+
+ // Minimizes a window with its id
+ minimize: function(id, event) {
+ var win = this.getWindow(id)
+ if (win && win.visible)
+ win.minimize();
+ Event.stop(event);
+ },
+
+ // Maximizes a window with its id
+ maximize: function(id, event) {
+ var win = this.getWindow(id)
+ if (win && win.visible)
+ win.maximize();
+ Event.stop(event);
+ },
+
+ // Closes a window with its id
+ close: function(id, event) {
+ var win = this.getWindow(id);
+ if (win)
+ win.close();
+ if (event)
+ Event.stop(event);
+ },
+
+ blur: function(id) {
+ var win = this.getWindow(id);
+ if (!win)
+ return;
+ if (win.options.blurClassName)
+ win.changeClassName(win.options.blurClassName);
+ if (this.focusedWindow == win)
+ this.focusedWindow = null;
+ win._notify("onBlur");
+ },
+
+ focus: function(id) {
+ var win = this.getWindow(id);
+ if (!win)
+ return;
+ if (this.focusedWindow)
+ this.blur(this.focusedWindow.getId())
+
+ if (win.options.focusClassName)
+ win.changeClassName(win.options.focusClassName);
+ this.focusedWindow = win;
+ win._notify("onFocus");
+ },
+
+ unsetOverflow: function(except) {
+ this.windows.each(function(d) { d.oldOverflow = d.getContent().getStyle("overflow") || "auto" ; d.getContent().setStyle({overflow: "hidden"}) });
+ if (except && except.oldOverflow)
+ except.getContent().setStyle({overflow: except.oldOverflow});
+ },
+
+ resetOverflow: function() {
+ this.windows.each(function(d) { if (d.oldOverflow) d.getContent().setStyle({overflow: d.oldOverflow}) });
+ },
+
+ updateZindex: function(zindex, win) {
+ if (zindex > this.maxZIndex) {
+ this.maxZIndex = zindex;
+ if (this.focusedWindow)
+ this.blur(this.focusedWindow.getId())
+ }
+ this.focusedWindow = win;
+ if (this.focusedWindow)
+ this.focus(this.focusedWindow.getId())
+ }
+};
+
+var Dialog = {
+ dialogId: null,
+ onCompleteFunc: null,
+ callFunc: null,
+ parameters: null,
+
+ confirm: function(content, parameters) {
+ // Get Ajax return before
+ if (content && typeof content != "string") {
+ Dialog._runAjaxRequest(content, parameters, Dialog.confirm);
+ return
+ }
+ content = content || "";
+
+ parameters = parameters || {};
+ var okLabel = parameters.okLabel ? parameters.okLabel : "Ok";
+ var cancelLabel = parameters.cancelLabel ? parameters.cancelLabel : "Cancel";
+
+ // Backward compatibility
+ parameters = Object.extend(parameters, parameters.windowParameters || {});
+ parameters.windowParameters = parameters.windowParameters || {};
+
+ parameters.className = parameters.className || "alert";
+
+ var okButtonClass = "class ='" + (parameters.buttonClass ? parameters.buttonClass + " " : "") + " ok_button'"
+ var cancelButtonClass = "class ='" + (parameters.buttonClass ? parameters.buttonClass + " " : "") + " cancel_button'"
+ var content = "\
+ <div class='" + parameters.className + "_message'>" + content + "</div>\
+ <div class='" + parameters.className + "_buttons'>\
+ <input type='button' value='" + okLabel + "' onclick='Dialog.okCallback()' " + okButtonClass + "/>\
+ <input type='button' value='" + cancelLabel + "' onclick='Dialog.cancelCallback()' " + cancelButtonClass + "/>\
+ </div>\
+ ";
+ return this._openDialog(content, parameters)
+ },
+
+ alert: function(content, parameters) {
+ // Get Ajax return before
+ if (content && typeof content != "string") {
+ Dialog._runAjaxRequest(content, parameters, Dialog.alert);
+ return
+ }
+ content = content || "";
+
+ parameters = parameters || {};
+ var okLabel = parameters.okLabel ? parameters.okLabel : "Ok";
+
+ // Backward compatibility
+ parameters = Object.extend(parameters, parameters.windowParameters || {});
+ parameters.windowParameters = parameters.windowParameters || {};
+
+ parameters.className = parameters.className || "alert";
+
+ var okButtonClass = "class ='" + (parameters.buttonClass ? parameters.buttonClass + " " : "") + " ok_button'"
+ var content = "\
+ <div class='" + parameters.className + "_message'>" + content + "</div>\
+ <div class='" + parameters.className + "_buttons'>\
+ <input type='button' value='" + okLabel + "' onclick='Dialog.okCallback()' " + okButtonClass + "/>\
+ </div>";
+ return this._openDialog(content, parameters)
+ },
+
+ info: function(content, parameters) {
+ // Get Ajax return before
+ if (content && typeof content != "string") {
+ Dialog._runAjaxRequest(content, parameters, Dialog.info);
+ return
+ }
+ content = content || "";
+
+ // Backward compatibility
+ parameters = parameters || {};
+ parameters = Object.extend(parameters, parameters.windowParameters || {});
+ parameters.windowParameters = parameters.windowParameters || {};
+
+ parameters.className = parameters.className || "alert";
+
+ var content = "<div id='modal_dialog_message' class='" + parameters.className + "_message'>" + content + "</div>";
+ if (parameters.showProgress)
+ content += "<div id='modal_dialog_progress' class='" + parameters.className + "_progress'> </div>";
+
+ parameters.ok = null;
+ parameters.cancel = null;
+
+ return this._openDialog(content, parameters)
+ },
+
+ setInfoMessage: function(message) {
+ $('modal_dialog_message').update(message);
+ },
+
+ closeInfo: function() {
+ Windows.close(this.dialogId);
+ },
+
+ _openDialog: function(content, parameters) {
+ var className = parameters.className;
+
+ if (! parameters.height && ! parameters.width) {
+ parameters.width = WindowUtilities.getPageSize(parameters.options.parent || document.body).pageWidth / 2;
+ }
+ if (parameters.id)
+ this.dialogId = parameters.id;
+ else {
+ var t = new Date();
+ this.dialogId = 'modal_dialog_' + t.getTime();
+ parameters.id = this.dialogId;
+ }
+
+ // compute height or width if need be
+ if (! parameters.height || ! parameters.width) {
+ var size = WindowUtilities._computeSize(content, this.dialogId, parameters.width, parameters.height, 5, className)
+ if (parameters.height)
+ parameters.width = size + 5
+ else
+ parameters.height = size + 5
+ }
+ parameters.effectOptions = parameters.effectOptions ;
+ parameters.resizable = parameters.resizable || false;
+ parameters.minimizable = parameters.minimizable || false;
+ parameters.maximizable = parameters.maximizable || false;
+ parameters.draggable = parameters.draggable || false;
+ parameters.closable = parameters.closable || false;
+
+ var win = new Window(parameters);
+ win.getContent().innerHTML = content;
+
+ win.showCenter(true, parameters.top, parameters.left);
+ win.setDestroyOnClose();
+
+ win.cancelCallback = parameters.onCancel || parameters.cancel;
+ win.okCallback = parameters.onOk || parameters.ok;
+
+ return win;
+ },
+
+ _getAjaxContent: function(originalRequest) {
+ Dialog.callFunc(originalRequest.responseText, Dialog.parameters)
+ },
+
+ _runAjaxRequest: function(message, parameters, callFunc) {
+ if (message.options == null)
+ message.options = {}
+ Dialog.onCompleteFunc = message.options.onComplete;
+ Dialog.parameters = parameters;
+ Dialog.callFunc = callFunc;
+
+ message.options.onComplete = Dialog._getAjaxContent;
+ new Ajax.Request(message.url, message.options);
+ },
+
+ okCallback: function() {
+ var win = Windows.focusedWindow;
+ if (!win.okCallback || win.okCallback(win)) {
+ // Remove onclick on button
+ $$("#" + win.getId()+" input").each(function(element) {element.onclick=null;})
+ win.close();
+ }
+ },
+
+ cancelCallback: function() {
+ var win = Windows.focusedWindow;
+ // Remove onclick on button
+ $$("#" + win.getId()+" input").each(function(element) {element.onclick=null})
+ win.close();
+ if (win.cancelCallback)
+ win.cancelCallback(win);
+ }
+}
+/*
+ Based on Lightbox JS: Fullsize Image Overlays
+ by Lokesh Dhakar - http://www.huddletogether.com
+
+ For more information on this script, visit:
+ http://huddletogether.com/projects/lightbox/
+
+ Licensed under the Creative Commons Attribution 2.5 License - http://creativecommons.org/licenses/by/2.5/
+ (basically, do anything you want, just leave my name and link)
+*/
+
+if (Prototype.Browser.WebKit) {
+ var array = navigator.userAgent.match(new RegExp(/AppleWebKit\/([\d\.\+]*)/));
+ Prototype.Browser.WebKitVersion = parseFloat(array[1]);
+}
+
+var WindowUtilities = {
+ // From dragdrop.js
+ getWindowScroll: function(parent) {
+ var T, L, W, H;
+ parent = parent || document.body;
+ if (parent != document.body) {
+ T = parent.scrollTop;
+ L = parent.scrollLeft;
+ W = parent.scrollWidth;
+ H = parent.scrollHeight;
+ }
+ else {
+ var w = window;
+ with (w.document) {
+ if (w.document.documentElement && documentElement.scrollTop) {
+ T = documentElement.scrollTop;
+ L = documentElement.scrollLeft;
+ } else if (w.document.body) {
+ T = body.scrollTop;
+ L = body.scrollLeft;
+ }
+ if (w.innerWidth) {
+ W = w.innerWidth;
+ H = w.innerHeight;
+ } else if (w.document.documentElement && documentElement.clientWidth) {
+ W = documentElement.clientWidth;
+ H = documentElement.clientHeight;
+ } else {
+ W = body.offsetWidth;
+ H = body.offsetHeight
+ }
+ }
+ }
+ return { top: T, left: L, width: W, height: H };
+ },
+ //
+ // getPageSize()
+ // Returns array with page width, height and window width, height
+ // Core code from - quirksmode.org
+ // Edit for Firefox by pHaez
+ //
+ getPageSize: function(parent){
+ parent = parent || document.body;
+ var windowWidth, windowHeight;
+ var pageHeight, pageWidth;
+ if (parent != document.body) {
+ windowWidth = parent.getWidth();
+ windowHeight = parent.getHeight();
+ pageWidth = parent.scrollWidth;
+ pageHeight = parent.scrollHeight;
+ }
+ else {
+ var xScroll, yScroll;
+
+ if (window.innerHeight && window.scrollMaxY) {
+ xScroll = document.body.scrollWidth;
+ yScroll = window.innerHeight + window.scrollMaxY;
+ } else if (document.body.scrollHeight > document.body.offsetHeight){ // all but Explorer Mac
+ xScroll = document.body.scrollWidth;
+ yScroll = document.body.scrollHeight;
+ } else { // Explorer Mac...would also work in Explorer 6 Strict, Mozilla and Safari
+ xScroll = document.body.offsetWidth;
+ yScroll = document.body.offsetHeight;
+ }
+
+
+ if (self.innerHeight) { // all except Explorer
+ windowWidth = self.innerWidth;
+ windowHeight = self.innerHeight;
+ } else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
+ windowWidth = document.documentElement.clientWidth;
+ windowHeight = document.documentElement.clientHeight;
+ } else if (document.body) { // other Explorers
+ windowWidth = document.body.clientWidth;
+ windowHeight = document.body.clientHeight;
+ }
+
+ // for small pages with total height less then height of the viewport
+ if(yScroll < windowHeight){
+ pageHeight = windowHeight;
+ } else {
+ pageHeight = yScroll;
+ }
+
+ // for small pages with total width less then width of the viewport
+ if(xScroll < windowWidth){
+ pageWidth = windowWidth;
+ } else {
+ pageWidth = xScroll;
+ }
+ }
+ return {pageWidth: pageWidth ,pageHeight: pageHeight , windowWidth: windowWidth, windowHeight: windowHeight};
+ },
+
+ disableScreen: function(className, overlayId, overlayOpacity, contentId, parent) {
+ WindowUtilities.initLightbox(overlayId, className, function() {this._disableScreen(className, overlayId, overlayOpacity, contentId)}.bind(this), parent || document.body);
+ },
+
+ _disableScreen: function(className, overlayId, overlayOpacity, contentId) {
+ // prep objects
+ var objOverlay = $(overlayId);
+
+ var pageSize = WindowUtilities.getPageSize(objOverlay.parentNode);
+
+ // Hide select boxes as they will 'peek' through the image in IE, store old value
+ if (contentId && Prototype.Browser.IE) {
+ WindowUtilities._hideSelect();
+ WindowUtilities._showSelect(contentId);
+ }
+
+ // set height of Overlay to take up whole page and show
+ objOverlay.style.height = (pageSize.pageHeight + 'px');
+ objOverlay.style.display = 'none';
+ if (overlayId == "overlay_modal" && Window.hasEffectLib && Windows.overlayShowEffectOptions) {
+ objOverlay.overlayOpacity = overlayOpacity;
+ new Effect.Appear(objOverlay, Object.extend({from: 0, to: overlayOpacity}, Windows.overlayShowEffectOptions));
+ }
+ else
+ objOverlay.style.display = "block";
+ },
+
+ enableScreen: function(id) {
+ id = id || 'overlay_modal';
+ var objOverlay = $(id);
+ if (objOverlay) {
+ // hide lightbox and overlay
+ if (id == "overlay_modal" && Window.hasEffectLib && Windows.overlayHideEffectOptions)
+ new Effect.Fade(objOverlay, Object.extend({from: objOverlay.overlayOpacity, to:0}, Windows.overlayHideEffectOptions));
+ else {
+ objOverlay.style.display = 'none';
+ objOverlay.parentNode.removeChild(objOverlay);
+ }
+
+ // make select boxes visible using old value
+ if (id != "__invisible__")
+ WindowUtilities._showSelect();
+ }
+ },
+
+ _hideSelect: function(id) {
+ if (Prototype.Browser.IE) {
+ id = id == null ? "" : "#" + id + " ";
+ $$(id + 'select').each(function(element) {
+ if (! WindowUtilities.isDefined(element.oldVisibility)) {
+ element.oldVisibility = element.style.visibility ? element.style.visibility : "visible";
+ element.style.visibility = "hidden";
+ }
+ });
+ }
+ },
+
+ _showSelect: function(id) {
+ if (Prototype.Browser.IE) {
+ id = id == null ? "" : "#" + id + " ";
+ $$(id + 'select').each(function(element) {
+ if (WindowUtilities.isDefined(element.oldVisibility)) {
+ // Why?? Ask IE
+ try {
+ element.style.visibility = element.oldVisibility;
+ } catch(e) {
+ element.style.visibility = "visible";
+ }
+ element.oldVisibility = null;
+ }
+ else {
+ if (element.style.visibility)
+ element.style.visibility = "visible";
+ }
+ });
+ }
+ },
+
+ isDefined: function(object) {
+ return typeof(object) != "undefined" && object != null;
+ },
+
+ // initLightbox()
+ // Function runs on window load, going through link tags looking for rel="lightbox".
+ // These links receive onclick events that enable the lightbox display for their targets.
+ // The function also inserts html markup at the top of the page which will be used as a
+ // container for the overlay pattern and the inline image.
+ initLightbox: function(id, className, doneHandler, parent) {
+ // Already done, just update zIndex
+ if ($(id)) {
+ Element.setStyle(id, {zIndex: Windows.maxZIndex + 1});
+ Windows.maxZIndex++;
+ doneHandler();
+ }
+ // create overlay div and hardcode some functional styles (aesthetic styles are in CSS file)
+ else {
+ var objOverlay = document.createElement("div");
+ objOverlay.setAttribute('id', id);
+ objOverlay.className = "overlay_" + className
+ objOverlay.style.display = 'none';
+ objOverlay.style.position = 'absolute';
+ objOverlay.style.top = '0';
+ objOverlay.style.left = '0';
+ objOverlay.style.zIndex = Windows.maxZIndex + 1;
+ Windows.maxZIndex++;
+ objOverlay.style.width = '100%';
+ parent.insertBefore(objOverlay, parent.firstChild);
+ if (Prototype.Browser.WebKit && id == "overlay_modal") {
+ setTimeout(function() {doneHandler()}, 10);
+ }
+ else
+ doneHandler();
+ }
+ },
+
+ setCookie: function(value, parameters) {
+ document.cookie= parameters[0] + "=" + escape(value) +
+ ((parameters[1]) ? "; expires=" + parameters[1].toGMTString() : "") +
+ ((parameters[2]) ? "; path=" + parameters[2] : "") +
+ ((parameters[3]) ? "; domain=" + parameters[3] : "") +
+ ((parameters[4]) ? "; secure" : "");
+ },
+
+ getCookie: function(name) {
+ var dc = document.cookie;
+ var prefix = name + "=";
+ var begin = dc.indexOf("; " + prefix);
+ if (begin == -1) {
+ begin = dc.indexOf(prefix);
+ if (begin != 0) return null;
+ } else {
+ begin += 2;
+ }
+ var end = document.cookie.indexOf(";", begin);
+ if (end == -1) {
+ end = dc.length;
+ }
+ return unescape(dc.substring(begin + prefix.length, end));
+ },
+
+ _computeSize: function(content, id, width, height, margin, className) {
+ var objBody = document.body;
+ var tmpObj = document.createElement("div");
+ tmpObj.setAttribute('id', id);
+ tmpObj.className = className + "_content";
+
+ if (height)
+ tmpObj.style.height = height + "px"
+ else
+ tmpObj.style.width = width + "px"
+
+ tmpObj.style.position = 'absolute';
+ tmpObj.style.top = '0';
+ tmpObj.style.left = '0';
+ tmpObj.style.display = 'none';
+
+ tmpObj.innerHTML = content;
+ objBody.insertBefore(tmpObj, objBody.firstChild);
+
+ var size;
+ if (height)
+ size = $(tmpObj).getDimensions().width + margin;
+ else
+ size = $(tmpObj).getDimensions().height + margin;
+ objBody.removeChild(tmpObj);
+ return size;
+ }
+}
// initalize the resize tracker
Event.observe(window, "load", WindowResizeTracker.init);
Modified: branches/EmbJopr_1_3_1_MyFaces/jsfunit/pom.xml
===================================================================
--- branches/EmbJopr_1_3_1_MyFaces/jsfunit/pom.xml 2009-10-22 17:40:19 UTC (rev 808)
+++ branches/EmbJopr_1_3_1_MyFaces/jsfunit/pom.xml 2009-10-22 17:59:16 UTC (rev 809)
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<properties>
- <jopr.version>1.2.0-SNAPSHOT</jopr.version>
+ <jopr.version>1.3.2-SNAPSHOT</jopr.version>
<cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version>
<jvm.args.debug></jvm.args.debug> <!-- Used by the -Pdebug profile. -->
<jvm.args.profiler></jvm.args.profiler> <!-- Used by the -Pprofile profile. -->
@@ -14,13 +14,13 @@
<cargo.jboss.configuration>default</cargo.jboss.configuration><!-- JBoss AS configuration. -->
<cargo.jboss.bind.address>localhost</cargo.jboss.bind.address><!-- Address for JBoss AS to bind to. -->
<htmlunit.browser>ff3</htmlunit.browser><!-- ff2 | ff3 | ie6 | ie7 -->
- <jboss.isSecured>true</jboss.isSecured><!-- true | false ; True if JBoss AS/EAP is secured. Only informative for EJTT - has no effect on AS. -->
+ <jboss.isSecured>false</jboss.isSecured><!-- true | false ; True if JBoss AS/EAP is secured. Only informative for EJTT - has no effect on AS. -->
</properties>
<parent>
<groupId>org.jboss.jopr</groupId>
<artifactId>jopr-embedded-parent</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jopr</groupId>
@@ -69,20 +69,18 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <scope>compile</scope>
- <version>2.3</version>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
- <scope>compile</scope>
- <version>1.7R1</version>
+ <version>1.7R2</version>
</dependency>
<dependency>
<groupId>org.jboss.jsfunit</groupId>
<artifactId>jboss-jsfunit-core</artifactId>
- <version>1.0.0.GA</version>
+ <version>1.1.0.GA</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -98,19 +96,18 @@
<dependency>
<groupId>org.jboss.jsfunit</groupId>
<artifactId>jboss-jsfunit-richfaces</artifactId>
- <version>1.0.0.GA</version>
+ <version>1.1.0.GA</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
+ <version>1.2_10</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-j2se</artifactId>
- <version>5.0.1.GA</version>
+ <version>5.1.0.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -129,9 +126,15 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>provided</scope>
- <version>2.8.1</version>
+ <version>2.9.1</version>
</dependency>
<dependency>
+ <groupId>net.sourceforge.nekohtml</groupId>
+ <artifactId>nekohtml</artifactId>
+ <version>1.9.9</version>
+ </dependency>
+
+ <dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
@@ -150,7 +153,7 @@
<dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-metatype</artifactId>
- <version>2.1.0.SP1</version>
+ <version>2.1.1.GA</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -168,7 +171,7 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
- <version>5.0.1.GA</version>
+ <version>5.2.0.Beta1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml 2009-10-22 17:40:19 UTC (rev 808)
+++ branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/main/webapp/WEB-INF/web.xml 2009-10-22 17:59:16 UTC (rev 809)
@@ -19,6 +19,11 @@
~ License along with this program; if not, write to the Free Software
~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-->
+
+ <!--
+ This special version of web.xml allows Embedded Jopr to use MyFaces instead of
+ the built-in Mojarra JSF implementaiton.
+ -->
<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -36,13 +41,7 @@
<param-value>jboss-console</param-value>
</context-param>
- <!-- It doesn't allow A4J to reformat JavaScript files (makes it impossible to debug) -->
- <context-param>
- <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
- <param-value>false</param-value>
- </context-param>
-
- <!-- JSFUnit -->
+ <!-- JSFUnit -->
<filter>
<filter-name>JSFUnitFilter</filter-name>
<filter-class>org.jboss.jsfunit.framework.JSFUnitFilter</filter-class>
@@ -51,74 +50,77 @@
<filter-mapping>
<filter-name>JSFUnitFilter</filter-name>
<servlet-name>ServletTestRunner</servlet-name>
- </filter-mapping>
-
+ </filter-mapping>
+
<filter-mapping>
<filter-name>JSFUnitFilter</filter-name>
<servlet-name>ServletRedirector</servlet-name>
</filter-mapping>
-
+
<servlet>
<servlet-name>ServletRedirector</servlet-name>
<servlet-class>org.jboss.jsfunit.framework.JSFUnitServletRedirector</servlet-class>
</servlet>
-
+
<servlet>
<servlet-name>ServletTestRunner</servlet-name>
<servlet-class>org.apache.cactus.server.runner.ServletTestRunner</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletRedirector</servlet-name>
<url-pattern>/ServletRedirector.jsfunit</url-pattern>
- </servlet-mapping>
-
+ </servlet-mapping>
+
<servlet-mapping>
<servlet-name>ServletTestRunner</servlet-name>
<url-pattern>/ServletTestRunner.jsfunit</url-pattern>
- </servlet-mapping>
-
-
- <!-- Seam -->
+ </servlet-mapping>
+ <!-- Seam (lazy loaded)-->
+ <context-param>
+ <param-name>org.jboss.on.embedded.LazyStartupListener</param-name>
+ <param-value>org.jboss.seam.servlet.SeamListener</param-value>
+ </context-param>
<listener>
- <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ <listener-class>org.jboss.on.embedded.LazyStartupListener</listener-class>
</listener>
-
-
-
<!-- From Seam docs: The Seam master filter must be the first filter specified
in web.xml. This ensures it is run first. -->
<filter>
<filter-name>Seam Filter</filter-name>
- <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
+ <!-- Lazily start up the Seam Filter -->
+ <filter-class>org.jboss.on.embedded.LazyStartupFilter</filter-class>
+ <init-param>
+ <param-name>org.jboss.on.embedded.LazyStartupFilter</param-name>
+ <param-value>org.jboss.seam.servlet.SeamFilter</param-value>
+ </init-param>
</filter>
<filter-mapping>
<filter-name>Seam Filter</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>
-
+ </filter-mapping>
+
<!-- JSF -->
-
+
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.seam</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
<param-value>/WEB-INF/navigation.xml</param-value>
</context-param>
-
+
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>client</param-value>
+ <param-value>server</param-value>
</context-param>
<context-param>
@@ -126,12 +128,16 @@
<param-value>.xhtml</param-value>
</context-param>
- <!-- JSF RI -->
-
+ <!-- MyFaces -->
+ <context-param>
+ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<listener>
- <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
</listener>
-
+
<!-- Facelets -->
<!-- load our Facelets taglibs (value must be semicolon-delimited) -->
@@ -167,6 +173,5 @@
<security-role>
<role-name>JBossAdmin</role-name>
</security-role>
-
</web-app>
Modified: branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
===================================================================
--- branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-10-22 17:40:19 UTC (rev 808)
+++ branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-10-22 17:59:16 UTC (rev 809)
@@ -128,14 +128,14 @@
//public static final String NAV_EJB = "EJB Application (EJB JAR)s";
public static final String NAV_EJB2 = "EJB2 JARs";
public static final String NAV_EJB3 = "EJB3 JARs";
- public static final String NAV_EAR = "EARs";
+ public static final String NAV_EAR = "Enterprise Application (EAR)s";
public static final String NAV_SAR = "SARs";
public static final String NAV_MC = "MC Beans";
public static final String NAV_PAR = "PARs";
- public static final String NAV_RAR = "RARs";
- public static final String NAV_WAR = "WARs";
- public static final String NAV_EMB_WAR = "Embedded WARs";
- public static final String NAV_EMB_RAR = "Embedded RARs";
+ public static final String NAV_RAR = "Resource Adapter Archive (RAR)s";
+ public static final String NAV_WAR = "Web Application (WAR)s";
+ public static final String NAV_EMB_WAR = "Embedded Web Application (WAR)s";
+ public static final String NAV_EMB_RAR = "Resource Adapter Archive (RAR)s";
// Non-app resource types.
public static final String NAV_SBM = "Service Binding Manager";
Modified: branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java
===================================================================
--- branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java 2009-10-22 17:40:19 UTC (rev 808)
+++ branches/EmbJopr_1_3_1_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java 2009-10-22 17:59:16 UTC (rev 809)
@@ -103,7 +103,7 @@
// Click the nav tree.
- String linkLabel = AppConstants.NAV_WAR;
+ String linkLabel = "Web Application (WAR)s";
//HtmlAnchor warLink = getNavTreeLink(linkLabel);
HtmlAnchor warLink = ejtt.navTree.getNodeLink(linkLabel);
warLink.click();
More information about the embjopr-commits
mailing list