JBoss Portal SVN: r11905 - modules/identity/trunk/.settings.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-16 06:32:59 -0400 (Tue, 16 Sep 2008)
New Revision: 11905
Modified:
modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs
Log:
Eclipse update
Modified: modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs 2008-09-16 10:26:00 UTC (rev 11904)
+++ modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs 2008-09-16 10:32:59 UTC (rev 11905)
@@ -1,7 +1,8 @@
-#Mon May 26 12:21:18 CEST 2008
+#Mon Sep 01 19:43:45 CEST 2008
activeProfiles=
eclipse.preferences.version=1
filterResources=false
+fullBuildGoals=process-test-resources
includeModules=true
resolveWorkspaceProjects=true
resourceFilterGoals=process-resources resources\:testResources
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11904 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: resources/portal-identity-sar/conf/bundles and 1 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-09-16 06:26:00 -0400 (Tue, 16 Sep 2008)
New Revision: 11904
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
Log:
JBPORTAL-2164: Show error message for password update in identity admin portlet
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2008-09-16 09:55:14 UTC (rev 11903)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2008-09-16 10:26:00 UTC (rev 11904)
@@ -278,12 +278,12 @@
catch (Exception e)
{
log.error("error while updating password", e);
- ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(FacesMessage.SEVERITY_ERROR, bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"), ""));
}
}
else
{
- ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(FacesMessage.SEVERITY_ERROR, bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"), ""));
}
this.resetWindowState(ctx);
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-16 09:55:14 UTC (rev 11903)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-16 10:26:00 UTC (rev 11904)
@@ -54,8 +54,8 @@
IDENTITY_EDIT_PASSWORD_TITLE=Change your password
IDENTITY_EDIT_PASSWORD_CURRENT=Current password
IDENTITY_EDIT_CHANGE_PASSWORD=Change password
-IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
-IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change password.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Password has been updated.
IDENTITY_EDIT_EMAIL_TITLE=Change your email address
IDENTITY_EDIT_EMAIL_NEW=New email address
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2008-09-16 09:55:14 UTC (rev 11903)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2008-09-16 10:26:00 UTC (rev 11904)
@@ -20,7 +20,9 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h3>
- <h:form>
+ <h:messages infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+ <h:form>
<h:panelGrid columns="4">
<h:inputText id="searchString" value="#{useradministrationbean.searchString}" />
<h:commandButton id ="search" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="#{useradministrationbean.searchUsers}" styleClass="portlet-form-button"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11903 - branches/JBoss_Portal_Branch_2_7/core-cms.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-16 05:55:14 -0400 (Tue, 16 Sep 2008)
New Revision: 11903
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/.classpath
Log:
cms project has moved to a module
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/.classpath 2008-09-16 07:59:10 UTC (rev 11902)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/.classpath 2008-09-16 09:55:14 UTC (rev 11903)
@@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/cms"/>
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
@@ -27,5 +26,6 @@
<classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbpm/jpdl/lib/jbpm-jpdl.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/cms/lib/cms-jackrabbit-trunk-SNAPSHOT.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11902 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-16 03:59:10 -0400 (Tue, 16 Sep 2008)
New Revision: 11902
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
Log:
Use JSF 1.2_08-brew (the one used by EAP 4.3CP1)
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-15 20:02:35 UTC (rev 11901)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-16 07:59:10 UTC (rev 11902)
@@ -107,7 +107,7 @@
<componentref name="sun-jaf" version="1.1"/>
<componentref name="sun-javacc" version="3.2-portal"/>
<componentref name="sun-javamail" version="1.3.1"/>
- <componentref name="sun-jsf" version="1.2_09"/>
+ <componentref name="sun-jsf" version="1.2_08-brew"/>
<componentref name="sun-opends" version="snapshot"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaxb" version="2.1.4"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11901 - in branches/JBoss_Portal_Branch_2_7: core/src/bin/portal-core-war/js and 7 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-09-15 16:02:35 -0400 (Mon, 15 Sep 2008)
New Revision: 11901
Added:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domLib.js
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT.js
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT_drag.js
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/fadomatic.js
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/common.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/portlet-editor.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/tooltip.css
Removed:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domLib.js
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT.js
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT_drag.js
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/fadomatic.js
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
Begin css refactor and cleanup, modularize js and css, and upgrade to JSF 1.2_09
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-15 20:02:35 UTC (rev 11901)
@@ -107,7 +107,7 @@
<componentref name="sun-jaf" version="1.1"/>
<componentref name="sun-javacc" version="3.2-portal"/>
<componentref name="sun-javamail" version="1.3.1"/>
- <componentref name="sun-jsf" version="1.2_04_P02"/>
+ <componentref name="sun-jsf" version="1.2_09"/>
<componentref name="sun-opends" version="snapshot"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaxb" version="2.1.4"/>
Copied: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domLib.js (from rev 11900, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domLib.js)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domLib.js (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domLib.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -0,0 +1,706 @@
+/** $Id: domLib.js 2321 2006-06-12 06:45:41Z dallen $ */
+// {{{ license
+
+/*
+ * Copyright 2002-2005 Dan Allen, Mojavelinux.com (dan.allen(a)mojavelinux.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// }}}
+// {{{ intro
+
+/**
+ * Title: DOM Library Core
+ * Version: 0.70
+ *
+ * Summary:
+ * A set of commonly used functions that make it easier to create javascript
+ * applications that rely on the DOM.
+ *
+ * Updated: 2005/05/17
+ *
+ * Maintainer: Dan Allen <dan.allen(a)mojavelinux.com>
+ * Maintainer: Jason Rust <jrust(a)rustyparts.com>
+ *
+ * License: Apache 2.0
+ */
+
+// }}}
+// {{{ global constants (DO NOT EDIT)
+
+// -- Browser Detection --
+var domLib_userAgent = navigator.userAgent.toLowerCase();
+var domLib_isMac = navigator.appVersion.indexOf('Mac') != -1;
+var domLib_isWin = domLib_userAgent.indexOf('windows') != -1;
+// NOTE: could use window.opera for detecting Opera
+var domLib_isOpera = domLib_userAgent.indexOf('opera') != -1;
+var domLib_isOpera7up = domLib_userAgent.match(/opera.(7|8)/i);
+var domLib_isSafari = domLib_userAgent.indexOf('safari') != -1;
+var domLib_isKonq = domLib_userAgent.indexOf('konqueror') != -1;
+// Both konqueror and safari use the khtml rendering engine
+var domLib_isKHTML = (domLib_isKonq || domLib_isSafari || domLib_userAgent.indexOf('khtml') != -1);
+var domLib_isIE = (!domLib_isKHTML && !domLib_isOpera && (domLib_userAgent.indexOf('msie 5') != -1 || domLib_userAgent.indexOf('msie 6') != -1 || domLib_userAgent.indexOf('msie 7') != -1));
+var domLib_isIE5up = domLib_isIE;
+var domLib_isIE50 = (domLib_isIE && domLib_userAgent.indexOf('msie 5.0') != -1);
+var domLib_isIE55 = (domLib_isIE && domLib_userAgent.indexOf('msie 5.5') != -1);
+var domLib_isIE5 = (domLib_isIE50 || domLib_isIE55);
+// safari and konq may use string "khtml, like gecko", so check for destinctive /
+var domLib_isGecko = domLib_userAgent.indexOf('gecko/') != -1;
+var domLib_isMacIE = (domLib_isIE && domLib_isMac);
+var domLib_isIE55up = domLib_isIE5up && !domLib_isIE50 && !domLib_isMacIE;
+var domLib_isIE6up = domLib_isIE55up && !domLib_isIE55;
+
+// -- Browser Abilities --
+var domLib_standardsMode = (document.compatMode && document.compatMode == 'CSS1Compat');
+var domLib_useLibrary = (domLib_isOpera7up || domLib_isKHTML || domLib_isIE5up || domLib_isGecko || domLib_isMacIE || document.defaultView);
+// fixed in Konq3.2
+var domLib_hasBrokenTimeout = (domLib_isMacIE || (domLib_isKonq && domLib_userAgent.match(/konqueror\/3.([2-9])/) == null));
+var domLib_canFade = (domLib_isGecko || domLib_isIE || domLib_isSafari || domLib_isOpera);
+var domLib_canDrawOverSelect = (domLib_isMac || domLib_isOpera || domLib_isGecko);
+var domLib_canDrawOverFlash = (domLib_isMac || domLib_isWin);
+
+// -- Event Variables --
+var domLib_eventTarget = domLib_isIE ? 'srcElement' : 'currentTarget';
+var domLib_eventButton = domLib_isIE ? 'button' : 'which';
+var domLib_eventTo = domLib_isIE ? 'toElement' : 'relatedTarget';
+var domLib_stylePointer = domLib_isIE ? 'hand' : 'pointer';
+// NOTE: a bug exists in Opera that prevents maxWidth from being set to 'none', so we make it huge
+var domLib_styleNoMaxWidth = domLib_isOpera ? '10000px' : 'none';
+var domLib_hidePosition = '-1000px';
+var domLib_scrollbarWidth = 14;
+var domLib_autoId = 1;
+var domLib_zIndex = 100;
+
+// -- Detection --
+var domLib_collisionElements;
+var domLib_collisionsCached = false;
+
+var domLib_timeoutStateId = 0;
+var domLib_timeoutStates = new Hash();
+
+// }}}
+// {{{ DOM enhancements
+
+if (!document.ELEMENT_NODE)
+{
+ document.ELEMENT_NODE = 1;
+ document.ATTRIBUTE_NODE = 2;
+ document.TEXT_NODE = 3;
+ document.DOCUMENT_NODE = 9;
+ document.DOCUMENT_FRAGMENT_NODE = 11;
+}
+
+function domLib_clone(obj)
+{
+ var copy = {};
+ for (var i in obj)
+ {
+ var value = obj[i];
+ try
+ {
+ if (value != null && typeof(value) == 'object' && value != window && !value.nodeType)
+ {
+ copy[i] = domLib_clone(value);
+ }
+ else
+ {
+ copy[i] = value;
+ }
+ }
+ catch(e)
+ {
+ copy[i] = value;
+ }
+ }
+
+ return copy;
+}
+
+// }}}
+// {{{ class Hash()
+
+function Hash()
+{
+ this.length = 0;
+ this.numericLength = 0;
+ this.elementData = [];
+ for (var i = 0; i < arguments.length; i += 2)
+ {
+ if (typeof(arguments[i + 1]) != 'undefined')
+ {
+ this.elementData[arguments[i]] = arguments[i + 1];
+ this.length++;
+ if (arguments[i] == parseInt(arguments[i]))
+ {
+ this.numericLength++;
+ }
+ }
+ }
+}
+
+// using prototype as opposed to inner functions saves on memory
+Hash.prototype.get = function(in_key)
+{
+ if (typeof(this.elementData[in_key]) != 'undefined') {
+ return this.elementData[in_key];
+ }
+
+ return null;
+}
+
+Hash.prototype.set = function(in_key, in_value)
+{
+ if (typeof(in_value) != 'undefined')
+ {
+ if (typeof(this.elementData[in_key]) == 'undefined')
+ {
+ this.length++;
+ if (in_key == parseInt(in_key))
+ {
+ this.numericLength++;
+ }
+ }
+
+ return this.elementData[in_key] = in_value;
+ }
+
+ return false;
+}
+
+Hash.prototype.remove = function(in_key)
+{
+ var tmp_value;
+ if (typeof(this.elementData[in_key]) != 'undefined')
+ {
+ this.length--;
+ if (in_key == parseInt(in_key))
+ {
+ this.numericLength--;
+ }
+
+ tmp_value = this.elementData[in_key];
+ delete this.elementData[in_key];
+ }
+
+ return tmp_value;
+}
+
+Hash.prototype.size = function()
+{
+ return this.length;
+}
+
+Hash.prototype.has = function(in_key)
+{
+ return typeof(this.elementData[in_key]) != 'undefined';
+}
+
+Hash.prototype.find = function(in_obj)
+{
+ for (var tmp_key in this.elementData)
+ {
+ if (this.elementData[tmp_key] == in_obj)
+ {
+ return tmp_key;
+ }
+ }
+
+ return null;
+}
+
+Hash.prototype.merge = function(in_hash)
+{
+ for (var tmp_key in in_hash.elementData)
+ {
+ if (typeof(this.elementData[tmp_key]) == 'undefined')
+ {
+ this.length++;
+ if (tmp_key == parseInt(tmp_key))
+ {
+ this.numericLength++;
+ }
+ }
+
+ this.elementData[tmp_key] = in_hash.elementData[tmp_key];
+ }
+}
+
+Hash.prototype.compare = function(in_hash)
+{
+ if (this.length != in_hash.length)
+ {
+ return false;
+ }
+
+ for (var tmp_key in this.elementData)
+ {
+ if (this.elementData[tmp_key] != in_hash.elementData[tmp_key])
+ {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+// }}}
+// {{{ domLib_isDescendantOf()
+
+function domLib_isDescendantOf(in_object, in_ancestor, in_bannedTags)
+{
+ if (in_object == null)
+ {
+ return false;
+ }
+
+ if (in_object == in_ancestor)
+ {
+ return true;
+ }
+
+ if (typeof(in_bannedTags) != 'undefined' &&
+ (',' + in_bannedTags.join(',') + ',').indexOf(',' + in_object.tagName + ',') != -1)
+ {
+ return false;
+ }
+
+ while (in_object != document.documentElement)
+ {
+ try
+ {
+ if ((tmp_object = in_object.offsetParent) && tmp_object == in_ancestor)
+ {
+ return true;
+ }
+ else if ((tmp_object = in_object.parentNode) == in_ancestor)
+ {
+ return true;
+ }
+ else
+ {
+ in_object = tmp_object;
+ }
+ }
+ // in case we get some wierd error, assume we left the building
+ catch(e)
+ {
+ return false;
+ }
+ }
+
+ return false;
+}
+
+// }}}
+// {{{ domLib_detectCollisions()
+
+/**
+ * For any given target element, determine if elements on the page
+ * are colliding with it that do not obey the rules of z-index.
+ */
+function domLib_detectCollisions(in_object, in_recover, in_useCache)
+{
+ // the reason for the cache is that if the root menu is built before
+ // the page is done loading, then it might not find all the elements.
+ // so really the only time you don't use cache is when building the
+ // menu as part of the page load
+ if (!domLib_collisionsCached)
+ {
+ var tags = [];
+
+ if (!domLib_canDrawOverFlash)
+ {
+ tags[tags.length] = 'object';
+ }
+
+ if (!domLib_canDrawOverSelect)
+ {
+ tags[tags.length] = 'select';
+ }
+
+ domLib_collisionElements = domLib_getElementsByTagNames(tags, true);
+ domLib_collisionsCached = in_useCache;
+ }
+
+ // if we don't have a tip, then unhide selects
+ if (in_recover)
+ {
+ for (var cnt = 0; cnt < domLib_collisionElements.length; cnt++)
+ {
+ var thisElement = domLib_collisionElements[cnt];
+
+ if (!thisElement.hideList)
+ {
+ thisElement.hideList = new Hash();
+ }
+
+ thisElement.hideList.remove(in_object.id);
+ if (!thisElement.hideList.length)
+ {
+ domLib_collisionElements[cnt].style.visibility = 'visible';
+ if (domLib_isKonq)
+ {
+ domLib_collisionElements[cnt].style.display = '';
+ }
+ }
+ }
+
+ return;
+ }
+ else if (domLib_collisionElements.length == 0)
+ {
+ return;
+ }
+
+ // okay, we have a tip, so hunt and destroy
+ var objectOffsets = domLib_getOffsets(in_object);
+
+ for (var cnt = 0; cnt < domLib_collisionElements.length; cnt++)
+ {
+ var thisElement = domLib_collisionElements[cnt];
+
+ // if collision element is in active element, move on
+ // WARNING: is this too costly?
+ if (domLib_isDescendantOf(thisElement, in_object))
+ {
+ continue;
+ }
+
+ // konqueror only has trouble with multirow selects
+ if (domLib_isKonq &&
+ thisElement.tagName == 'SELECT' &&
+ (thisElement.size <= 1 && !thisElement.multiple))
+ {
+ continue;
+ }
+
+ if (!thisElement.hideList)
+ {
+ thisElement.hideList = new Hash();
+ }
+
+ var selectOffsets = domLib_getOffsets(thisElement);
+ var center2centerDistance = Math.sqrt(Math.pow(selectOffsets.get('leftCenter') - objectOffsets.get('leftCenter'), 2) + Math.pow(selectOffsets.get('topCenter') - objectOffsets.get('topCenter'), 2));
+ var radiusSum = selectOffsets.get('radius') + objectOffsets.get('radius');
+ // the encompassing circles are overlapping, get in for a closer look
+ if (center2centerDistance < radiusSum)
+ {
+ // tip is left of select
+ if ((objectOffsets.get('leftCenter') <= selectOffsets.get('leftCenter') && objectOffsets.get('right') < selectOffsets.get('left')) ||
+ // tip is right of select
+ (objectOffsets.get('leftCenter') > selectOffsets.get('leftCenter') && objectOffsets.get('left') > selectOffsets.get('right')) ||
+ // tip is above select
+ (objectOffsets.get('topCenter') <= selectOffsets.get('topCenter') && objectOffsets.get('bottom') < selectOffsets.get('top')) ||
+ // tip is below select
+ (objectOffsets.get('topCenter') > selectOffsets.get('topCenter') && objectOffsets.get('top') > selectOffsets.get('bottom')))
+ {
+ thisElement.hideList.remove(in_object.id);
+ if (!thisElement.hideList.length)
+ {
+ thisElement.style.visibility = 'visible';
+ if (domLib_isKonq)
+ {
+ thisElement.style.display = '';
+ }
+ }
+ }
+ else
+ {
+ thisElement.hideList.set(in_object.id, true);
+ thisElement.style.visibility = 'hidden';
+ if (domLib_isKonq)
+ {
+ thisElement.style.display = 'none';
+ }
+ }
+ }
+ }
+}
+
+// }}}
+// {{{ domLib_getOffsets()
+
+function domLib_getOffsets(in_object, in_preserveScroll)
+{
+ if (typeof(in_preserveScroll) == 'undefined') {
+ in_preserveScroll = false;
+ }
+
+ var originalObject = in_object;
+ var originalWidth = in_object.offsetWidth;
+ var originalHeight = in_object.offsetHeight;
+ var offsetLeft = 0;
+ var offsetTop = 0;
+
+ while (in_object)
+ {
+ offsetLeft += in_object.offsetLeft;
+ offsetTop += in_object.offsetTop;
+ in_object = in_object.offsetParent;
+ // consider scroll offset of parent elements
+ if (in_object && !in_preserveScroll)
+ {
+ offsetLeft -= in_object.scrollLeft;
+ offsetTop -= in_object.scrollTop;
+ }
+ }
+
+ // MacIE misreports the offsets (even with margin: 0 in body{}), still not perfect
+ if (domLib_isMacIE) {
+ offsetLeft += 10;
+ offsetTop += 10;
+ }
+
+ return new Hash(
+ 'left', offsetLeft,
+ 'top', offsetTop,
+ 'right', offsetLeft + originalWidth,
+ 'bottom', offsetTop + originalHeight,
+ 'leftCenter', offsetLeft + originalWidth/2,
+ 'topCenter', offsetTop + originalHeight/2,
+ 'radius', Math.max(originalWidth, originalHeight)
+ );
+}
+
+// }}}
+// {{{ domLib_setTimeout()
+
+function domLib_setTimeout(in_function, in_timeout, in_args)
+{
+ if (typeof(in_args) == 'undefined')
+ {
+ in_args = [];
+ }
+
+ if (in_timeout == -1)
+ {
+ // timeout event is disabled
+ return 0;
+ }
+ else if (in_timeout == 0)
+ {
+ in_function(in_args);
+ return 0;
+ }
+
+ // must make a copy of the arguments so that we release the reference
+ var args = domLib_clone(in_args);
+
+ if (!domLib_hasBrokenTimeout)
+ {
+ return setTimeout(function() { in_function(args); }, in_timeout);
+ }
+ else
+ {
+ var id = domLib_timeoutStateId++;
+ var data = new Hash();
+ data.set('function', in_function);
+ data.set('args', args);
+ domLib_timeoutStates.set(id, data);
+
+ data.set('timeoutId', setTimeout('domLib_timeoutStates.get(' + id + ').get(\'function\')(domLib_timeoutStates.get(' + id + ').get(\'args\')); domLib_timeoutStates.remove(' + id + ');', in_timeout));
+ return id;
+ }
+}
+
+// }}}
+// {{{ domLib_clearTimeout()
+
+function domLib_clearTimeout(in_id)
+{
+ if (!domLib_hasBrokenTimeout)
+ {
+ if (in_id > 0) {
+ clearTimeout(in_id);
+ }
+ }
+ else
+ {
+ if (domLib_timeoutStates.has(in_id))
+ {
+ clearTimeout(domLib_timeoutStates.get(in_id).get('timeoutId'))
+ domLib_timeoutStates.remove(in_id);
+ }
+ }
+}
+
+// }}}
+// {{{ domLib_getEventPosition()
+
+function domLib_getEventPosition(in_eventObj)
+{
+ var eventPosition = new Hash('x', 0, 'y', 0, 'scrollX', 0, 'scrollY', 0);
+
+ // IE varies depending on standard compliance mode
+ if (domLib_isIE)
+ {
+ var doc = (domLib_standardsMode ? document.documentElement : document.body);
+ // NOTE: events may fire before the body has been loaded
+ if (doc)
+ {
+ eventPosition.set('x', in_eventObj.clientX + doc.scrollLeft);
+ eventPosition.set('y', in_eventObj.clientY + doc.scrollTop);
+ eventPosition.set('scrollX', doc.scrollLeft);
+ eventPosition.set('scrollY', doc.scrollTop);
+ }
+ }
+ else
+ {
+ eventPosition.set('x', in_eventObj.pageX);
+ eventPosition.set('y', in_eventObj.pageY);
+ eventPosition.set('scrollX', in_eventObj.pageX - in_eventObj.clientX);
+ eventPosition.set('scrollY', in_eventObj.pageY - in_eventObj.clientY);
+ }
+
+ return eventPosition;
+}
+
+// }}}
+// {{{ domLib_cancelBubble()
+
+function domLib_cancelBubble(in_event)
+{
+ var eventObj = in_event ? in_event : window.event;
+ eventObj.cancelBubble = true;
+}
+
+// }}}
+// {{{ domLib_getIFrameReference()
+
+function domLib_getIFrameReference(in_frame)
+{
+ if (domLib_isGecko || domLib_isIE)
+ {
+ return in_frame.frameElement;
+ }
+ else
+ {
+ // we could either do it this way or require an id on the frame
+ // equivalent to the name
+ var name = in_frame.name;
+ if (!name || !in_frame.parent)
+ {
+ return null;
+ }
+
+ var candidates = in_frame.parent.document.getElementsByTagName('iframe');
+ for (var i = 0; i < candidates.length; i++)
+ {
+ if (candidates[i].name == name)
+ {
+ return candidates[i];
+ }
+ }
+
+ return null;
+ }
+}
+
+// }}}
+// {{{ domLib_getElementsByClass()
+
+function domLib_getElementsByClass(in_class)
+{
+ var elements = domLib_isIE5 ? document.all : document.getElementsByTagName('*');
+ var matches = [];
+ var cnt = 0;
+ for (var i = 0; i < elements.length; i++)
+ {
+ if ((" " + elements[i].className + " ").indexOf(" " + in_class + " ") != -1)
+ {
+ matches[cnt++] = elements[i];
+ }
+ }
+
+ return matches;
+}
+
+// }}}
+// {{{ domLib_getElementsByTagNames()
+
+function domLib_getElementsByTagNames(in_list, in_excludeHidden)
+{
+ var elements = [];
+ for (var i = 0; i < in_list.length; i++)
+ {
+ var matches = document.getElementsByTagName(in_list[i]);
+ for (var j = 0; j < matches.length; j++)
+ {
+ // skip objects that have nested embeds, or else we get "flashing"
+ if (matches[j].tagName == 'OBJECT' && domLib_isGecko)
+ {
+ var kids = matches[j].childNodes;
+ var skip = false;
+ for (var k = 0; k < kids.length; k++)
+ {
+ if (kids[k].tagName == 'EMBED')
+ {
+ skip = true;
+ break;
+ }
+ }
+ if (skip) continue;
+ }
+
+ if (in_excludeHidden && domLib_getComputedStyle(matches[j], 'visibility') == 'hidden')
+ {
+ continue;
+ }
+
+ elements[elements.length] = matches[j];
+ }
+ }
+
+ return elements;
+}
+
+// }}}
+// {{{ domLib_getComputedStyle()
+
+function domLib_getComputedStyle(in_obj, in_property)
+{
+ if (domLib_isIE)
+ {
+ var humpBackProp = in_property.replace(/-(.)/, function (a, b) { return b.toUpperCase(); });
+ return eval('in_obj.currentStyle.' + humpBackProp);
+ }
+ // getComputedStyle() is broken in konqueror, so let's go for the style object
+ else if (domLib_isKonq)
+ {
+ //var humpBackProp = in_property.replace(/-(.)/, function (a, b) { return b.toUpperCase(); });
+ return eval('in_obj.style.' + in_property);
+ }
+ else
+ {
+ return document.defaultView.getComputedStyle(in_obj, null).getPropertyValue(in_property);
+ }
+}
+
+// }}}
+// {{{ makeTrue()
+
+function makeTrue()
+{
+ return true;
+}
+
+// }}}
+// {{{ makeFalse()
+
+function makeFalse()
+{
+ return false;
+}
+
+// }}}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT.js (from rev 11900, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT.js)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT.js (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -0,0 +1,1132 @@
+/** $Id: domTT.js 2324 2006-06-12 07:06:39Z dallen $ */
+// {{{ license
+
+/*
+ * Copyright 2002-2005 Dan Allen, Mojavelinux.com (dan.allen(a)mojavelinux.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// }}}
+// {{{ intro
+
+/**
+ * Title: DOM Tooltip Library
+ * Version: 0.7.3
+ *
+ * Summary:
+ * Allows developers to add custom tooltips to the webpages. Tooltips are
+ * generated using the domTT_activate() function and customized by setting
+ * a handful of options.
+ *
+ * Maintainer: Dan Allen <dan.allen(a)mojavelinux.com>
+ * Contributors:
+ * Josh Gross <josh(a)jportalhome.com>
+ * Jason Rust <jason(a)rustyparts.com>
+ *
+ * License: Apache 2.0
+ * However, if you use this library, you earn the position of official bug
+ * reporter :) Please post questions or problem reports to the newsgroup:
+ *
+ * http://groups-beta.google.com/group/dom-tooltip
+ *
+ * If you are doing this for commercial work, perhaps you could send me a few
+ * Starbucks Coffee gift dollars or PayPal bucks to encourage future
+ * developement (NOT REQUIRED). E-mail me for my snail mail address.
+
+ *
+ * Homepage: http://www.mojavelinux.com/projects/domtooltip/
+ *
+ * Newsgroup: http://groups-beta.google.com/group/dom-tooltip
+ *
+ * Freshmeat Project: http://freshmeat.net/projects/domtt/?topic_id=92
+ *
+ * Updated: 2005/07/16
+ *
+ * Supported Browsers:
+ * Mozilla (Gecko), IE 5.5+, IE on Mac, Safari, Konqueror, Opera 7
+ *
+ * Usage:
+ * Please see the HOWTO documentation.
+**/
+
+// }}}
+// {{{ settings (editable)
+
+// IE mouse events seem to be off by 2 pixels
+var domTT_offsetX = (domLib_isIE ? -2 : 0);
+var domTT_offsetY = (domLib_isIE ? 4 : 2);
+var domTT_direction = 'southeast';
+var domTT_mouseHeight = domLib_isIE ? 13 : 19;
+var domTT_closeLink = 'X';
+var domTT_closeAction = 'hide';
+var domTT_activateDelay = 500;
+var domTT_maxWidth = false;
+var domTT_styleClass = 'domTT';
+var domTT_fade = 'neither';
+var domTT_lifetime = 0;
+var domTT_grid = 0;
+var domTT_trailDelay = 200;
+var domTT_useGlobalMousePosition = true;
+var domTT_postponeActivation = false;
+var domTT_tooltipIdPrefix = '[domTT]';
+var domTT_screenEdgeDetection = true;
+var domTT_screenEdgePadding = 4;
+var domTT_oneOnly = false;
+var domTT_cloneNodes = false;
+var domTT_detectCollisions = true;
+var domTT_bannedTags = ['OPTION'];
+var domTT_draggable = false;
+if (typeof(domTT_dragEnabled) == 'undefined')
+{
+ domTT_dragEnabled = false;
+}
+
+// }}}
+// {{{ globals (DO NOT EDIT)
+
+var domTT_predefined = new Hash();
+// tooltips are keyed on both the tip id and the owner id,
+// since events can originate on either object
+var domTT_tooltips = new Hash();
+var domTT_lastOpened = 0;
+var domTT_documentLoaded = false;
+var domTT_mousePosition = null;
+
+// }}}
+// {{{ document.onmousemove
+
+if (domLib_useLibrary && domTT_useGlobalMousePosition)
+{
+ document.onmousemove = function(in_event)
+ {
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+
+ domTT_mousePosition = domLib_getEventPosition(in_event);
+ if (domTT_dragEnabled && domTT_dragMouseDown)
+ {
+ domTT_dragUpdate(in_event);
+ }
+ }
+}
+
+// }}}
+// {{{ domTT_activate()
+
+function domTT_activate(in_this, in_event)
+{
+ if (!domLib_useLibrary || (domTT_postponeActivation && !domTT_documentLoaded)) { return false; }
+
+ // make sure in_event is set (for IE, some cases we have to use window.event)
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+
+ // don't allow tooltips on banned tags (such as OPTION)
+ if (in_event != null) {
+ var target = in_event.srcElement ? in_event.srcElement : in_event.target;
+ if (target != null && (',' + domTT_bannedTags.join(',') + ',').indexOf(',' + target.tagName + ',') != -1)
+ {
+ return false;
+ }
+ }
+
+ var owner = document.body;
+ // we have an active event so get the owner
+ if (in_event != null && in_event.type.match(/key|mouse|click|contextmenu/i))
+ {
+ // make sure we have nothing higher than the body element
+ if (in_this.nodeType && in_this.nodeType != document.DOCUMENT_NODE)
+ {
+ owner = in_this;
+ }
+ }
+ // non active event (make sure we were passed a string id)
+ else
+ {
+ if (typeof(in_this) != 'object' && !(owner = domTT_tooltips.get(in_this)))
+ {
+ // NOTE: two steps to avoid "flashing" in gecko
+ var embryo = document.createElement('div');
+ owner = document.body.appendChild(embryo);
+ owner.style.display = 'none';
+ owner.id = in_this;
+ }
+ }
+
+ // make sure the owner has a unique id
+ if (!owner.id)
+ {
+ owner.id = '__autoId' + domLib_autoId++;
+ }
+
+ // see if we should only be opening one tip at a time
+ // NOTE: this is not "perfect" yet since it really steps on any other
+ // tip working on fade out or delayed close, but it get's the job done
+ if (domTT_oneOnly && domTT_lastOpened)
+ {
+ domTT_deactivate(domTT_lastOpened);
+ }
+
+ domTT_lastOpened = owner.id;
+
+ var tooltip = domTT_tooltips.get(owner.id);
+ if (tooltip)
+ {
+ if (tooltip.get('eventType') != in_event.type)
+ {
+ if (tooltip.get('type') == 'greasy')
+ {
+ tooltip.set('closeAction', 'destroy');
+ domTT_deactivate(owner.id);
+ }
+ else if (tooltip.get('status') != 'inactive')
+ {
+ return owner.id;
+ }
+ }
+ else
+ {
+ if (tooltip.get('status') == 'inactive')
+ {
+ tooltip.set('status', 'pending');
+ tooltip.set('activateTimeout', domLib_setTimeout(domTT_runShow, tooltip.get('delay'), [owner.id, in_event]));
+
+ return owner.id;
+ }
+ // either pending or active, let it be
+ else
+ {
+ return owner.id;
+ }
+ }
+ }
+
+ // setup the default options hash
+ var options = new Hash(
+ 'caption', '',
+ 'content', '',
+ 'clearMouse', true,
+ 'closeAction', domTT_closeAction,
+ 'closeLink', domTT_closeLink,
+ 'delay', domTT_activateDelay,
+ 'direction', domTT_direction,
+ 'draggable', domTT_draggable,
+ 'fade', domTT_fade,
+ 'fadeMax', 100,
+ 'grid', domTT_grid,
+ 'id', domTT_tooltipIdPrefix + owner.id,
+ 'inframe', false,
+ 'lifetime', domTT_lifetime,
+ 'offsetX', domTT_offsetX,
+ 'offsetY', domTT_offsetY,
+ 'parent', document.body,
+ 'position', 'absolute',
+ 'styleClass', domTT_styleClass,
+ 'type', 'greasy',
+ 'trail', false,
+ 'lazy', false
+ );
+
+ // load in the options from the function call
+ for (var i = 2; i < arguments.length; i += 2)
+ {
+ // load in predefined
+ if (arguments[i] == 'predefined')
+ {
+ var predefinedOptions = domTT_predefined.get(arguments[i + 1]);
+ for (var j in predefinedOptions.elementData)
+ {
+ options.set(j, predefinedOptions.get(j));
+ }
+ }
+ // set option
+ else
+ {
+ options.set(arguments[i], arguments[i + 1]);
+ }
+ }
+
+ options.set('eventType', in_event != null ? in_event.type : null);
+
+ // immediately set the status text if provided
+ if (options.has('statusText'))
+ {
+ try { window.status = options.get('statusText'); } catch(e) {}
+ }
+
+ // if we didn't give content...assume we just wanted to change the status and return
+ if (!options.has('content') || options.get('content') == '' || options.get('content') == null)
+ {
+ if (typeof(owner.onmouseout) != 'function')
+ {
+ owner.onmouseout = function(in_event) { domTT_mouseout(this, in_event); };
+ }
+
+ return owner.id;
+ }
+
+ options.set('owner', owner);
+
+ domTT_create(options);
+
+ // determine the show delay
+ options.set('delay', (in_event != null && in_event.type.match(/click|mousedown|contextmenu/i)) ? 0 : parseInt(options.get('delay')));
+ domTT_tooltips.set(owner.id, options);
+ domTT_tooltips.set(options.get('id'), options);
+ options.set('status', 'pending');
+ options.set('activateTimeout', domLib_setTimeout(domTT_runShow, options.get('delay'), [owner.id, in_event]));
+
+ return owner.id;
+}
+
+// }}}
+// {{{ domTT_create()
+
+function domTT_create(in_options)
+{
+ var tipOwner = in_options.get('owner');
+ var parentObj = in_options.get('parent');
+ var parentDoc = parentObj.ownerDocument || parentObj.document;
+
+ // create the tooltip and hide it
+ // NOTE: two steps to avoid "flashing" in gecko
+ var embryo = parentDoc.createElement('div');
+ var tipObj = parentObj.appendChild(embryo);
+ tipObj.style.position = 'absolute';
+ tipObj.style.left = '0px';
+ tipObj.style.top = '0px';
+ tipObj.style.visibility = 'hidden';
+ tipObj.id = in_options.get('id');
+ tipObj.className = in_options.get('styleClass');
+
+ var contentBlock;
+ var tableLayout = false;
+
+ if (in_options.get('caption') || (in_options.get('type') == 'sticky' && in_options.get('caption') !== false))
+ {
+ tableLayout = true;
+ // layout the tip with a hidden formatting table
+ var tipLayoutTable = tipObj.appendChild(parentDoc.createElement('table'));
+ tipLayoutTable.style.borderCollapse = 'collapse';
+ if (domLib_isKHTML)
+ {
+ tipLayoutTable.cellSpacing = 0;
+ }
+
+ var tipLayoutTbody = tipLayoutTable.appendChild(parentDoc.createElement('tbody'));
+
+ var numCaptionCells = 0;
+ var captionRow = tipLayoutTbody.appendChild(parentDoc.createElement('tr'));
+ var captionCell = captionRow.appendChild(parentDoc.createElement('td'));
+ captionCell.style.padding = '0px';
+ var caption = captionCell.appendChild(parentDoc.createElement('div'));
+ caption.className = 'caption';
+ if (domLib_isIE50)
+ {
+ caption.style.height = '100%';
+ }
+
+ if (in_options.get('caption').nodeType)
+ {
+ caption.appendChild(domTT_cloneNodes ? in_options.get('caption').cloneNode(1) : in_options.get('caption'));
+ }
+ else
+ {
+ caption.innerHTML = in_options.get('caption');
+ }
+
+ if (in_options.get('type') == 'sticky')
+ {
+ var numCaptionCells = 2;
+ var closeLinkCell = captionRow.appendChild(parentDoc.createElement('td'));
+ closeLinkCell.style.padding = '0px';
+ var closeLink = closeLinkCell.appendChild(parentDoc.createElement('div'));
+ closeLink.className = 'caption';
+ if (domLib_isIE50)
+ {
+ closeLink.style.height = '100%';
+ }
+
+ closeLink.style.textAlign = 'right';
+ closeLink.style.cursor = domLib_stylePointer;
+ // merge the styles of the two cells
+ closeLink.style.borderLeftWidth = caption.style.borderRightWidth = '0px';
+ closeLink.style.paddingLeft = caption.style.paddingRight = '0px';
+ closeLink.style.marginLeft = caption.style.marginRight = '0px';
+ if (in_options.get('closeLink').nodeType)
+ {
+ closeLink.appendChild(in_options.get('closeLink').cloneNode(1));
+ }
+ else
+ {
+ closeLink.innerHTML = in_options.get('closeLink');
+ }
+
+ closeLink.onclick = function()
+ {
+ domTT_deactivate(tipOwner.id);
+ };
+ closeLink.onmousedown = function(in_event)
+ {
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+ in_event.cancelBubble = true;
+ };
+ // MacIE has to have a newline at the end and must be made with createTextNode()
+ if (domLib_isMacIE)
+ {
+ closeLinkCell.appendChild(parentDoc.createTextNode("\n"));
+ }
+ }
+
+ // MacIE has to have a newline at the end and must be made with createTextNode()
+ if (domLib_isMacIE)
+ {
+ captionCell.appendChild(parentDoc.createTextNode("\n"));
+ }
+
+ var contentRow = tipLayoutTbody.appendChild(parentDoc.createElement('tr'));
+ var contentCell = contentRow.appendChild(parentDoc.createElement('td'));
+ contentCell.style.padding = '0px';
+ if (numCaptionCells)
+ {
+ if (domLib_isIE || domLib_isOpera)
+ {
+ contentCell.colSpan = numCaptionCells;
+ }
+ else
+ {
+ contentCell.setAttribute('colspan', numCaptionCells);
+ }
+ }
+
+ contentBlock = contentCell.appendChild(parentDoc.createElement('div'));
+ if (domLib_isIE50)
+ {
+ contentBlock.style.height = '100%';
+ }
+ }
+ else
+ {
+ contentBlock = tipObj.appendChild(parentDoc.createElement('div'));
+ }
+
+ contentBlock.className = 'contents';
+
+ var content = in_options.get('content');
+ // allow content has a function to return the actual content
+ if (typeof(content) == 'function') {
+ content = content(in_options.get('id'));
+ }
+
+ if (content != null && content.nodeType)
+ {
+ contentBlock.appendChild(domTT_cloneNodes ? content.cloneNode(1) : content);
+ }
+ else
+ {
+ contentBlock.innerHTML = content;
+ }
+
+ // adjust the width if specified
+ if (in_options.has('width'))
+ {
+ tipObj.style.width = parseInt(in_options.get('width')) + 'px';
+ }
+
+ // check if we are overridding the maxWidth
+ // if the browser supports maxWidth, the global setting will be ignored (assume stylesheet)
+ var maxWidth = domTT_maxWidth;
+ if (in_options.has('maxWidth'))
+ {
+ if ((maxWidth = in_options.get('maxWidth')) === false)
+ {
+ tipObj.style.maxWidth = domLib_styleNoMaxWidth;
+ }
+ else
+ {
+ maxWidth = parseInt(in_options.get('maxWidth'));
+ tipObj.style.maxWidth = maxWidth + 'px';
+ }
+ }
+
+ // HACK: fix lack of maxWidth in CSS for KHTML and IE
+ if (maxWidth !== false && (domLib_isIE || domLib_isKHTML) && tipObj.offsetWidth > maxWidth)
+ {
+ tipObj.style.width = maxWidth + 'px';
+ }
+
+ in_options.set('offsetWidth', tipObj.offsetWidth);
+ in_options.set('offsetHeight', tipObj.offsetHeight);
+
+ // konqueror miscalcuates the width of the containing div when using the layout table based on the
+ // border size of the containing div
+ if (domLib_isKonq && tableLayout && !tipObj.style.width)
+ {
+ var left = document.defaultView.getComputedStyle(tipObj, '').getPropertyValue('border-left-width');
+ var right = document.defaultView.getComputedStyle(tipObj, '').getPropertyValue('border-right-width');
+
+ left = left.substring(left.indexOf(':') + 2, left.indexOf(';'));
+ right = right.substring(right.indexOf(':') + 2, right.indexOf(';'));
+ var correction = 2 * ((left ? parseInt(left) : 0) + (right ? parseInt(right) : 0));
+ tipObj.style.width = (tipObj.offsetWidth - correction) + 'px';
+ }
+
+ // if a width is not set on an absolutely positioned object, both IE and Opera
+ // will attempt to wrap when it spills outside of body...we cannot have that
+ if (domLib_isIE || domLib_isOpera)
+ {
+ if (!tipObj.style.width)
+ {
+ // HACK: the correction here is for a border
+ tipObj.style.width = (tipObj.offsetWidth - 2) + 'px';
+ }
+
+ // HACK: the correction here is for a border
+ tipObj.style.height = (tipObj.offsetHeight - 2) + 'px';
+ }
+
+ // store placement offsets from event position
+ var offsetX, offsetY;
+
+ // tooltip floats
+ if (in_options.get('position') == 'absolute' && !(in_options.has('x') && in_options.has('y')))
+ {
+ // determine the offset relative to the pointer
+ switch (in_options.get('direction'))
+ {
+ case 'northeast':
+ offsetX = in_options.get('offsetX');
+ offsetY = 0 - tipObj.offsetHeight - in_options.get('offsetY');
+ break;
+ case 'northwest':
+ offsetX = 0 - tipObj.offsetWidth - in_options.get('offsetX');
+ offsetY = 0 - tipObj.offsetHeight - in_options.get('offsetY');
+ break;
+ case 'north':
+ offsetX = 0 - parseInt(tipObj.offsetWidth/2);
+ offsetY = 0 - tipObj.offsetHeight - in_options.get('offsetY');
+ break;
+ case 'southwest':
+ offsetX = 0 - tipObj.offsetWidth - in_options.get('offsetX');
+ offsetY = in_options.get('offsetY');
+ break;
+ case 'southeast':
+ offsetX = in_options.get('offsetX');
+ offsetY = in_options.get('offsetY');
+ break;
+ case 'south':
+ offsetX = 0 - parseInt(tipObj.offsetWidth/2);
+ offsetY = in_options.get('offsetY');
+ break;
+ }
+
+ // if we are in an iframe, get the offsets of the iframe in the parent document
+ if (in_options.get('inframe'))
+ {
+ var iframeObj = domLib_getIFrameReference(window);
+ if (iframeObj)
+ {
+ var frameOffsets = domLib_getOffsets(iframeObj);
+ offsetX += frameOffsets.get('left');
+ offsetY += frameOffsets.get('top');
+ }
+ }
+ }
+ // tooltip is fixed
+ else
+ {
+ offsetX = 0;
+ offsetY = 0;
+ in_options.set('trail', false);
+ }
+
+ // set the direction-specific offsetX/Y
+ in_options.set('offsetX', offsetX);
+ in_options.set('offsetY', offsetY);
+ if (in_options.get('clearMouse') && in_options.get('direction').indexOf('south') != -1)
+ {
+ in_options.set('mouseOffset', domTT_mouseHeight);
+ }
+ else
+ {
+ in_options.set('mouseOffset', 0);
+ }
+
+ if (domLib_canFade && typeof(Fadomatic) == 'function')
+ {
+ if (in_options.get('fade') != 'neither')
+ {
+ var fadeHandler = new Fadomatic(tipObj, 10, 0, 0, in_options.get('fadeMax'));
+ in_options.set('fadeHandler', fadeHandler);
+ }
+ }
+ else
+ {
+ in_options.set('fade', 'neither');
+ }
+
+ // setup mouse events
+ if (in_options.get('trail') && typeof(tipOwner.onmousemove) != 'function')
+ {
+ tipOwner.onmousemove = function(in_event) { domTT_mousemove(this, in_event); };
+ }
+
+ if (typeof(tipOwner.onmouseout) != 'function')
+ {
+ tipOwner.onmouseout = function(in_event) { domTT_mouseout(this, in_event); };
+ }
+
+ if (in_options.get('type') == 'sticky')
+ {
+ if (in_options.get('position') == 'absolute' && domTT_dragEnabled && in_options.get('draggable'))
+ {
+ if (domLib_isIE)
+ {
+ captionRow.onselectstart = function() { return false; };
+ }
+
+ // setup drag
+ captionRow.onmousedown = function(in_event) { domTT_dragStart(tipObj, in_event); };
+ captionRow.onmousemove = function(in_event) { domTT_dragUpdate(in_event); };
+ captionRow.onmouseup = function() { domTT_dragStop(); };
+ }
+ }
+ else if (in_options.get('type') == 'velcro')
+ {
+ /* can use once we have deactivateDelay
+ tipObj.onmouseover = function(in_event)
+ {
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+ var tooltip = domTT_tooltips.get(tipObj.id);
+ if (in_options.get('lifetime')) {
+ domLib_clearTimeout(in_options.get('lifetimeTimeout');
+ }
+ };
+ */
+ tipObj.onmouseout = function(in_event)
+ {
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+ if (!domLib_isDescendantOf(in_event[domLib_eventTo], tipObj, domTT_bannedTags)) {
+ domTT_deactivate(tipOwner.id);
+ }
+ };
+ // NOTE: this might interfere with links in the tip
+ tipObj.onclick = function(in_event)
+ {
+ domTT_deactivate(tipOwner.id);
+ };
+ }
+
+ if (in_options.get('position') == 'relative')
+ {
+ tipObj.style.position = 'relative';
+ }
+
+ in_options.set('node', tipObj);
+ in_options.set('status', 'inactive');
+}
+
+// }}}
+// {{{ domTT_show()
+
+// in_id is either tip id or the owner id
+function domTT_show(in_id, in_event)
+{
+
+ // should always find one since this call would be cancelled if tip was killed
+ var tooltip = domTT_tooltips.get(in_id);
+ var status = tooltip.get('status');
+ var tipObj = tooltip.get('node');
+
+ if (tooltip.get('position') == 'absolute')
+ {
+ var mouseX, mouseY;
+
+ if (tooltip.has('x') && tooltip.has('y'))
+ {
+ mouseX = tooltip.get('x');
+ mouseY = tooltip.get('y');
+ }
+ else if (!domTT_useGlobalMousePosition || domTT_mousePosition == null || status == 'active' || tooltip.get('delay') == 0)
+ {
+ var eventPosition = domLib_getEventPosition(in_event);
+ var eventX = eventPosition.get('x');
+ var eventY = eventPosition.get('y');
+ if (tooltip.get('inframe'))
+ {
+ eventX -= eventPosition.get('scrollX');
+ eventY -= eventPosition.get('scrollY');
+ }
+
+ // only move tip along requested trail axis when updating position
+ if (status == 'active' && tooltip.get('trail') !== true)
+ {
+ var trail = tooltip.get('trail');
+ if (trail == 'x')
+ {
+ mouseX = eventX;
+ mouseY = tooltip.get('mouseY');
+ }
+ else if (trail == 'y')
+ {
+ mouseX = tooltip.get('mouseX');
+ mouseY = eventY;
+ }
+ }
+ else
+ {
+ mouseX = eventX;
+ mouseY = eventY;
+ }
+ }
+ else
+ {
+ mouseX = domTT_mousePosition.get('x');
+ mouseY = domTT_mousePosition.get('y');
+ if (tooltip.get('inframe'))
+ {
+ mouseX -= domTT_mousePosition.get('scrollX');
+ mouseY -= domTT_mousePosition.get('scrollY');
+ }
+ }
+
+ // we are using a grid for updates
+ if (tooltip.get('grid'))
+ {
+ // if this is not a mousemove event or it is a mousemove event on an active tip and
+ // the movement is bigger than the grid
+ if (in_event.type != 'mousemove' || (status == 'active' && (Math.abs(tooltip.get('lastX') - mouseX) > tooltip.get('grid') || Math.abs(tooltip.get('lastY') - mouseY) > tooltip.get('grid'))))
+ {
+ tooltip.set('lastX', mouseX);
+ tooltip.set('lastY', mouseY);
+ }
+ // did not satisfy the grid movement requirement
+ else
+ {
+ return false;
+ }
+ }
+
+ // mouseX and mouseY store the last acknowleged mouse position,
+ // good for trailing on one axis
+ tooltip.set('mouseX', mouseX);
+ tooltip.set('mouseY', mouseY);
+
+ var coordinates;
+ if (domTT_screenEdgeDetection)
+ {
+ coordinates = domTT_correctEdgeBleed(
+ tooltip.get('offsetWidth'),
+ tooltip.get('offsetHeight'),
+ mouseX,
+ mouseY,
+ tooltip.get('offsetX'),
+ tooltip.get('offsetY'),
+ tooltip.get('mouseOffset'),
+ tooltip.get('inframe') ? window.parent : window
+ );
+ }
+ else
+ {
+ coordinates = {
+ 'x' : mouseX + tooltip.get('offsetX'),
+ 'y' : mouseY + tooltip.get('offsetY') + tooltip.get('mouseOffset')
+ };
+ }
+
+ // update the position
+ tipObj.style.left = coordinates.x + 'px';
+ tipObj.style.top = coordinates.y + 'px';
+
+ // increase the tip zIndex so it goes over previously shown tips
+ tipObj.style.zIndex = domLib_zIndex++;
+ }
+
+ // if tip is not active, active it now and check for a fade in
+ if (status == 'pending')
+ {
+ // unhide the tooltip
+ tooltip.set('status', 'active');
+ tipObj.style.display = '';
+ tipObj.style.visibility = 'visible';
+
+ var fade = tooltip.get('fade');
+ if (fade != 'neither')
+ {
+ var fadeHandler = tooltip.get('fadeHandler');
+ if (fade == 'out' || fade == 'both')
+ {
+ fadeHandler.haltFade();
+ if (fade == 'out')
+ {
+ fadeHandler.halt();
+ }
+ }
+
+ if (fade == 'in' || fade == 'both')
+ {
+ fadeHandler.fadeIn();
+ }
+ }
+
+ if (tooltip.get('type') == 'greasy' && tooltip.get('lifetime') != 0)
+ {
+ tooltip.set('lifetimeTimeout', domLib_setTimeout(domTT_runDeactivate, tooltip.get('lifetime'), [tipObj.id]));
+ }
+ }
+
+ if (tooltip.get('position') == 'absolute' && domTT_detectCollisions)
+ {
+ // utilize original collision element cache
+ domLib_detectCollisions(tipObj, false, true);
+ }
+}
+
+// }}}
+// {{{ domTT_close()
+
+// in_handle can either be an child object of the tip, the tip id or the owner id
+function domTT_close(in_handle)
+{
+ var id;
+ if (typeof(in_handle) == 'object' && in_handle.nodeType)
+ {
+ var obj = in_handle;
+ while (!obj.id || !domTT_tooltips.get(obj.id))
+ {
+ obj = obj.parentNode;
+
+ if (obj.nodeType != document.ELEMENT_NODE) { return; }
+ }
+
+ id = obj.id;
+ }
+ else
+ {
+ id = in_handle;
+ }
+
+ domTT_deactivate(id);
+}
+
+// }}}
+// {{{ domTT_closeAll()
+
+// run through the tooltips and close them all
+function domTT_closeAll()
+{
+ // NOTE: this will iterate 2x # of tooltips
+ for (var id in domTT_tooltips.elementData) {
+ domTT_close(id);
+ }
+}
+
+// }}}
+// {{{ domTT_deactivate()
+
+// in_id is either the tip id or the owner id
+function domTT_deactivate(in_id)
+{
+ var tooltip = domTT_tooltips.get(in_id);
+ if (tooltip)
+ {
+ var status = tooltip.get('status');
+ if (status == 'pending')
+ {
+ // cancel the creation of this tip if it is still pending
+ domLib_clearTimeout(tooltip.get('activateTimeout'));
+ tooltip.set('status', 'inactive');
+ }
+ else if (status == 'active')
+ {
+ if (tooltip.get('lifetime'))
+ {
+ domLib_clearTimeout(tooltip.get('lifetimeTimeout'));
+ }
+
+ var tipObj = tooltip.get('node');
+ if (tooltip.get('closeAction') == 'hide')
+ {
+ var fade = tooltip.get('fade');
+ if (fade != 'neither')
+ {
+ var fadeHandler = tooltip.get('fadeHandler');
+ if (fade == 'out' || fade == 'both')
+ {
+ fadeHandler.fadeOut();
+ }
+ else
+ {
+ fadeHandler.hide();
+ }
+ }
+ else
+ {
+ tipObj.style.display = 'none';
+ }
+ }
+ else
+ {
+ tooltip.get('parent').removeChild(tipObj);
+ domTT_tooltips.remove(tooltip.get('owner').id);
+ domTT_tooltips.remove(tooltip.get('id'));
+ }
+
+ tooltip.set('status', 'inactive');
+ if (domTT_detectCollisions) {
+ // unhide all of the selects that are owned by this object
+ // utilize original collision element cache
+ domLib_detectCollisions(tipObj, true, true);
+ }
+ }
+ }
+}
+
+// }}}
+// {{{ domTT_mouseout()
+
+function domTT_mouseout(in_owner, in_event)
+{
+ if (!domLib_useLibrary) { return false; }
+
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+
+ var toChild = domLib_isDescendantOf(in_event[domLib_eventTo], in_owner, domTT_bannedTags);
+ var tooltip = domTT_tooltips.get(in_owner.id);
+ if (tooltip && (tooltip.get('type') == 'greasy' || tooltip.get('status') != 'active'))
+ {
+ // deactivate tip if exists and we moved away from the owner
+ if (!toChild)
+ {
+ domTT_deactivate(in_owner.id);
+ try { window.status = window.defaultStatus; } catch(e) {}
+ }
+ }
+ else if (!toChild)
+ {
+ try { window.status = window.defaultStatus; } catch(e) {}
+ }
+}
+
+// }}}
+// {{{ domTT_mousemove()
+
+function domTT_mousemove(in_owner, in_event)
+{
+ if (!domLib_useLibrary) { return false; }
+
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+
+ var tooltip = domTT_tooltips.get(in_owner.id);
+ if (tooltip && tooltip.get('trail') && tooltip.get('status') == 'active')
+ {
+ // see if we are trailing lazy
+ if (tooltip.get('lazy'))
+ {
+ domLib_setTimeout(domTT_runShow, domTT_trailDelay, [in_owner.id, in_event]);
+ }
+ else
+ {
+ domTT_show(in_owner.id, in_event);
+ }
+ }
+}
+
+// }}}
+// {{{ domTT_addPredefined()
+
+function domTT_addPredefined(in_id)
+{
+ var options = new Hash();
+ for (var i = 1; i < arguments.length; i += 2)
+ {
+ options.set(arguments[i], arguments[i + 1]);
+ }
+
+ domTT_predefined.set(in_id, options);
+}
+
+// }}}
+// {{{ domTT_correctEdgeBleed()
+
+function domTT_correctEdgeBleed(in_width, in_height, in_x, in_y, in_offsetX, in_offsetY, in_mouseOffset, in_window)
+{
+ var win, doc;
+ var bleedRight, bleedBottom;
+ var pageHeight, pageWidth, pageYOffset, pageXOffset;
+
+ var x = in_x + in_offsetX;
+ var y = in_y + in_offsetY + in_mouseOffset;
+
+ win = (typeof(in_window) == 'undefined' ? window : in_window);
+
+ // Gecko and IE swaps values of clientHeight, clientWidth properties when
+ // in standards compliance mode from documentElement to document.body
+ doc = ((domLib_standardsMode && (domLib_isIE || domLib_isGecko)) ? win.document.documentElement : win.document.body);
+
+ // for IE in compliance mode
+ if (domLib_isIE)
+ {
+ pageHeight = doc.clientHeight;
+ pageWidth = doc.clientWidth;
+ pageYOffset = doc.scrollTop;
+ pageXOffset = doc.scrollLeft;
+ }
+ else
+ {
+ pageHeight = doc.clientHeight;
+ pageWidth = doc.clientWidth;
+
+ if (domLib_isKHTML)
+ {
+ pageHeight = win.innerHeight;
+ }
+
+ pageYOffset = win.pageYOffset;
+ pageXOffset = win.pageXOffset;
+ }
+
+ // we are bleeding off the right, move tip over to stay on page
+ // logic: take x position, add width and subtract from effective page width
+ if ((bleedRight = (x - pageXOffset) + in_width - (pageWidth - domTT_screenEdgePadding)) > 0)
+ {
+ x -= bleedRight;
+ }
+
+ // we are bleeding to the left, move tip over to stay on page
+ // if tip doesn't fit, we will go back to bleeding off the right
+ // logic: take x position and check if less than edge padding
+ if ((x - pageXOffset) < domTT_screenEdgePadding)
+ {
+ x = domTT_screenEdgePadding + pageXOffset;
+ }
+
+ // if we are bleeding off the bottom, flip to north
+ // logic: take y position, add height and subtract from effective page height
+ if ((bleedBottom = (y - pageYOffset) + in_height - (pageHeight - domTT_screenEdgePadding)) > 0)
+ {
+ y = in_y - in_height - in_offsetY;
+ }
+
+ // if we are bleeding off the top, flip to south
+ // if tip doesn't fit, we will go back to bleeding off the bottom
+ // logic: take y position and check if less than edge padding
+ if ((y - pageYOffset) < domTT_screenEdgePadding)
+ {
+ y = in_y + domTT_mouseHeight + in_offsetY;
+ }
+
+ return {'x' : x, 'y' : y};
+}
+
+// }}}
+// {{{ domTT_isActive()
+
+// in_id is either the tip id or the owner id
+function domTT_isActive(in_id)
+{
+ var tooltip = domTT_tooltips.get(in_id);
+ if (!tooltip || tooltip.get('status') != 'active')
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+}
+
+// }}}
+// {{{ domTT_runXXX()
+
+// All of these domMenu_runXXX() methods are used by the event handling sections to
+// avoid the circular memory leaks caused by inner functions
+function domTT_runDeactivate(args) { domTT_deactivate(args[0]); }
+function domTT_runShow(args) { domTT_show(args[0], args[1]); }
+
+// }}}
+// {{{ domTT_replaceTitles()
+
+function domTT_replaceTitles(in_decorator)
+{
+ var elements = domLib_getElementsByClass('tooltip');
+ for (var i = 0; i < elements.length; i++)
+ {
+ if (elements[i].title)
+ {
+ var content;
+ if (typeof(in_decorator) == 'function')
+ {
+ content = in_decorator(elements[i]);
+ }
+ else
+ {
+ content = elements[i].title;
+ }
+
+ content = content.replace(new RegExp('\'', 'g'), '\\\'');
+ elements[i].onmouseover = new Function('in_event', "domTT_activate(this, in_event, 'content', '" + content + "')");
+ elements[i].title = '';
+ }
+ }
+}
+
+// }}}
+// {{{ domTT_update()
+
+// Allow authors to update the contents of existing tips using the DOM
+// Unfortunately, the tip must already exist, or else no work is done.
+// TODO: make getting at content or caption cleaner
+function domTT_update(handle, content, type)
+{
+ // type defaults to 'content', can also be 'caption'
+ if (typeof(type) == 'undefined')
+ {
+ type = 'content';
+ }
+
+ var tip = domTT_tooltips.get(handle);
+ if (!tip)
+ {
+ return;
+ }
+
+ var tipObj = tip.get('node');
+ var updateNode;
+ if (type == 'content')
+ {
+ // <div class="contents">...
+ updateNode = tipObj.firstChild;
+ if (updateNode.className != 'contents')
+ {
+ // <table><tbody><tr>...</tr><tr><td><div class="contents">...
+ updateNode = updateNode.firstChild.firstChild.nextSibling.firstChild.firstChild;
+ }
+ }
+ else
+ {
+ updateNode = tipObj.firstChild;
+ if (updateNode.className == 'contents')
+ {
+ // missing caption
+ return;
+ }
+
+ // <table><tbody><tr><td><div class="caption">...
+ updateNode = updateNode.firstChild.firstChild.firstChild.firstChild;
+ }
+
+ // TODO: allow for a DOM node as content
+ updateNode.innerHTML = content;
+}
+
+// }}}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT_drag.js (from rev 11900, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT_drag.js)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT_drag.js (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/domTT_drag.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -0,0 +1,102 @@
+/** $Id: domTT_drag.js 2315 2006-06-12 05:45:36Z dallen $ */
+// {{{ license
+
+/*
+ * Copyright 2002-2005 Dan Allen, Mojavelinux.com (dan.allen(a)mojavelinux.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// }}}
+// {{{ globals (DO NOT EDIT)
+
+var domTT_dragEnabled = true;
+var domTT_currentDragTarget;
+var domTT_dragMouseDown;
+var domTT_dragOffsetLeft;
+var domTT_dragOffsetTop;
+
+// }}}
+// {{{ domTT_dragStart()
+
+function domTT_dragStart(in_this, in_event)
+{
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+
+ var eventButton = in_event[domLib_eventButton];
+ if (eventButton != 1 && !domLib_isKHTML)
+ {
+ return;
+ }
+
+ domTT_currentDragTarget = in_this;
+ in_this.style.cursor = 'move';
+
+ // upgrade our z-index
+ in_this.style.zIndex = ++domLib_zIndex;
+
+ var eventPosition = domLib_getEventPosition(in_event);
+
+ var targetPosition = domLib_getOffsets(in_this);
+ domTT_dragOffsetLeft = eventPosition.get('x') - targetPosition.get('left');
+ domTT_dragOffsetTop = eventPosition.get('y') - targetPosition.get('top');
+ domTT_dragMouseDown = true;
+}
+
+// }}}
+// {{{ domTT_dragUpdate()
+
+function domTT_dragUpdate(in_event)
+{
+ if (domTT_dragMouseDown)
+ {
+ if (domLib_isGecko)
+ {
+ window.getSelection().removeAllRanges()
+ }
+
+ if (domTT_useGlobalMousePosition && domTT_mousePosition != null)
+ {
+ var eventPosition = domTT_mousePosition;
+ }
+ else
+ {
+ if (typeof(in_event) == 'undefined') { in_event = window.event; }
+ var eventPosition = domLib_getEventPosition(in_event);
+ }
+
+ domTT_currentDragTarget.style.left = (eventPosition.get('x') - domTT_dragOffsetLeft) + 'px';
+ domTT_currentDragTarget.style.top = (eventPosition.get('y') - domTT_dragOffsetTop) + 'px';
+
+ // update the collision detection
+ domLib_detectCollisions(domTT_currentDragTarget);
+ }
+}
+
+// }}}
+// {{{ domTT_dragStop()
+
+function domTT_dragStop()
+{
+ if (domTT_dragMouseDown) {
+ domTT_dragMouseDown = false;
+ domTT_currentDragTarget.style.cursor = 'default';
+ domTT_currentDragTarget = null;
+ if (domLib_isGecko)
+ {
+ window.getSelection().removeAllRanges()
+ }
+ }
+}
+
+// }}}
Copied: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/fadomatic.js (from rev 11900, branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/fadomatic.js)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/fadomatic.js (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/js/tooltip/fadomatic.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -0,0 +1,180 @@
+/** $Id$ */
+// Title: Fadomatic
+// Version: 1.2
+// Homepage: http://chimpen.com/fadomatic
+// Author: Philip McCarthy <fadomatic(a)chimpen.com>
+
+// Fade interval in milliseconds
+// Make this larger if you experience performance issues
+Fadomatic.INTERVAL_MILLIS = 50;
+
+// Creates a fader
+// element - The element to fade
+// speed - The speed to fade at, from 0.0 to 100.0
+// initialOpacity (optional, default 100) - element's starting opacity, 0 to 100
+// minOpacity (optional, default 0) - element's minimum opacity, 0 to 100
+// maxOpacity (optional, default 0) - element's minimum opacity, 0 to 100
+function Fadomatic (element, rate, initialOpacity, minOpacity, maxOpacity) {
+ this._element = element;
+ this._intervalId = null;
+ this._rate = rate;
+ this._isFadeOut = true;
+
+ // Set initial opacity and bounds
+ // NB use 99 instead of 100 to avoid flicker at start of fade
+ this._minOpacity = 0;
+ this._maxOpacity = 99;
+ this._opacity = 99;
+
+ if (typeof minOpacity != 'undefined') {
+ if (minOpacity < 0) {
+ this._minOpacity = 0;
+ } else if (minOpacity > 99) {
+ this._minOpacity = 99;
+ } else {
+ this._minOpacity = minOpacity;
+ }
+ }
+
+ if (typeof maxOpacity != 'undefined') {
+ if (maxOpacity < 0) {
+ this._maxOpacity = 0;
+ } else if (maxOpacity > 99) {
+ this._maxOpacity = 99;
+ } else {
+ this._maxOpacity = maxOpacity;
+ }
+
+ if (this._maxOpacity < this._minOpacity) {
+ this._maxOpacity = this._minOpacity;
+ }
+ }
+
+ if (typeof initialOpacity != 'undefined') {
+ if (initialOpacity > this._maxOpacity) {
+ this._opacity = this._maxOpacity;
+ } else if (initialOpacity < this._minOpacity) {
+ this._opacity = this._minOpacity;
+ } else {
+ this._opacity = initialOpacity;
+ }
+ }
+
+ // See if we're using W3C opacity, MSIE filter, or just
+ // toggling visiblity
+ if(typeof element.style.opacity != 'undefined') {
+
+ this._updateOpacity = this._updateOpacityW3c;
+
+ } else if(typeof element.style.filter != 'undefined') {
+
+ // If there's not an alpha filter on the element already,
+ // add one
+ if (element.style.filter.indexOf("alpha") == -1) {
+
+ // Attempt to preserve existing filters
+ var existingFilters="";
+ if (element.style.filter) {
+ existingFilters = element.style.filter+" ";
+ }
+ element.style.filter = existingFilters+"alpha(opacity="+this._opacity+")";
+ }
+
+ this._updateOpacity = this._updateOpacityMSIE;
+
+ } else {
+
+ this._updateOpacity = this._updateVisibility;
+ }
+
+ this._updateOpacity();
+}
+
+// Initiates a fade out
+Fadomatic.prototype.fadeOut = function () {
+ this._isFadeOut = true;
+ this._beginFade();
+}
+
+// Initiates a fade in
+Fadomatic.prototype.fadeIn = function () {
+ this._isFadeOut = false;
+ this._beginFade();
+}
+
+// Makes the element completely opaque, stops any fade in progress
+Fadomatic.prototype.show = function () {
+ this.haltFade();
+ this._opacity = this._maxOpacity;
+ this._updateOpacity();
+}
+
+// Makes the element completely transparent, stops any fade in progress
+Fadomatic.prototype.hide = function () {
+ this.haltFade();
+ this._opacity = 0;
+ this._updateOpacity();
+}
+
+// Halts any fade in progress
+Fadomatic.prototype.haltFade = function () {
+
+ clearInterval(this._intervalId);
+}
+
+// Resumes a fade where it was halted
+Fadomatic.prototype.resumeFade = function () {
+
+ this._beginFade();
+}
+
+// Pseudo-private members
+
+Fadomatic.prototype._beginFade = function () {
+
+ this.haltFade();
+ var objref = this;
+ this._intervalId = setInterval(function() { objref._tickFade(); },Fadomatic.INTERVAL_MILLIS);
+}
+
+Fadomatic.prototype._tickFade = function () {
+
+ if (this._isFadeOut) {
+ this._opacity -= this._rate;
+ if (this._opacity < this._minOpacity) {
+ this._opacity = this._minOpacity;
+ this.haltFade();
+ }
+ } else {
+ this._opacity += this._rate;
+ if (this._opacity > this._maxOpacity ) {
+ this._opacity = this._maxOpacity;
+ this.haltFade();
+ }
+ }
+
+ this._updateOpacity();
+}
+
+Fadomatic.prototype._updateVisibility = function () {
+
+ if (this._opacity > 0) {
+ this._element.style.visibility = 'visible';
+ } else {
+ this._element.style.visibility = 'hidden';
+ }
+}
+
+Fadomatic.prototype._updateOpacityW3c = function () {
+
+ this._element.style.opacity = this._opacity/100;
+ this._updateVisibility();
+}
+
+Fadomatic.prototype._updateOpacityMSIE = function () {
+
+ this._element.filters.alpha.opacity = this._opacity;
+ this._updateVisibility();
+}
+
+Fadomatic.prototype._updateOpacity = null;
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/common.css
===================================================================
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/portlet-editor.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/portlet-editor.css (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/portlet-editor.css 2008-09-15 20:02:35 UTC (rev 11901)
@@ -0,0 +1,11 @@
+.portlet-editor-content {
+ height:300px;
+ width:500px;
+ overflow: auto;
+ overflow-x: hidden;
+ border: 1px solid #333;
+}
+
+.editor-icon {
+ margin: 0 4px 0 0;
+}
\ No newline at end of file
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/tooltip.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/tooltip.css (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/common/tooltip.css 2008-09-15 20:02:35 UTC (rev 11901)
@@ -0,0 +1,30 @@
+/*--------------------------ToolTip*/
+.darktip {
+ width: 250px;
+ border: 5px solid #e3e9f6;
+}
+
+.darktip .toolbar {
+ background: #95a7ca;
+ color: #fff;
+ font: normal 14px Verdana, Arial, serif;
+}
+
+/*.darktip .toolbar a.close {*/
+ /*background: url( ../img/close_hover.gif );*/
+/*}*/
+
+/*.darktip .toolbar a.close:hover {*/
+ /*background: url( ../img/close.gif );*/
+/*}*/
+
+.darktip .title {
+ padding: 5px;
+}
+
+.darktip .content {
+ background: #d2daeb;
+ color: #224d83;
+ font: 11px Verdana, Arial, Helvetica, sans-serif;
+ padding: 5px;
+}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-09-15 20:02:35 UTC (rev 11901)
@@ -1,3 +1,7 @@
+
+@import url("/portal-core/themes/common/portlet-editor.css");
+@import url( "../common/tooltip.css" );
+
/* *************************************************** */
/* Default for JBoss Portal */
/* *************************************************** */
@@ -13,6 +17,7 @@
background-repeat: repeat-x;
}
+
/*****************
* Portal Header *
******************/
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-09-15 20:02:35 UTC (rev 11901)
@@ -20,9 +20,9 @@
Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
%>
<portlet:defineObjects/>
-<script type='text/javascript' src='/portal-admin/js/domLib.js'></script>
-<script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script>
-<script type='text/javascript' src='/portal-admin/js/domTT.js'></script>
+<script type='text/javascript' src='<%=request.getContextPath()%>/js/tooltip/domLib.js'></script>
+<script type="text/javascript" src="<%=request.getContextPath()%>/js/tooltip/fadomatic.js"></script>
+<script type='text/javascript' src='<%=request.getContextPath()%>/js/tooltip/domTT.js'></script>
<script type="text/javascript">
//<![CDATA[
@@ -93,7 +93,8 @@
%>
<tr class="portlet-section-selected">
<td>
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <div id="portlet-editor-title">
+ <img src="<%= iconLocation %>" align="middle" class="editor-icon" alt="icon"/>
<span><%= displayName %></span>
<div>
@@ -103,18 +104,16 @@
<span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
<%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
+ </div>
</td>
</tr>
<%
}
}
%>
-
-
<tr>
<td>
-
- <div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;">
+ <div class="portlet-editor-content">
<table style="width:100%;" cellspacing="0" cellpadding="0">
<%
for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
@@ -154,7 +153,7 @@
</div>
<tr class="<%= rowClass %>">
<td>
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <img src="<%= iconLocation %>" align="middle" class="editor-icon" alt="icon"/>
<span
onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-09-15 20:02:35 UTC (rev 11901)
@@ -298,10 +298,6 @@
border: 1px solid #d5d5d5;
}
-.admin-ui .portlet-section-selected {
- background-color: #CBD4E6;
-}
-
.admin-ui .actionDetails {
background-image: url( ../img/actionIcon_Details.gif );
background-position: left;
@@ -502,7 +498,6 @@
}
.admin-ui .layout-button {
- width: 50px;
margin: 2px;
padding: 2px;
}
@@ -557,37 +552,8 @@
.cms-tab-container th {
background: none;
}
-/*--------------------------ToolTip*/
-.darktip {
- width: 250px;
- border: 5px solid #e3e9f6;
-}
-.darktip .toolbar {
- background: #95a7ca;
- color: #fff;
- font: normal 14px Verdana, Arial, serif;
-}
-.darktip .toolbar a.close {
- background: url( ../img/close_hover.gif );
-}
-
-.darktip .toolbar a.close:hover {
- background: url( ../img/close.gif );
-}
-
-.darktip .title {
- padding: 5px;
-}
-
-.darktip .content {
- background: #d2daeb;
- color: #224d83;
- font: 11px Verdana, Arial, Helvetica, sans-serif;
- padding: 5px;
-}
-
/*--------------------------- Instance Meta Data*/
.details-header * {
Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domLib.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domLib.js 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domLib.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -1,706 +0,0 @@
-/** $Id: domLib.js 2321 2006-06-12 06:45:41Z dallen $ */
-// {{{ license
-
-/*
- * Copyright 2002-2005 Dan Allen, Mojavelinux.com (dan.allen(a)mojavelinux.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// }}}
-// {{{ intro
-
-/**
- * Title: DOM Library Core
- * Version: 0.70
- *
- * Summary:
- * A set of commonly used functions that make it easier to create javascript
- * applications that rely on the DOM.
- *
- * Updated: 2005/05/17
- *
- * Maintainer: Dan Allen <dan.allen(a)mojavelinux.com>
- * Maintainer: Jason Rust <jrust(a)rustyparts.com>
- *
- * License: Apache 2.0
- */
-
-// }}}
-// {{{ global constants (DO NOT EDIT)
-
-// -- Browser Detection --
-var domLib_userAgent = navigator.userAgent.toLowerCase();
-var domLib_isMac = navigator.appVersion.indexOf('Mac') != -1;
-var domLib_isWin = domLib_userAgent.indexOf('windows') != -1;
-// NOTE: could use window.opera for detecting Opera
-var domLib_isOpera = domLib_userAgent.indexOf('opera') != -1;
-var domLib_isOpera7up = domLib_userAgent.match(/opera.(7|8)/i);
-var domLib_isSafari = domLib_userAgent.indexOf('safari') != -1;
-var domLib_isKonq = domLib_userAgent.indexOf('konqueror') != -1;
-// Both konqueror and safari use the khtml rendering engine
-var domLib_isKHTML = (domLib_isKonq || domLib_isSafari || domLib_userAgent.indexOf('khtml') != -1);
-var domLib_isIE = (!domLib_isKHTML && !domLib_isOpera && (domLib_userAgent.indexOf('msie 5') != -1 || domLib_userAgent.indexOf('msie 6') != -1 || domLib_userAgent.indexOf('msie 7') != -1));
-var domLib_isIE5up = domLib_isIE;
-var domLib_isIE50 = (domLib_isIE && domLib_userAgent.indexOf('msie 5.0') != -1);
-var domLib_isIE55 = (domLib_isIE && domLib_userAgent.indexOf('msie 5.5') != -1);
-var domLib_isIE5 = (domLib_isIE50 || domLib_isIE55);
-// safari and konq may use string "khtml, like gecko", so check for destinctive /
-var domLib_isGecko = domLib_userAgent.indexOf('gecko/') != -1;
-var domLib_isMacIE = (domLib_isIE && domLib_isMac);
-var domLib_isIE55up = domLib_isIE5up && !domLib_isIE50 && !domLib_isMacIE;
-var domLib_isIE6up = domLib_isIE55up && !domLib_isIE55;
-
-// -- Browser Abilities --
-var domLib_standardsMode = (document.compatMode && document.compatMode == 'CSS1Compat');
-var domLib_useLibrary = (domLib_isOpera7up || domLib_isKHTML || domLib_isIE5up || domLib_isGecko || domLib_isMacIE || document.defaultView);
-// fixed in Konq3.2
-var domLib_hasBrokenTimeout = (domLib_isMacIE || (domLib_isKonq && domLib_userAgent.match(/konqueror\/3.([2-9])/) == null));
-var domLib_canFade = (domLib_isGecko || domLib_isIE || domLib_isSafari || domLib_isOpera);
-var domLib_canDrawOverSelect = (domLib_isMac || domLib_isOpera || domLib_isGecko);
-var domLib_canDrawOverFlash = (domLib_isMac || domLib_isWin);
-
-// -- Event Variables --
-var domLib_eventTarget = domLib_isIE ? 'srcElement' : 'currentTarget';
-var domLib_eventButton = domLib_isIE ? 'button' : 'which';
-var domLib_eventTo = domLib_isIE ? 'toElement' : 'relatedTarget';
-var domLib_stylePointer = domLib_isIE ? 'hand' : 'pointer';
-// NOTE: a bug exists in Opera that prevents maxWidth from being set to 'none', so we make it huge
-var domLib_styleNoMaxWidth = domLib_isOpera ? '10000px' : 'none';
-var domLib_hidePosition = '-1000px';
-var domLib_scrollbarWidth = 14;
-var domLib_autoId = 1;
-var domLib_zIndex = 100;
-
-// -- Detection --
-var domLib_collisionElements;
-var domLib_collisionsCached = false;
-
-var domLib_timeoutStateId = 0;
-var domLib_timeoutStates = new Hash();
-
-// }}}
-// {{{ DOM enhancements
-
-if (!document.ELEMENT_NODE)
-{
- document.ELEMENT_NODE = 1;
- document.ATTRIBUTE_NODE = 2;
- document.TEXT_NODE = 3;
- document.DOCUMENT_NODE = 9;
- document.DOCUMENT_FRAGMENT_NODE = 11;
-}
-
-function domLib_clone(obj)
-{
- var copy = {};
- for (var i in obj)
- {
- var value = obj[i];
- try
- {
- if (value != null && typeof(value) == 'object' && value != window && !value.nodeType)
- {
- copy[i] = domLib_clone(value);
- }
- else
- {
- copy[i] = value;
- }
- }
- catch(e)
- {
- copy[i] = value;
- }
- }
-
- return copy;
-}
-
-// }}}
-// {{{ class Hash()
-
-function Hash()
-{
- this.length = 0;
- this.numericLength = 0;
- this.elementData = [];
- for (var i = 0; i < arguments.length; i += 2)
- {
- if (typeof(arguments[i + 1]) != 'undefined')
- {
- this.elementData[arguments[i]] = arguments[i + 1];
- this.length++;
- if (arguments[i] == parseInt(arguments[i]))
- {
- this.numericLength++;
- }
- }
- }
-}
-
-// using prototype as opposed to inner functions saves on memory
-Hash.prototype.get = function(in_key)
-{
- if (typeof(this.elementData[in_key]) != 'undefined') {
- return this.elementData[in_key];
- }
-
- return null;
-}
-
-Hash.prototype.set = function(in_key, in_value)
-{
- if (typeof(in_value) != 'undefined')
- {
- if (typeof(this.elementData[in_key]) == 'undefined')
- {
- this.length++;
- if (in_key == parseInt(in_key))
- {
- this.numericLength++;
- }
- }
-
- return this.elementData[in_key] = in_value;
- }
-
- return false;
-}
-
-Hash.prototype.remove = function(in_key)
-{
- var tmp_value;
- if (typeof(this.elementData[in_key]) != 'undefined')
- {
- this.length--;
- if (in_key == parseInt(in_key))
- {
- this.numericLength--;
- }
-
- tmp_value = this.elementData[in_key];
- delete this.elementData[in_key];
- }
-
- return tmp_value;
-}
-
-Hash.prototype.size = function()
-{
- return this.length;
-}
-
-Hash.prototype.has = function(in_key)
-{
- return typeof(this.elementData[in_key]) != 'undefined';
-}
-
-Hash.prototype.find = function(in_obj)
-{
- for (var tmp_key in this.elementData)
- {
- if (this.elementData[tmp_key] == in_obj)
- {
- return tmp_key;
- }
- }
-
- return null;
-}
-
-Hash.prototype.merge = function(in_hash)
-{
- for (var tmp_key in in_hash.elementData)
- {
- if (typeof(this.elementData[tmp_key]) == 'undefined')
- {
- this.length++;
- if (tmp_key == parseInt(tmp_key))
- {
- this.numericLength++;
- }
- }
-
- this.elementData[tmp_key] = in_hash.elementData[tmp_key];
- }
-}
-
-Hash.prototype.compare = function(in_hash)
-{
- if (this.length != in_hash.length)
- {
- return false;
- }
-
- for (var tmp_key in this.elementData)
- {
- if (this.elementData[tmp_key] != in_hash.elementData[tmp_key])
- {
- return false;
- }
- }
-
- return true;
-}
-
-// }}}
-// {{{ domLib_isDescendantOf()
-
-function domLib_isDescendantOf(in_object, in_ancestor, in_bannedTags)
-{
- if (in_object == null)
- {
- return false;
- }
-
- if (in_object == in_ancestor)
- {
- return true;
- }
-
- if (typeof(in_bannedTags) != 'undefined' &&
- (',' + in_bannedTags.join(',') + ',').indexOf(',' + in_object.tagName + ',') != -1)
- {
- return false;
- }
-
- while (in_object != document.documentElement)
- {
- try
- {
- if ((tmp_object = in_object.offsetParent) && tmp_object == in_ancestor)
- {
- return true;
- }
- else if ((tmp_object = in_object.parentNode) == in_ancestor)
- {
- return true;
- }
- else
- {
- in_object = tmp_object;
- }
- }
- // in case we get some wierd error, assume we left the building
- catch(e)
- {
- return false;
- }
- }
-
- return false;
-}
-
-// }}}
-// {{{ domLib_detectCollisions()
-
-/**
- * For any given target element, determine if elements on the page
- * are colliding with it that do not obey the rules of z-index.
- */
-function domLib_detectCollisions(in_object, in_recover, in_useCache)
-{
- // the reason for the cache is that if the root menu is built before
- // the page is done loading, then it might not find all the elements.
- // so really the only time you don't use cache is when building the
- // menu as part of the page load
- if (!domLib_collisionsCached)
- {
- var tags = [];
-
- if (!domLib_canDrawOverFlash)
- {
- tags[tags.length] = 'object';
- }
-
- if (!domLib_canDrawOverSelect)
- {
- tags[tags.length] = 'select';
- }
-
- domLib_collisionElements = domLib_getElementsByTagNames(tags, true);
- domLib_collisionsCached = in_useCache;
- }
-
- // if we don't have a tip, then unhide selects
- if (in_recover)
- {
- for (var cnt = 0; cnt < domLib_collisionElements.length; cnt++)
- {
- var thisElement = domLib_collisionElements[cnt];
-
- if (!thisElement.hideList)
- {
- thisElement.hideList = new Hash();
- }
-
- thisElement.hideList.remove(in_object.id);
- if (!thisElement.hideList.length)
- {
- domLib_collisionElements[cnt].style.visibility = 'visible';
- if (domLib_isKonq)
- {
- domLib_collisionElements[cnt].style.display = '';
- }
- }
- }
-
- return;
- }
- else if (domLib_collisionElements.length == 0)
- {
- return;
- }
-
- // okay, we have a tip, so hunt and destroy
- var objectOffsets = domLib_getOffsets(in_object);
-
- for (var cnt = 0; cnt < domLib_collisionElements.length; cnt++)
- {
- var thisElement = domLib_collisionElements[cnt];
-
- // if collision element is in active element, move on
- // WARNING: is this too costly?
- if (domLib_isDescendantOf(thisElement, in_object))
- {
- continue;
- }
-
- // konqueror only has trouble with multirow selects
- if (domLib_isKonq &&
- thisElement.tagName == 'SELECT' &&
- (thisElement.size <= 1 && !thisElement.multiple))
- {
- continue;
- }
-
- if (!thisElement.hideList)
- {
- thisElement.hideList = new Hash();
- }
-
- var selectOffsets = domLib_getOffsets(thisElement);
- var center2centerDistance = Math.sqrt(Math.pow(selectOffsets.get('leftCenter') - objectOffsets.get('leftCenter'), 2) + Math.pow(selectOffsets.get('topCenter') - objectOffsets.get('topCenter'), 2));
- var radiusSum = selectOffsets.get('radius') + objectOffsets.get('radius');
- // the encompassing circles are overlapping, get in for a closer look
- if (center2centerDistance < radiusSum)
- {
- // tip is left of select
- if ((objectOffsets.get('leftCenter') <= selectOffsets.get('leftCenter') && objectOffsets.get('right') < selectOffsets.get('left')) ||
- // tip is right of select
- (objectOffsets.get('leftCenter') > selectOffsets.get('leftCenter') && objectOffsets.get('left') > selectOffsets.get('right')) ||
- // tip is above select
- (objectOffsets.get('topCenter') <= selectOffsets.get('topCenter') && objectOffsets.get('bottom') < selectOffsets.get('top')) ||
- // tip is below select
- (objectOffsets.get('topCenter') > selectOffsets.get('topCenter') && objectOffsets.get('top') > selectOffsets.get('bottom')))
- {
- thisElement.hideList.remove(in_object.id);
- if (!thisElement.hideList.length)
- {
- thisElement.style.visibility = 'visible';
- if (domLib_isKonq)
- {
- thisElement.style.display = '';
- }
- }
- }
- else
- {
- thisElement.hideList.set(in_object.id, true);
- thisElement.style.visibility = 'hidden';
- if (domLib_isKonq)
- {
- thisElement.style.display = 'none';
- }
- }
- }
- }
-}
-
-// }}}
-// {{{ domLib_getOffsets()
-
-function domLib_getOffsets(in_object, in_preserveScroll)
-{
- if (typeof(in_preserveScroll) == 'undefined') {
- in_preserveScroll = false;
- }
-
- var originalObject = in_object;
- var originalWidth = in_object.offsetWidth;
- var originalHeight = in_object.offsetHeight;
- var offsetLeft = 0;
- var offsetTop = 0;
-
- while (in_object)
- {
- offsetLeft += in_object.offsetLeft;
- offsetTop += in_object.offsetTop;
- in_object = in_object.offsetParent;
- // consider scroll offset of parent elements
- if (in_object && !in_preserveScroll)
- {
- offsetLeft -= in_object.scrollLeft;
- offsetTop -= in_object.scrollTop;
- }
- }
-
- // MacIE misreports the offsets (even with margin: 0 in body{}), still not perfect
- if (domLib_isMacIE) {
- offsetLeft += 10;
- offsetTop += 10;
- }
-
- return new Hash(
- 'left', offsetLeft,
- 'top', offsetTop,
- 'right', offsetLeft + originalWidth,
- 'bottom', offsetTop + originalHeight,
- 'leftCenter', offsetLeft + originalWidth/2,
- 'topCenter', offsetTop + originalHeight/2,
- 'radius', Math.max(originalWidth, originalHeight)
- );
-}
-
-// }}}
-// {{{ domLib_setTimeout()
-
-function domLib_setTimeout(in_function, in_timeout, in_args)
-{
- if (typeof(in_args) == 'undefined')
- {
- in_args = [];
- }
-
- if (in_timeout == -1)
- {
- // timeout event is disabled
- return 0;
- }
- else if (in_timeout == 0)
- {
- in_function(in_args);
- return 0;
- }
-
- // must make a copy of the arguments so that we release the reference
- var args = domLib_clone(in_args);
-
- if (!domLib_hasBrokenTimeout)
- {
- return setTimeout(function() { in_function(args); }, in_timeout);
- }
- else
- {
- var id = domLib_timeoutStateId++;
- var data = new Hash();
- data.set('function', in_function);
- data.set('args', args);
- domLib_timeoutStates.set(id, data);
-
- data.set('timeoutId', setTimeout('domLib_timeoutStates.get(' + id + ').get(\'function\')(domLib_timeoutStates.get(' + id + ').get(\'args\')); domLib_timeoutStates.remove(' + id + ');', in_timeout));
- return id;
- }
-}
-
-// }}}
-// {{{ domLib_clearTimeout()
-
-function domLib_clearTimeout(in_id)
-{
- if (!domLib_hasBrokenTimeout)
- {
- if (in_id > 0) {
- clearTimeout(in_id);
- }
- }
- else
- {
- if (domLib_timeoutStates.has(in_id))
- {
- clearTimeout(domLib_timeoutStates.get(in_id).get('timeoutId'))
- domLib_timeoutStates.remove(in_id);
- }
- }
-}
-
-// }}}
-// {{{ domLib_getEventPosition()
-
-function domLib_getEventPosition(in_eventObj)
-{
- var eventPosition = new Hash('x', 0, 'y', 0, 'scrollX', 0, 'scrollY', 0);
-
- // IE varies depending on standard compliance mode
- if (domLib_isIE)
- {
- var doc = (domLib_standardsMode ? document.documentElement : document.body);
- // NOTE: events may fire before the body has been loaded
- if (doc)
- {
- eventPosition.set('x', in_eventObj.clientX + doc.scrollLeft);
- eventPosition.set('y', in_eventObj.clientY + doc.scrollTop);
- eventPosition.set('scrollX', doc.scrollLeft);
- eventPosition.set('scrollY', doc.scrollTop);
- }
- }
- else
- {
- eventPosition.set('x', in_eventObj.pageX);
- eventPosition.set('y', in_eventObj.pageY);
- eventPosition.set('scrollX', in_eventObj.pageX - in_eventObj.clientX);
- eventPosition.set('scrollY', in_eventObj.pageY - in_eventObj.clientY);
- }
-
- return eventPosition;
-}
-
-// }}}
-// {{{ domLib_cancelBubble()
-
-function domLib_cancelBubble(in_event)
-{
- var eventObj = in_event ? in_event : window.event;
- eventObj.cancelBubble = true;
-}
-
-// }}}
-// {{{ domLib_getIFrameReference()
-
-function domLib_getIFrameReference(in_frame)
-{
- if (domLib_isGecko || domLib_isIE)
- {
- return in_frame.frameElement;
- }
- else
- {
- // we could either do it this way or require an id on the frame
- // equivalent to the name
- var name = in_frame.name;
- if (!name || !in_frame.parent)
- {
- return null;
- }
-
- var candidates = in_frame.parent.document.getElementsByTagName('iframe');
- for (var i = 0; i < candidates.length; i++)
- {
- if (candidates[i].name == name)
- {
- return candidates[i];
- }
- }
-
- return null;
- }
-}
-
-// }}}
-// {{{ domLib_getElementsByClass()
-
-function domLib_getElementsByClass(in_class)
-{
- var elements = domLib_isIE5 ? document.all : document.getElementsByTagName('*');
- var matches = [];
- var cnt = 0;
- for (var i = 0; i < elements.length; i++)
- {
- if ((" " + elements[i].className + " ").indexOf(" " + in_class + " ") != -1)
- {
- matches[cnt++] = elements[i];
- }
- }
-
- return matches;
-}
-
-// }}}
-// {{{ domLib_getElementsByTagNames()
-
-function domLib_getElementsByTagNames(in_list, in_excludeHidden)
-{
- var elements = [];
- for (var i = 0; i < in_list.length; i++)
- {
- var matches = document.getElementsByTagName(in_list[i]);
- for (var j = 0; j < matches.length; j++)
- {
- // skip objects that have nested embeds, or else we get "flashing"
- if (matches[j].tagName == 'OBJECT' && domLib_isGecko)
- {
- var kids = matches[j].childNodes;
- var skip = false;
- for (var k = 0; k < kids.length; k++)
- {
- if (kids[k].tagName == 'EMBED')
- {
- skip = true;
- break;
- }
- }
- if (skip) continue;
- }
-
- if (in_excludeHidden && domLib_getComputedStyle(matches[j], 'visibility') == 'hidden')
- {
- continue;
- }
-
- elements[elements.length] = matches[j];
- }
- }
-
- return elements;
-}
-
-// }}}
-// {{{ domLib_getComputedStyle()
-
-function domLib_getComputedStyle(in_obj, in_property)
-{
- if (domLib_isIE)
- {
- var humpBackProp = in_property.replace(/-(.)/, function (a, b) { return b.toUpperCase(); });
- return eval('in_obj.currentStyle.' + humpBackProp);
- }
- // getComputedStyle() is broken in konqueror, so let's go for the style object
- else if (domLib_isKonq)
- {
- //var humpBackProp = in_property.replace(/-(.)/, function (a, b) { return b.toUpperCase(); });
- return eval('in_obj.style.' + in_property);
- }
- else
- {
- return document.defaultView.getComputedStyle(in_obj, null).getPropertyValue(in_property);
- }
-}
-
-// }}}
-// {{{ makeTrue()
-
-function makeTrue()
-{
- return true;
-}
-
-// }}}
-// {{{ makeFalse()
-
-function makeFalse()
-{
- return false;
-}
-
-// }}}
Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT.js 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -1,1132 +0,0 @@
-/** $Id: domTT.js 2324 2006-06-12 07:06:39Z dallen $ */
-// {{{ license
-
-/*
- * Copyright 2002-2005 Dan Allen, Mojavelinux.com (dan.allen(a)mojavelinux.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// }}}
-// {{{ intro
-
-/**
- * Title: DOM Tooltip Library
- * Version: 0.7.3
- *
- * Summary:
- * Allows developers to add custom tooltips to the webpages. Tooltips are
- * generated using the domTT_activate() function and customized by setting
- * a handful of options.
- *
- * Maintainer: Dan Allen <dan.allen(a)mojavelinux.com>
- * Contributors:
- * Josh Gross <josh(a)jportalhome.com>
- * Jason Rust <jason(a)rustyparts.com>
- *
- * License: Apache 2.0
- * However, if you use this library, you earn the position of official bug
- * reporter :) Please post questions or problem reports to the newsgroup:
- *
- * http://groups-beta.google.com/group/dom-tooltip
- *
- * If you are doing this for commercial work, perhaps you could send me a few
- * Starbucks Coffee gift dollars or PayPal bucks to encourage future
- * developement (NOT REQUIRED). E-mail me for my snail mail address.
-
- *
- * Homepage: http://www.mojavelinux.com/projects/domtooltip/
- *
- * Newsgroup: http://groups-beta.google.com/group/dom-tooltip
- *
- * Freshmeat Project: http://freshmeat.net/projects/domtt/?topic_id=92
- *
- * Updated: 2005/07/16
- *
- * Supported Browsers:
- * Mozilla (Gecko), IE 5.5+, IE on Mac, Safari, Konqueror, Opera 7
- *
- * Usage:
- * Please see the HOWTO documentation.
-**/
-
-// }}}
-// {{{ settings (editable)
-
-// IE mouse events seem to be off by 2 pixels
-var domTT_offsetX = (domLib_isIE ? -2 : 0);
-var domTT_offsetY = (domLib_isIE ? 4 : 2);
-var domTT_direction = 'southeast';
-var domTT_mouseHeight = domLib_isIE ? 13 : 19;
-var domTT_closeLink = 'X';
-var domTT_closeAction = 'hide';
-var domTT_activateDelay = 500;
-var domTT_maxWidth = false;
-var domTT_styleClass = 'domTT';
-var domTT_fade = 'neither';
-var domTT_lifetime = 0;
-var domTT_grid = 0;
-var domTT_trailDelay = 200;
-var domTT_useGlobalMousePosition = true;
-var domTT_postponeActivation = false;
-var domTT_tooltipIdPrefix = '[domTT]';
-var domTT_screenEdgeDetection = true;
-var domTT_screenEdgePadding = 4;
-var domTT_oneOnly = false;
-var domTT_cloneNodes = false;
-var domTT_detectCollisions = true;
-var domTT_bannedTags = ['OPTION'];
-var domTT_draggable = false;
-if (typeof(domTT_dragEnabled) == 'undefined')
-{
- domTT_dragEnabled = false;
-}
-
-// }}}
-// {{{ globals (DO NOT EDIT)
-
-var domTT_predefined = new Hash();
-// tooltips are keyed on both the tip id and the owner id,
-// since events can originate on either object
-var domTT_tooltips = new Hash();
-var domTT_lastOpened = 0;
-var domTT_documentLoaded = false;
-var domTT_mousePosition = null;
-
-// }}}
-// {{{ document.onmousemove
-
-if (domLib_useLibrary && domTT_useGlobalMousePosition)
-{
- document.onmousemove = function(in_event)
- {
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
-
- domTT_mousePosition = domLib_getEventPosition(in_event);
- if (domTT_dragEnabled && domTT_dragMouseDown)
- {
- domTT_dragUpdate(in_event);
- }
- }
-}
-
-// }}}
-// {{{ domTT_activate()
-
-function domTT_activate(in_this, in_event)
-{
- if (!domLib_useLibrary || (domTT_postponeActivation && !domTT_documentLoaded)) { return false; }
-
- // make sure in_event is set (for IE, some cases we have to use window.event)
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
-
- // don't allow tooltips on banned tags (such as OPTION)
- if (in_event != null) {
- var target = in_event.srcElement ? in_event.srcElement : in_event.target;
- if (target != null && (',' + domTT_bannedTags.join(',') + ',').indexOf(',' + target.tagName + ',') != -1)
- {
- return false;
- }
- }
-
- var owner = document.body;
- // we have an active event so get the owner
- if (in_event != null && in_event.type.match(/key|mouse|click|contextmenu/i))
- {
- // make sure we have nothing higher than the body element
- if (in_this.nodeType && in_this.nodeType != document.DOCUMENT_NODE)
- {
- owner = in_this;
- }
- }
- // non active event (make sure we were passed a string id)
- else
- {
- if (typeof(in_this) != 'object' && !(owner = domTT_tooltips.get(in_this)))
- {
- // NOTE: two steps to avoid "flashing" in gecko
- var embryo = document.createElement('div');
- owner = document.body.appendChild(embryo);
- owner.style.display = 'none';
- owner.id = in_this;
- }
- }
-
- // make sure the owner has a unique id
- if (!owner.id)
- {
- owner.id = '__autoId' + domLib_autoId++;
- }
-
- // see if we should only be opening one tip at a time
- // NOTE: this is not "perfect" yet since it really steps on any other
- // tip working on fade out or delayed close, but it get's the job done
- if (domTT_oneOnly && domTT_lastOpened)
- {
- domTT_deactivate(domTT_lastOpened);
- }
-
- domTT_lastOpened = owner.id;
-
- var tooltip = domTT_tooltips.get(owner.id);
- if (tooltip)
- {
- if (tooltip.get('eventType') != in_event.type)
- {
- if (tooltip.get('type') == 'greasy')
- {
- tooltip.set('closeAction', 'destroy');
- domTT_deactivate(owner.id);
- }
- else if (tooltip.get('status') != 'inactive')
- {
- return owner.id;
- }
- }
- else
- {
- if (tooltip.get('status') == 'inactive')
- {
- tooltip.set('status', 'pending');
- tooltip.set('activateTimeout', domLib_setTimeout(domTT_runShow, tooltip.get('delay'), [owner.id, in_event]));
-
- return owner.id;
- }
- // either pending or active, let it be
- else
- {
- return owner.id;
- }
- }
- }
-
- // setup the default options hash
- var options = new Hash(
- 'caption', '',
- 'content', '',
- 'clearMouse', true,
- 'closeAction', domTT_closeAction,
- 'closeLink', domTT_closeLink,
- 'delay', domTT_activateDelay,
- 'direction', domTT_direction,
- 'draggable', domTT_draggable,
- 'fade', domTT_fade,
- 'fadeMax', 100,
- 'grid', domTT_grid,
- 'id', domTT_tooltipIdPrefix + owner.id,
- 'inframe', false,
- 'lifetime', domTT_lifetime,
- 'offsetX', domTT_offsetX,
- 'offsetY', domTT_offsetY,
- 'parent', document.body,
- 'position', 'absolute',
- 'styleClass', domTT_styleClass,
- 'type', 'greasy',
- 'trail', false,
- 'lazy', false
- );
-
- // load in the options from the function call
- for (var i = 2; i < arguments.length; i += 2)
- {
- // load in predefined
- if (arguments[i] == 'predefined')
- {
- var predefinedOptions = domTT_predefined.get(arguments[i + 1]);
- for (var j in predefinedOptions.elementData)
- {
- options.set(j, predefinedOptions.get(j));
- }
- }
- // set option
- else
- {
- options.set(arguments[i], arguments[i + 1]);
- }
- }
-
- options.set('eventType', in_event != null ? in_event.type : null);
-
- // immediately set the status text if provided
- if (options.has('statusText'))
- {
- try { window.status = options.get('statusText'); } catch(e) {}
- }
-
- // if we didn't give content...assume we just wanted to change the status and return
- if (!options.has('content') || options.get('content') == '' || options.get('content') == null)
- {
- if (typeof(owner.onmouseout) != 'function')
- {
- owner.onmouseout = function(in_event) { domTT_mouseout(this, in_event); };
- }
-
- return owner.id;
- }
-
- options.set('owner', owner);
-
- domTT_create(options);
-
- // determine the show delay
- options.set('delay', (in_event != null && in_event.type.match(/click|mousedown|contextmenu/i)) ? 0 : parseInt(options.get('delay')));
- domTT_tooltips.set(owner.id, options);
- domTT_tooltips.set(options.get('id'), options);
- options.set('status', 'pending');
- options.set('activateTimeout', domLib_setTimeout(domTT_runShow, options.get('delay'), [owner.id, in_event]));
-
- return owner.id;
-}
-
-// }}}
-// {{{ domTT_create()
-
-function domTT_create(in_options)
-{
- var tipOwner = in_options.get('owner');
- var parentObj = in_options.get('parent');
- var parentDoc = parentObj.ownerDocument || parentObj.document;
-
- // create the tooltip and hide it
- // NOTE: two steps to avoid "flashing" in gecko
- var embryo = parentDoc.createElement('div');
- var tipObj = parentObj.appendChild(embryo);
- tipObj.style.position = 'absolute';
- tipObj.style.left = '0px';
- tipObj.style.top = '0px';
- tipObj.style.visibility = 'hidden';
- tipObj.id = in_options.get('id');
- tipObj.className = in_options.get('styleClass');
-
- var contentBlock;
- var tableLayout = false;
-
- if (in_options.get('caption') || (in_options.get('type') == 'sticky' && in_options.get('caption') !== false))
- {
- tableLayout = true;
- // layout the tip with a hidden formatting table
- var tipLayoutTable = tipObj.appendChild(parentDoc.createElement('table'));
- tipLayoutTable.style.borderCollapse = 'collapse';
- if (domLib_isKHTML)
- {
- tipLayoutTable.cellSpacing = 0;
- }
-
- var tipLayoutTbody = tipLayoutTable.appendChild(parentDoc.createElement('tbody'));
-
- var numCaptionCells = 0;
- var captionRow = tipLayoutTbody.appendChild(parentDoc.createElement('tr'));
- var captionCell = captionRow.appendChild(parentDoc.createElement('td'));
- captionCell.style.padding = '0px';
- var caption = captionCell.appendChild(parentDoc.createElement('div'));
- caption.className = 'caption';
- if (domLib_isIE50)
- {
- caption.style.height = '100%';
- }
-
- if (in_options.get('caption').nodeType)
- {
- caption.appendChild(domTT_cloneNodes ? in_options.get('caption').cloneNode(1) : in_options.get('caption'));
- }
- else
- {
- caption.innerHTML = in_options.get('caption');
- }
-
- if (in_options.get('type') == 'sticky')
- {
- var numCaptionCells = 2;
- var closeLinkCell = captionRow.appendChild(parentDoc.createElement('td'));
- closeLinkCell.style.padding = '0px';
- var closeLink = closeLinkCell.appendChild(parentDoc.createElement('div'));
- closeLink.className = 'caption';
- if (domLib_isIE50)
- {
- closeLink.style.height = '100%';
- }
-
- closeLink.style.textAlign = 'right';
- closeLink.style.cursor = domLib_stylePointer;
- // merge the styles of the two cells
- closeLink.style.borderLeftWidth = caption.style.borderRightWidth = '0px';
- closeLink.style.paddingLeft = caption.style.paddingRight = '0px';
- closeLink.style.marginLeft = caption.style.marginRight = '0px';
- if (in_options.get('closeLink').nodeType)
- {
- closeLink.appendChild(in_options.get('closeLink').cloneNode(1));
- }
- else
- {
- closeLink.innerHTML = in_options.get('closeLink');
- }
-
- closeLink.onclick = function()
- {
- domTT_deactivate(tipOwner.id);
- };
- closeLink.onmousedown = function(in_event)
- {
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
- in_event.cancelBubble = true;
- };
- // MacIE has to have a newline at the end and must be made with createTextNode()
- if (domLib_isMacIE)
- {
- closeLinkCell.appendChild(parentDoc.createTextNode("\n"));
- }
- }
-
- // MacIE has to have a newline at the end and must be made with createTextNode()
- if (domLib_isMacIE)
- {
- captionCell.appendChild(parentDoc.createTextNode("\n"));
- }
-
- var contentRow = tipLayoutTbody.appendChild(parentDoc.createElement('tr'));
- var contentCell = contentRow.appendChild(parentDoc.createElement('td'));
- contentCell.style.padding = '0px';
- if (numCaptionCells)
- {
- if (domLib_isIE || domLib_isOpera)
- {
- contentCell.colSpan = numCaptionCells;
- }
- else
- {
- contentCell.setAttribute('colspan', numCaptionCells);
- }
- }
-
- contentBlock = contentCell.appendChild(parentDoc.createElement('div'));
- if (domLib_isIE50)
- {
- contentBlock.style.height = '100%';
- }
- }
- else
- {
- contentBlock = tipObj.appendChild(parentDoc.createElement('div'));
- }
-
- contentBlock.className = 'contents';
-
- var content = in_options.get('content');
- // allow content has a function to return the actual content
- if (typeof(content) == 'function') {
- content = content(in_options.get('id'));
- }
-
- if (content != null && content.nodeType)
- {
- contentBlock.appendChild(domTT_cloneNodes ? content.cloneNode(1) : content);
- }
- else
- {
- contentBlock.innerHTML = content;
- }
-
- // adjust the width if specified
- if (in_options.has('width'))
- {
- tipObj.style.width = parseInt(in_options.get('width')) + 'px';
- }
-
- // check if we are overridding the maxWidth
- // if the browser supports maxWidth, the global setting will be ignored (assume stylesheet)
- var maxWidth = domTT_maxWidth;
- if (in_options.has('maxWidth'))
- {
- if ((maxWidth = in_options.get('maxWidth')) === false)
- {
- tipObj.style.maxWidth = domLib_styleNoMaxWidth;
- }
- else
- {
- maxWidth = parseInt(in_options.get('maxWidth'));
- tipObj.style.maxWidth = maxWidth + 'px';
- }
- }
-
- // HACK: fix lack of maxWidth in CSS for KHTML and IE
- if (maxWidth !== false && (domLib_isIE || domLib_isKHTML) && tipObj.offsetWidth > maxWidth)
- {
- tipObj.style.width = maxWidth + 'px';
- }
-
- in_options.set('offsetWidth', tipObj.offsetWidth);
- in_options.set('offsetHeight', tipObj.offsetHeight);
-
- // konqueror miscalcuates the width of the containing div when using the layout table based on the
- // border size of the containing div
- if (domLib_isKonq && tableLayout && !tipObj.style.width)
- {
- var left = document.defaultView.getComputedStyle(tipObj, '').getPropertyValue('border-left-width');
- var right = document.defaultView.getComputedStyle(tipObj, '').getPropertyValue('border-right-width');
-
- left = left.substring(left.indexOf(':') + 2, left.indexOf(';'));
- right = right.substring(right.indexOf(':') + 2, right.indexOf(';'));
- var correction = 2 * ((left ? parseInt(left) : 0) + (right ? parseInt(right) : 0));
- tipObj.style.width = (tipObj.offsetWidth - correction) + 'px';
- }
-
- // if a width is not set on an absolutely positioned object, both IE and Opera
- // will attempt to wrap when it spills outside of body...we cannot have that
- if (domLib_isIE || domLib_isOpera)
- {
- if (!tipObj.style.width)
- {
- // HACK: the correction here is for a border
- tipObj.style.width = (tipObj.offsetWidth - 2) + 'px';
- }
-
- // HACK: the correction here is for a border
- tipObj.style.height = (tipObj.offsetHeight - 2) + 'px';
- }
-
- // store placement offsets from event position
- var offsetX, offsetY;
-
- // tooltip floats
- if (in_options.get('position') == 'absolute' && !(in_options.has('x') && in_options.has('y')))
- {
- // determine the offset relative to the pointer
- switch (in_options.get('direction'))
- {
- case 'northeast':
- offsetX = in_options.get('offsetX');
- offsetY = 0 - tipObj.offsetHeight - in_options.get('offsetY');
- break;
- case 'northwest':
- offsetX = 0 - tipObj.offsetWidth - in_options.get('offsetX');
- offsetY = 0 - tipObj.offsetHeight - in_options.get('offsetY');
- break;
- case 'north':
- offsetX = 0 - parseInt(tipObj.offsetWidth/2);
- offsetY = 0 - tipObj.offsetHeight - in_options.get('offsetY');
- break;
- case 'southwest':
- offsetX = 0 - tipObj.offsetWidth - in_options.get('offsetX');
- offsetY = in_options.get('offsetY');
- break;
- case 'southeast':
- offsetX = in_options.get('offsetX');
- offsetY = in_options.get('offsetY');
- break;
- case 'south':
- offsetX = 0 - parseInt(tipObj.offsetWidth/2);
- offsetY = in_options.get('offsetY');
- break;
- }
-
- // if we are in an iframe, get the offsets of the iframe in the parent document
- if (in_options.get('inframe'))
- {
- var iframeObj = domLib_getIFrameReference(window);
- if (iframeObj)
- {
- var frameOffsets = domLib_getOffsets(iframeObj);
- offsetX += frameOffsets.get('left');
- offsetY += frameOffsets.get('top');
- }
- }
- }
- // tooltip is fixed
- else
- {
- offsetX = 0;
- offsetY = 0;
- in_options.set('trail', false);
- }
-
- // set the direction-specific offsetX/Y
- in_options.set('offsetX', offsetX);
- in_options.set('offsetY', offsetY);
- if (in_options.get('clearMouse') && in_options.get('direction').indexOf('south') != -1)
- {
- in_options.set('mouseOffset', domTT_mouseHeight);
- }
- else
- {
- in_options.set('mouseOffset', 0);
- }
-
- if (domLib_canFade && typeof(Fadomatic) == 'function')
- {
- if (in_options.get('fade') != 'neither')
- {
- var fadeHandler = new Fadomatic(tipObj, 10, 0, 0, in_options.get('fadeMax'));
- in_options.set('fadeHandler', fadeHandler);
- }
- }
- else
- {
- in_options.set('fade', 'neither');
- }
-
- // setup mouse events
- if (in_options.get('trail') && typeof(tipOwner.onmousemove) != 'function')
- {
- tipOwner.onmousemove = function(in_event) { domTT_mousemove(this, in_event); };
- }
-
- if (typeof(tipOwner.onmouseout) != 'function')
- {
- tipOwner.onmouseout = function(in_event) { domTT_mouseout(this, in_event); };
- }
-
- if (in_options.get('type') == 'sticky')
- {
- if (in_options.get('position') == 'absolute' && domTT_dragEnabled && in_options.get('draggable'))
- {
- if (domLib_isIE)
- {
- captionRow.onselectstart = function() { return false; };
- }
-
- // setup drag
- captionRow.onmousedown = function(in_event) { domTT_dragStart(tipObj, in_event); };
- captionRow.onmousemove = function(in_event) { domTT_dragUpdate(in_event); };
- captionRow.onmouseup = function() { domTT_dragStop(); };
- }
- }
- else if (in_options.get('type') == 'velcro')
- {
- /* can use once we have deactivateDelay
- tipObj.onmouseover = function(in_event)
- {
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
- var tooltip = domTT_tooltips.get(tipObj.id);
- if (in_options.get('lifetime')) {
- domLib_clearTimeout(in_options.get('lifetimeTimeout');
- }
- };
- */
- tipObj.onmouseout = function(in_event)
- {
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
- if (!domLib_isDescendantOf(in_event[domLib_eventTo], tipObj, domTT_bannedTags)) {
- domTT_deactivate(tipOwner.id);
- }
- };
- // NOTE: this might interfere with links in the tip
- tipObj.onclick = function(in_event)
- {
- domTT_deactivate(tipOwner.id);
- };
- }
-
- if (in_options.get('position') == 'relative')
- {
- tipObj.style.position = 'relative';
- }
-
- in_options.set('node', tipObj);
- in_options.set('status', 'inactive');
-}
-
-// }}}
-// {{{ domTT_show()
-
-// in_id is either tip id or the owner id
-function domTT_show(in_id, in_event)
-{
-
- // should always find one since this call would be cancelled if tip was killed
- var tooltip = domTT_tooltips.get(in_id);
- var status = tooltip.get('status');
- var tipObj = tooltip.get('node');
-
- if (tooltip.get('position') == 'absolute')
- {
- var mouseX, mouseY;
-
- if (tooltip.has('x') && tooltip.has('y'))
- {
- mouseX = tooltip.get('x');
- mouseY = tooltip.get('y');
- }
- else if (!domTT_useGlobalMousePosition || domTT_mousePosition == null || status == 'active' || tooltip.get('delay') == 0)
- {
- var eventPosition = domLib_getEventPosition(in_event);
- var eventX = eventPosition.get('x');
- var eventY = eventPosition.get('y');
- if (tooltip.get('inframe'))
- {
- eventX -= eventPosition.get('scrollX');
- eventY -= eventPosition.get('scrollY');
- }
-
- // only move tip along requested trail axis when updating position
- if (status == 'active' && tooltip.get('trail') !== true)
- {
- var trail = tooltip.get('trail');
- if (trail == 'x')
- {
- mouseX = eventX;
- mouseY = tooltip.get('mouseY');
- }
- else if (trail == 'y')
- {
- mouseX = tooltip.get('mouseX');
- mouseY = eventY;
- }
- }
- else
- {
- mouseX = eventX;
- mouseY = eventY;
- }
- }
- else
- {
- mouseX = domTT_mousePosition.get('x');
- mouseY = domTT_mousePosition.get('y');
- if (tooltip.get('inframe'))
- {
- mouseX -= domTT_mousePosition.get('scrollX');
- mouseY -= domTT_mousePosition.get('scrollY');
- }
- }
-
- // we are using a grid for updates
- if (tooltip.get('grid'))
- {
- // if this is not a mousemove event or it is a mousemove event on an active tip and
- // the movement is bigger than the grid
- if (in_event.type != 'mousemove' || (status == 'active' && (Math.abs(tooltip.get('lastX') - mouseX) > tooltip.get('grid') || Math.abs(tooltip.get('lastY') - mouseY) > tooltip.get('grid'))))
- {
- tooltip.set('lastX', mouseX);
- tooltip.set('lastY', mouseY);
- }
- // did not satisfy the grid movement requirement
- else
- {
- return false;
- }
- }
-
- // mouseX and mouseY store the last acknowleged mouse position,
- // good for trailing on one axis
- tooltip.set('mouseX', mouseX);
- tooltip.set('mouseY', mouseY);
-
- var coordinates;
- if (domTT_screenEdgeDetection)
- {
- coordinates = domTT_correctEdgeBleed(
- tooltip.get('offsetWidth'),
- tooltip.get('offsetHeight'),
- mouseX,
- mouseY,
- tooltip.get('offsetX'),
- tooltip.get('offsetY'),
- tooltip.get('mouseOffset'),
- tooltip.get('inframe') ? window.parent : window
- );
- }
- else
- {
- coordinates = {
- 'x' : mouseX + tooltip.get('offsetX'),
- 'y' : mouseY + tooltip.get('offsetY') + tooltip.get('mouseOffset')
- };
- }
-
- // update the position
- tipObj.style.left = coordinates.x + 'px';
- tipObj.style.top = coordinates.y + 'px';
-
- // increase the tip zIndex so it goes over previously shown tips
- tipObj.style.zIndex = domLib_zIndex++;
- }
-
- // if tip is not active, active it now and check for a fade in
- if (status == 'pending')
- {
- // unhide the tooltip
- tooltip.set('status', 'active');
- tipObj.style.display = '';
- tipObj.style.visibility = 'visible';
-
- var fade = tooltip.get('fade');
- if (fade != 'neither')
- {
- var fadeHandler = tooltip.get('fadeHandler');
- if (fade == 'out' || fade == 'both')
- {
- fadeHandler.haltFade();
- if (fade == 'out')
- {
- fadeHandler.halt();
- }
- }
-
- if (fade == 'in' || fade == 'both')
- {
- fadeHandler.fadeIn();
- }
- }
-
- if (tooltip.get('type') == 'greasy' && tooltip.get('lifetime') != 0)
- {
- tooltip.set('lifetimeTimeout', domLib_setTimeout(domTT_runDeactivate, tooltip.get('lifetime'), [tipObj.id]));
- }
- }
-
- if (tooltip.get('position') == 'absolute' && domTT_detectCollisions)
- {
- // utilize original collision element cache
- domLib_detectCollisions(tipObj, false, true);
- }
-}
-
-// }}}
-// {{{ domTT_close()
-
-// in_handle can either be an child object of the tip, the tip id or the owner id
-function domTT_close(in_handle)
-{
- var id;
- if (typeof(in_handle) == 'object' && in_handle.nodeType)
- {
- var obj = in_handle;
- while (!obj.id || !domTT_tooltips.get(obj.id))
- {
- obj = obj.parentNode;
-
- if (obj.nodeType != document.ELEMENT_NODE) { return; }
- }
-
- id = obj.id;
- }
- else
- {
- id = in_handle;
- }
-
- domTT_deactivate(id);
-}
-
-// }}}
-// {{{ domTT_closeAll()
-
-// run through the tooltips and close them all
-function domTT_closeAll()
-{
- // NOTE: this will iterate 2x # of tooltips
- for (var id in domTT_tooltips.elementData) {
- domTT_close(id);
- }
-}
-
-// }}}
-// {{{ domTT_deactivate()
-
-// in_id is either the tip id or the owner id
-function domTT_deactivate(in_id)
-{
- var tooltip = domTT_tooltips.get(in_id);
- if (tooltip)
- {
- var status = tooltip.get('status');
- if (status == 'pending')
- {
- // cancel the creation of this tip if it is still pending
- domLib_clearTimeout(tooltip.get('activateTimeout'));
- tooltip.set('status', 'inactive');
- }
- else if (status == 'active')
- {
- if (tooltip.get('lifetime'))
- {
- domLib_clearTimeout(tooltip.get('lifetimeTimeout'));
- }
-
- var tipObj = tooltip.get('node');
- if (tooltip.get('closeAction') == 'hide')
- {
- var fade = tooltip.get('fade');
- if (fade != 'neither')
- {
- var fadeHandler = tooltip.get('fadeHandler');
- if (fade == 'out' || fade == 'both')
- {
- fadeHandler.fadeOut();
- }
- else
- {
- fadeHandler.hide();
- }
- }
- else
- {
- tipObj.style.display = 'none';
- }
- }
- else
- {
- tooltip.get('parent').removeChild(tipObj);
- domTT_tooltips.remove(tooltip.get('owner').id);
- domTT_tooltips.remove(tooltip.get('id'));
- }
-
- tooltip.set('status', 'inactive');
- if (domTT_detectCollisions) {
- // unhide all of the selects that are owned by this object
- // utilize original collision element cache
- domLib_detectCollisions(tipObj, true, true);
- }
- }
- }
-}
-
-// }}}
-// {{{ domTT_mouseout()
-
-function domTT_mouseout(in_owner, in_event)
-{
- if (!domLib_useLibrary) { return false; }
-
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
-
- var toChild = domLib_isDescendantOf(in_event[domLib_eventTo], in_owner, domTT_bannedTags);
- var tooltip = domTT_tooltips.get(in_owner.id);
- if (tooltip && (tooltip.get('type') == 'greasy' || tooltip.get('status') != 'active'))
- {
- // deactivate tip if exists and we moved away from the owner
- if (!toChild)
- {
- domTT_deactivate(in_owner.id);
- try { window.status = window.defaultStatus; } catch(e) {}
- }
- }
- else if (!toChild)
- {
- try { window.status = window.defaultStatus; } catch(e) {}
- }
-}
-
-// }}}
-// {{{ domTT_mousemove()
-
-function domTT_mousemove(in_owner, in_event)
-{
- if (!domLib_useLibrary) { return false; }
-
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
-
- var tooltip = domTT_tooltips.get(in_owner.id);
- if (tooltip && tooltip.get('trail') && tooltip.get('status') == 'active')
- {
- // see if we are trailing lazy
- if (tooltip.get('lazy'))
- {
- domLib_setTimeout(domTT_runShow, domTT_trailDelay, [in_owner.id, in_event]);
- }
- else
- {
- domTT_show(in_owner.id, in_event);
- }
- }
-}
-
-// }}}
-// {{{ domTT_addPredefined()
-
-function domTT_addPredefined(in_id)
-{
- var options = new Hash();
- for (var i = 1; i < arguments.length; i += 2)
- {
- options.set(arguments[i], arguments[i + 1]);
- }
-
- domTT_predefined.set(in_id, options);
-}
-
-// }}}
-// {{{ domTT_correctEdgeBleed()
-
-function domTT_correctEdgeBleed(in_width, in_height, in_x, in_y, in_offsetX, in_offsetY, in_mouseOffset, in_window)
-{
- var win, doc;
- var bleedRight, bleedBottom;
- var pageHeight, pageWidth, pageYOffset, pageXOffset;
-
- var x = in_x + in_offsetX;
- var y = in_y + in_offsetY + in_mouseOffset;
-
- win = (typeof(in_window) == 'undefined' ? window : in_window);
-
- // Gecko and IE swaps values of clientHeight, clientWidth properties when
- // in standards compliance mode from documentElement to document.body
- doc = ((domLib_standardsMode && (domLib_isIE || domLib_isGecko)) ? win.document.documentElement : win.document.body);
-
- // for IE in compliance mode
- if (domLib_isIE)
- {
- pageHeight = doc.clientHeight;
- pageWidth = doc.clientWidth;
- pageYOffset = doc.scrollTop;
- pageXOffset = doc.scrollLeft;
- }
- else
- {
- pageHeight = doc.clientHeight;
- pageWidth = doc.clientWidth;
-
- if (domLib_isKHTML)
- {
- pageHeight = win.innerHeight;
- }
-
- pageYOffset = win.pageYOffset;
- pageXOffset = win.pageXOffset;
- }
-
- // we are bleeding off the right, move tip over to stay on page
- // logic: take x position, add width and subtract from effective page width
- if ((bleedRight = (x - pageXOffset) + in_width - (pageWidth - domTT_screenEdgePadding)) > 0)
- {
- x -= bleedRight;
- }
-
- // we are bleeding to the left, move tip over to stay on page
- // if tip doesn't fit, we will go back to bleeding off the right
- // logic: take x position and check if less than edge padding
- if ((x - pageXOffset) < domTT_screenEdgePadding)
- {
- x = domTT_screenEdgePadding + pageXOffset;
- }
-
- // if we are bleeding off the bottom, flip to north
- // logic: take y position, add height and subtract from effective page height
- if ((bleedBottom = (y - pageYOffset) + in_height - (pageHeight - domTT_screenEdgePadding)) > 0)
- {
- y = in_y - in_height - in_offsetY;
- }
-
- // if we are bleeding off the top, flip to south
- // if tip doesn't fit, we will go back to bleeding off the bottom
- // logic: take y position and check if less than edge padding
- if ((y - pageYOffset) < domTT_screenEdgePadding)
- {
- y = in_y + domTT_mouseHeight + in_offsetY;
- }
-
- return {'x' : x, 'y' : y};
-}
-
-// }}}
-// {{{ domTT_isActive()
-
-// in_id is either the tip id or the owner id
-function domTT_isActive(in_id)
-{
- var tooltip = domTT_tooltips.get(in_id);
- if (!tooltip || tooltip.get('status') != 'active')
- {
- return false;
- }
- else
- {
- return true;
- }
-}
-
-// }}}
-// {{{ domTT_runXXX()
-
-// All of these domMenu_runXXX() methods are used by the event handling sections to
-// avoid the circular memory leaks caused by inner functions
-function domTT_runDeactivate(args) { domTT_deactivate(args[0]); }
-function domTT_runShow(args) { domTT_show(args[0], args[1]); }
-
-// }}}
-// {{{ domTT_replaceTitles()
-
-function domTT_replaceTitles(in_decorator)
-{
- var elements = domLib_getElementsByClass('tooltip');
- for (var i = 0; i < elements.length; i++)
- {
- if (elements[i].title)
- {
- var content;
- if (typeof(in_decorator) == 'function')
- {
- content = in_decorator(elements[i]);
- }
- else
- {
- content = elements[i].title;
- }
-
- content = content.replace(new RegExp('\'', 'g'), '\\\'');
- elements[i].onmouseover = new Function('in_event', "domTT_activate(this, in_event, 'content', '" + content + "')");
- elements[i].title = '';
- }
- }
-}
-
-// }}}
-// {{{ domTT_update()
-
-// Allow authors to update the contents of existing tips using the DOM
-// Unfortunately, the tip must already exist, or else no work is done.
-// TODO: make getting at content or caption cleaner
-function domTT_update(handle, content, type)
-{
- // type defaults to 'content', can also be 'caption'
- if (typeof(type) == 'undefined')
- {
- type = 'content';
- }
-
- var tip = domTT_tooltips.get(handle);
- if (!tip)
- {
- return;
- }
-
- var tipObj = tip.get('node');
- var updateNode;
- if (type == 'content')
- {
- // <div class="contents">...
- updateNode = tipObj.firstChild;
- if (updateNode.className != 'contents')
- {
- // <table><tbody><tr>...</tr><tr><td><div class="contents">...
- updateNode = updateNode.firstChild.firstChild.nextSibling.firstChild.firstChild;
- }
- }
- else
- {
- updateNode = tipObj.firstChild;
- if (updateNode.className == 'contents')
- {
- // missing caption
- return;
- }
-
- // <table><tbody><tr><td><div class="caption">...
- updateNode = updateNode.firstChild.firstChild.firstChild.firstChild;
- }
-
- // TODO: allow for a DOM node as content
- updateNode.innerHTML = content;
-}
-
-// }}}
Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT_drag.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT_drag.js 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/domTT_drag.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -1,102 +0,0 @@
-/** $Id: domTT_drag.js 2315 2006-06-12 05:45:36Z dallen $ */
-// {{{ license
-
-/*
- * Copyright 2002-2005 Dan Allen, Mojavelinux.com (dan.allen(a)mojavelinux.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// }}}
-// {{{ globals (DO NOT EDIT)
-
-var domTT_dragEnabled = true;
-var domTT_currentDragTarget;
-var domTT_dragMouseDown;
-var domTT_dragOffsetLeft;
-var domTT_dragOffsetTop;
-
-// }}}
-// {{{ domTT_dragStart()
-
-function domTT_dragStart(in_this, in_event)
-{
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
-
- var eventButton = in_event[domLib_eventButton];
- if (eventButton != 1 && !domLib_isKHTML)
- {
- return;
- }
-
- domTT_currentDragTarget = in_this;
- in_this.style.cursor = 'move';
-
- // upgrade our z-index
- in_this.style.zIndex = ++domLib_zIndex;
-
- var eventPosition = domLib_getEventPosition(in_event);
-
- var targetPosition = domLib_getOffsets(in_this);
- domTT_dragOffsetLeft = eventPosition.get('x') - targetPosition.get('left');
- domTT_dragOffsetTop = eventPosition.get('y') - targetPosition.get('top');
- domTT_dragMouseDown = true;
-}
-
-// }}}
-// {{{ domTT_dragUpdate()
-
-function domTT_dragUpdate(in_event)
-{
- if (domTT_dragMouseDown)
- {
- if (domLib_isGecko)
- {
- window.getSelection().removeAllRanges()
- }
-
- if (domTT_useGlobalMousePosition && domTT_mousePosition != null)
- {
- var eventPosition = domTT_mousePosition;
- }
- else
- {
- if (typeof(in_event) == 'undefined') { in_event = window.event; }
- var eventPosition = domLib_getEventPosition(in_event);
- }
-
- domTT_currentDragTarget.style.left = (eventPosition.get('x') - domTT_dragOffsetLeft) + 'px';
- domTT_currentDragTarget.style.top = (eventPosition.get('y') - domTT_dragOffsetTop) + 'px';
-
- // update the collision detection
- domLib_detectCollisions(domTT_currentDragTarget);
- }
-}
-
-// }}}
-// {{{ domTT_dragStop()
-
-function domTT_dragStop()
-{
- if (domTT_dragMouseDown) {
- domTT_dragMouseDown = false;
- domTT_currentDragTarget.style.cursor = 'default';
- domTT_currentDragTarget = null;
- if (domLib_isGecko)
- {
- window.getSelection().removeAllRanges()
- }
- }
-}
-
-// }}}
Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/fadomatic.js
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/fadomatic.js 2008-09-12 17:31:05 UTC (rev 11900)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/js/fadomatic.js 2008-09-15 20:02:35 UTC (rev 11901)
@@ -1,180 +0,0 @@
-/** $Id$ */
-// Title: Fadomatic
-// Version: 1.2
-// Homepage: http://chimpen.com/fadomatic
-// Author: Philip McCarthy <fadomatic(a)chimpen.com>
-
-// Fade interval in milliseconds
-// Make this larger if you experience performance issues
-Fadomatic.INTERVAL_MILLIS = 50;
-
-// Creates a fader
-// element - The element to fade
-// speed - The speed to fade at, from 0.0 to 100.0
-// initialOpacity (optional, default 100) - element's starting opacity, 0 to 100
-// minOpacity (optional, default 0) - element's minimum opacity, 0 to 100
-// maxOpacity (optional, default 0) - element's minimum opacity, 0 to 100
-function Fadomatic (element, rate, initialOpacity, minOpacity, maxOpacity) {
- this._element = element;
- this._intervalId = null;
- this._rate = rate;
- this._isFadeOut = true;
-
- // Set initial opacity and bounds
- // NB use 99 instead of 100 to avoid flicker at start of fade
- this._minOpacity = 0;
- this._maxOpacity = 99;
- this._opacity = 99;
-
- if (typeof minOpacity != 'undefined') {
- if (minOpacity < 0) {
- this._minOpacity = 0;
- } else if (minOpacity > 99) {
- this._minOpacity = 99;
- } else {
- this._minOpacity = minOpacity;
- }
- }
-
- if (typeof maxOpacity != 'undefined') {
- if (maxOpacity < 0) {
- this._maxOpacity = 0;
- } else if (maxOpacity > 99) {
- this._maxOpacity = 99;
- } else {
- this._maxOpacity = maxOpacity;
- }
-
- if (this._maxOpacity < this._minOpacity) {
- this._maxOpacity = this._minOpacity;
- }
- }
-
- if (typeof initialOpacity != 'undefined') {
- if (initialOpacity > this._maxOpacity) {
- this._opacity = this._maxOpacity;
- } else if (initialOpacity < this._minOpacity) {
- this._opacity = this._minOpacity;
- } else {
- this._opacity = initialOpacity;
- }
- }
-
- // See if we're using W3C opacity, MSIE filter, or just
- // toggling visiblity
- if(typeof element.style.opacity != 'undefined') {
-
- this._updateOpacity = this._updateOpacityW3c;
-
- } else if(typeof element.style.filter != 'undefined') {
-
- // If there's not an alpha filter on the element already,
- // add one
- if (element.style.filter.indexOf("alpha") == -1) {
-
- // Attempt to preserve existing filters
- var existingFilters="";
- if (element.style.filter) {
- existingFilters = element.style.filter+" ";
- }
- element.style.filter = existingFilters+"alpha(opacity="+this._opacity+")";
- }
-
- this._updateOpacity = this._updateOpacityMSIE;
-
- } else {
-
- this._updateOpacity = this._updateVisibility;
- }
-
- this._updateOpacity();
-}
-
-// Initiates a fade out
-Fadomatic.prototype.fadeOut = function () {
- this._isFadeOut = true;
- this._beginFade();
-}
-
-// Initiates a fade in
-Fadomatic.prototype.fadeIn = function () {
- this._isFadeOut = false;
- this._beginFade();
-}
-
-// Makes the element completely opaque, stops any fade in progress
-Fadomatic.prototype.show = function () {
- this.haltFade();
- this._opacity = this._maxOpacity;
- this._updateOpacity();
-}
-
-// Makes the element completely transparent, stops any fade in progress
-Fadomatic.prototype.hide = function () {
- this.haltFade();
- this._opacity = 0;
- this._updateOpacity();
-}
-
-// Halts any fade in progress
-Fadomatic.prototype.haltFade = function () {
-
- clearInterval(this._intervalId);
-}
-
-// Resumes a fade where it was halted
-Fadomatic.prototype.resumeFade = function () {
-
- this._beginFade();
-}
-
-// Pseudo-private members
-
-Fadomatic.prototype._beginFade = function () {
-
- this.haltFade();
- var objref = this;
- this._intervalId = setInterval(function() { objref._tickFade(); },Fadomatic.INTERVAL_MILLIS);
-}
-
-Fadomatic.prototype._tickFade = function () {
-
- if (this._isFadeOut) {
- this._opacity -= this._rate;
- if (this._opacity < this._minOpacity) {
- this._opacity = this._minOpacity;
- this.haltFade();
- }
- } else {
- this._opacity += this._rate;
- if (this._opacity > this._maxOpacity ) {
- this._opacity = this._maxOpacity;
- this.haltFade();
- }
- }
-
- this._updateOpacity();
-}
-
-Fadomatic.prototype._updateVisibility = function () {
-
- if (this._opacity > 0) {
- this._element.style.visibility = 'visible';
- } else {
- this._element.style.visibility = 'hidden';
- }
-}
-
-Fadomatic.prototype._updateOpacityW3c = function () {
-
- this._element.style.opacity = this._opacity/100;
- this._updateVisibility();
-}
-
-Fadomatic.prototype._updateOpacityMSIE = function () {
-
- this._element.filters.alpha.opacity = this._opacity;
- this._updateVisibility();
-}
-
-Fadomatic.prototype._updateOpacity = null;
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11900 - in modules/web/trunk: web and 2 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2008-09-12 13:31:05 -0400 (Fri, 12 Sep 2008)
New Revision: 11900
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/web/pom.xml
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java
modules/web/trunk/web/src/test/build.xml
Log:
Update to use Cargo alpha 6.
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-09-12 17:25:06 UTC (rev 11899)
+++ modules/web/trunk/build/pom.xml 2008-09-12 17:31:05 UTC (rev 11900)
@@ -39,7 +39,7 @@
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
- <version.cargo>1.0-alpha-5</version.cargo>
+ <version.cargo>1.0-alpha-6</version.cargo>
<version.junit>3.8.1</version.junit>
<version.ant>1.7.0</version.ant>
</properties>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2008-09-12 17:25:06 UTC (rev 11899)
+++ modules/web/trunk/web/pom.xml 2008-09-12 17:31:05 UTC (rev 11900)
@@ -150,6 +150,17 @@
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>${version.cargo}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java
===================================================================
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java 2008-09-12 17:25:06 UTC (rev 11899)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6Handler.java 2008-09-12 17:31:05 UTC (rev 11900)
@@ -3,15 +3,11 @@
//import java.io.IOException;
//
//import javax.servlet.ServletException;
-//import javax.servlet.http.HttpServlet;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//
-//import org.jboss.portal.web.impl.DefaultServletContainerFactory;
-//import org.jboss.portal.web.impl.tomcat.TC6ServletContainerContext;
//import org.mortbay.jetty.Server;
//import org.mortbay.jetty.handler.AbstractHandler;
-//import org.mortbay.jetty.handler.DefaultHandler;
//
//public class Jetty6Handler extends AbstractHandler
//{
Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java
===================================================================
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java 2008-09-12 17:25:06 UTC (rev 11899)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/jetty/Jetty6ServletContainerContext.java 2008-09-12 17:31:05 UTC (rev 11900)
@@ -5,8 +5,6 @@
//import java.util.Set;
//
//import javax.servlet.ServletContext;
-//import javax.servlet.ServletContextEvent;
-//import javax.servlet.ServletContextListener;
//import javax.servlet.ServletException;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
@@ -14,19 +12,17 @@
//import org.jboss.portal.web.RequestDispatchCallback;
//import org.jboss.portal.web.command.CommandDispatcher;
//import org.jboss.portal.web.impl.DefaultServletContainerFactory;
-//import org.jboss.portal.web.impl.tomcat.TC6WebAppContext;
//import org.jboss.portal.web.spi.ServletContainerContext;
-//import org.mortbay.component.AbstractLifeCycleListener;
//import org.mortbay.component.Container;
-//import org.mortbay.component.LifeCycleEvent;
-//import org.mortbay.component.LifeCycleListener;
+//import org.mortbay.component.LifeCycle;
+//import org.mortbay.component.LifeCycle.Listener;
//import org.mortbay.component.Container.Relationship;
//import org.mortbay.jetty.Handler;
//import org.mortbay.jetty.Server;
//import org.mortbay.jetty.handler.ContextHandlerCollection;
//import org.mortbay.jetty.webapp.WebAppContext;
//
-//public class Jetty6ServletContainerContext implements ServletContainerContext, org.mortbay.component.Container.Listener, LifeCycleListener
+//public class Jetty6ServletContainerContext implements ServletContainerContext, org.mortbay.component.Container.Listener, LifeCycle.Listener
//{
//
// private Registration registration;
@@ -230,29 +226,29 @@
// }
// }
//
-// public void failedEvent(LifeCycleEvent lce)
+// public void lifeCycleFailure(LifeCycle lifeCycle, Throwable t)
// {
-// //ignore event for now
+// //ignore event
// }
//
-// public void startingEvent(LifeCycleEvent lce)
+// public void lifeCycleStarted(LifeCycle lifeCycle)
// {
-// //ignore event for now
+// startWebAppContext((WebAppContext)lifeCycle);
// }
//
-// public void startedEvent(LifeCycleEvent lce)
+// public void lifeCycleStarting(LifeCycle lifeCycle)
// {
-// startWebAppContext((WebAppContext)lce.getLifeCycleComponent());
+// //ignore event
// }
//
-// public void stoppedEvent(LifeCycleEvent lce)
+// public void lifeCycleStopped(LifeCycle lifeCycle)
// {
-// stopWebAppContext((WebAppContext)lce.getLifeCycleComponent());
+// stopWebAppContext((WebAppContext)lifeCycle);
// }
//
-// public void stoppingEvent(LifeCycleEvent lce)
+// public void lifeCycleStopping(LifeCycle lifeCycle)
// {
-// //ignore event for now
+// //Ignore event
// }
//
//}
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-09-12 17:25:06 UTC (rev 11899)
+++ modules/web/trunk/web/src/test/build.xml 2008-09-12 17:31:05 UTC (rev 11900)
@@ -612,7 +612,7 @@
<cargo
containerId="jboss42x"
home="${test.jboss-4.2.home}"
- log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ log="${cargo.log.dir}/cargo.${test.id}.startup.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
wait="${cargo.wait}">
@@ -623,7 +623,6 @@
</sharedClasspath>
<configuration>
<property name="cargo.rmi.port" value="1299"/>
- <property name="cargo.jboss.server.xml" value="/tmp/server.xml"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<deployable type="war" file="${cargo.war}"/>
@@ -636,7 +635,7 @@
<cargo
containerId="jboss42x"
home="${test.jboss-4.2.home}"
- log="${cargo.log.dir}/cargo.${test.id}.startup.log"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
<configuration>
<property name="cargo.rmi.port" value="1299"/>
@@ -743,10 +742,10 @@
<cargo
containerId="jboss5x"
home="${test.jboss-5.0.home}"
- log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ log="${cargo.log.dir}/cargo.${test.id}.startup.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
- wait="${cargo.wait}">
+ wait="false">
<sharedClasspath>
<path refid="jboss-5.0-shared"/>
@@ -766,10 +765,12 @@
<cargo
containerId="jboss5x"
home="${test.jboss-5.0.home}"
- log="${cargo.log.dir}/cargo.${test.id}.startup.log"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
<configuration>
- <property name="cargo.rmi.port" value="1299"/>
+ <!-- NOTE: this is wrong, the value should be 1299 but there is a bug in alpha 6 for Cargo -->
+ <property name="cargo.rmi.port" value="1099"/>
+ <!-- <property name="cargo.rmi.port" value="1299"/> -->
</configuration>
</cargo>
</target>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11899 - branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-12 13:25:06 -0400 (Fri, 12 Sep 2008)
New Revision: 11899
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java
Log:
JBPORTAL-2109 - CMS Security Issue with LDAP/Clustered mode (solving issue with JNDI lookups on slave nodes)
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java 2008-09-12 16:43:15 UTC (rev 11898)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java 2008-09-12 17:25:06 UTC (rev 11899)
@@ -27,6 +27,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import javax.naming.InitialContext;
import org.jboss.mx.util.MBeanProxy;
import org.jboss.mx.util.MBeanServerLocator;
@@ -107,14 +108,25 @@
/** @return */
public static CMS getCMSService()
{
+ CMS cms = null;
try
{
MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
- return (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
+ cms = (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
}
catch (Exception e)
- {
- throw new RuntimeException(e);
+ {
+ try
+ {
+ //Give it a last try and look up in the JNDI tree (this happens in the test suite, where there is no mbean server)
+ cms = (CMS)new InitialContext().lookup("java:/portal/CMS");
+ }
+ catch(Exception ex)
+ {
+ //This failed too....This is a real failure and throw an exception
+ throw new RuntimeException(ex);
+ }
}
+ return cms;
}
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11898 - branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-12 12:43:15 -0400 (Fri, 12 Sep 2008)
New Revision: 11898
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java
Log:
JBPORTAL-2109 - CMS Security Issue with LDAP/Clustered mode (solving issue with JNDI lookups on slave nodes)
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java 2008-09-12 16:23:49 UTC (rev 11897)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/CMSWorkflowUtil.java 2008-09-12 16:43:15 UTC (rev 11898)
@@ -25,8 +25,11 @@
import java.util.List;
import java.util.Locale;
-import javax.naming.InitialContext;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.portal.cms.CMS;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.model.Content;
@@ -101,15 +104,13 @@
return content;
}
- /**
- *
- * @return
- */
- private static CMS getCMSService()
+ /** @return */
+ public static CMS getCMSService()
{
try
{
- return (CMS)new InitialContext().lookup("java:/portal/CMS");
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ return (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
}
catch (Exception e)
{
Modified: branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java
===================================================================
--- branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2008-09-12 16:23:49 UTC (rev 11897)
+++ branches/JBoss_Portal_2_6_6_JBPORTAL-2109/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2008-09-12 16:43:15 UTC (rev 11898)
@@ -31,7 +31,6 @@
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.exe.ExecutionContext;
-import javax.naming.InitialContext;
import java.util.List;
import java.util.Locale;
import java.util.ArrayList;
@@ -181,7 +180,7 @@
{
try
{
- return (CMS)new InitialContext().lookup("java:/portal/CMS");
+ return CMSWorkflowUtil.getCMSService();
}
catch (Exception e)
{
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11897 - in branches/JBoss_Portal_Branch_2_6: core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-12 12:23:49 -0400 (Fri, 12 Sep 2008)
New Revision: 11897
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
Log:
- JBPORTAL-2103:
+ Added id on tabs
+ Converted table to h:dataTable to display consumers list
- ConsumerRegister.getConsumers now returns a List
- Some generification
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-09-12 16:23:29 UTC (rev 11896)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-09-12 16:23:49 UTC (rev 11897)
@@ -31,8 +31,7 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
import java.util.Map;
/**
@@ -83,16 +82,16 @@
return registry.getConsumer(selectedId);
}
- public Collection getConsumers()
+ public List<WSRPConsumer> getConsumers()
{
- return new ArrayList(registry.getConfiguredConsumers());
+ return registry.getConfiguredConsumers();
}
public String activateConsumer()
{
if (refreshConsumerId() != null)
{
- boolean activate = Boolean.valueOf(beanContext.getParameter("activate")).booleanValue();
+ boolean activate = Boolean.valueOf(beanContext.getParameter("activate"));
try
{
if (activate)
@@ -134,7 +133,7 @@
{
if (refreshConsumerId() != null)
{
- boolean register = Boolean.valueOf(beanContext.getParameter("register")).booleanValue();
+ boolean register = Boolean.valueOf(beanContext.getParameter("register"));
try
{
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-09-12 16:23:49 UTC (rev 11897)
@@ -8,7 +8,7 @@
<h:form>
<ul class="topnav">
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
+ <li><h:commandLink id="producerTab" value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
<ui:remove>
<li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-09-12 16:23:49 UTC (rev 11897)
@@ -9,75 +9,69 @@
<ui:define name="content">
<!-- Consumer creation -->
- <h:form styleClass="createObjectForm">
+ <h:form id="createConsumer" styleClass="createObjectForm">
<span class="portlet-font">#{i18n.consumers_create_title}</span>
<h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
required="true"/>
- <h:commandButton action="#{consumersMgr.createConsumer}" value="#{i18n.consumers_create_submit}"
- styleClass="portlet-form-button"/>
+ <h:commandButton id="createConsumerButton" action="#{consumersMgr.createConsumer}"
+ value="#{i18n.consumers_create_submit}" styleClass="portlet-form-button"/>
<h:message for="consumerName" errorClass="portlet-msg-error"/>
</h:form>
- <!-- Separation -->
- <hr/>
-
- <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
- <thead class="portlet-section-header">
- <tr>
- <th>#{i18n.consumers_table_column_consumer}
+ <!-- Consumers list -->
+ <h:form>
+ <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" rendered="#{!empty consumersMgr.consumers}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"
+ styleClass="datatable objectList" width="100%">
+ <h:column>
+ <f:facet name="header">
+ #{i18n.consumers_table_column_consumer}
<div style="font-size: 90%; display:inline; font-weight: normal;">
- [#{i18n.consumers_table_column_consumer_status} <span
- class="active">#{i18n.path_consumers_active}</span>,
+ [#{i18n.consumers_table_column_consumer_status} <span class="active">#{i18n.path_consumers_active}</span>,
<span class="inactive">#{i18n.path_consumers_inactive}</span>,
<span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>]
</div>
- </th>
- <th>#{i18n.consumers_table_column_actions}</th>
- </tr>
- </thead>
- <tbody>
- <h:form>
- <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status">
- <tr>
- <td
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- <h:outputText value="#{consumer.producerId} (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
- #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
- </td>
- <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
- <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_configure}"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"
- styleClass="actionRefresh">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_refresh}"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"
- styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="activate" value="#{!consumer.active}"/>
- <h:outputText
- value="#{consumer.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}"/>
- </h:commandLink>
- <c:if
- test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
- | <h:commandLink action="#{consumersMgr.registerConsumer}"
- styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="register" value="#{!consumer.producerInfo.registered}"/>
- <h:outputText
- value="#{consumer.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}"/>
- </h:commandLink>
- </c:if> | <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete"
- actionListener="#{consumersMgr.selectConsumer}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_delete}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </h:form>
- </tbody>
- </table>
+ </f:facet>
+
+ <h:outputText style="display:block; width:100%;"
+ styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}"
+ value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{cons.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet>
+
+ <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure" id="configure">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_configure}
+ </h:commandLink> |
+ <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_refresh}
+ </h:commandLink> |
+ <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate"
+ styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ <f:param name="activate" value="#{!cons.active}"/>
+ #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}
+ </h:commandLink>
+ <h:panelGroup rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}">
+ |
+ <h:commandLink action="#{consumersMgr.registerConsumer}" id="register"
+ styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ <f:param name="register" value="#{!cons.producerInfo.registered}"/>
+ #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}
+ </h:commandLink>
+ </h:panelGroup> |
+ <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete"
+ actionListener="#{consumersMgr.selectConsumer}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_delete}
+ </h:commandLink>
+ </h:column>
+ </h:dataTable>
+ </h:form>
</ui:define>
-</ui:decorate>
+</ui:decorate>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producerTemplate.xhtml 2008-09-12 16:23:49 UTC (rev 11897)
@@ -7,7 +7,7 @@
<ui:define name="topnav">
<h:form>
<ul class="topnav">
- <li><h:commandLink action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
+ <li><h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
<li id="currentTab">#{i18n.nav_tabs_producer_config}</li>
<ui:remove>
<li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2008-09-12 16:23:29 UTC (rev 11896)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2008-09-12 16:23:49 UTC (rev 11897)
@@ -31,8 +31,9 @@
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
-import java.util.Collection;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -64,9 +65,9 @@
consumers.put(CONSUMER2, consumer);
}
- public Collection getConfiguredConsumers()
+ public List<WSRPConsumer> getConfiguredConsumers()
{
- return consumers.values();
+ return new ArrayList<WSRPConsumer>(consumers.values());
}
public WSRPConsumer getConsumer(String id)
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2008-09-12 16:23:29 UTC (rev 11896)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2008-09-12 16:23:49 UTC (rev 11897)
@@ -25,7 +25,7 @@
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
-import java.util.Collection;
+import java.util.List;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -34,7 +34,7 @@
*/
public interface ConsumerRegistry
{
- Collection getConfiguredConsumers();
+ List<WSRPConsumer> getConfiguredConsumers();
WSRPConsumer getConsumer(String id);
@@ -60,4 +60,4 @@
void registerOrDeregisterConsumerWith(String id, boolean register) throws ConsumerException;
void destroyConsumer(String id) throws ConsumerException;
-}
\ No newline at end of file
+}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-09-12 16:23:29 UTC (rev 11896)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-09-12 16:23:49 UTC (rev 11897)
@@ -36,9 +36,9 @@
import org.jboss.portal.wsrp.WSRPConsumer;
import javax.naming.InitialContext;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -325,9 +325,9 @@
consumers = null;
}
- public Collection getConfiguredConsumers()
+ public List<WSRPConsumer> getConfiguredConsumers()
{
- return Collections.unmodifiableCollection(consumers.values());
+ return new ArrayList<WSRPConsumer>(consumers.values());
}
public WSRPConsumer getConsumer(String id)
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r11896 - in branches/JBoss_Portal_Branch_2_7: core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-12 12:23:29 -0400 (Fri, 12 Sep 2008)
New Revision: 11896
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
Log:
- JBPORTAL-2103:
+ Added id on tabs
+ Converted table to h:dataTable to display consumers list
- ConsumerRegister.getConsumers now returns a List
- Some generification
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -31,8 +31,7 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
import java.util.Map;
/**
@@ -83,16 +82,16 @@
return registry.getConsumer(selectedId);
}
- public Collection getConsumers()
+ public List<WSRPConsumer> getConsumers()
{
- return new ArrayList(registry.getConfiguredConsumers());
+ return registry.getConfiguredConsumers();
}
public String activateConsumer()
{
if (refreshConsumerId() != null)
{
- boolean activate = Boolean.valueOf(beanContext.getParameter("activate")).booleanValue();
+ boolean activate = Boolean.valueOf(beanContext.getParameter("activate"));
try
{
if (activate)
@@ -134,7 +133,7 @@
{
if (refreshConsumerId() != null)
{
- boolean register = Boolean.valueOf(beanContext.getParameter("register")).booleanValue();
+ boolean register = Boolean.valueOf(beanContext.getParameter("register"));
try
{
@@ -309,7 +308,7 @@
private void setExpectedRegistrationInfo(RegistrationInfo expected)
{
- Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+ Map<String, Object> sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
sessionMap.put(EXPECTED_REG_INFO_KEY, expected);
}
@@ -335,7 +334,7 @@
private void setConsumerIdInSession(boolean remove)
{
// todo: JSF COMMON extract this behavior into common class
- Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+ Map<String, Object> sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
String consumerBeanName = "consumer"; // must match ConsumerBean name in faces-config.xml
// force recreation of ConsumerBean otherwise switching to the consumer view might not show the proper consumer
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
@@ -8,7 +8,7 @@
<h:form>
<ul class="topnav">
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
+ <li><h:commandLink id="producerTab" value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
<ui:remove>
<li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
@@ -9,71 +9,69 @@
<ui:define name="content">
<!-- Consumer creation -->
- <h:form styleClass="createObjectForm">
+ <h:form id="createConsumer" styleClass="createObjectForm">
<span class="portlet-font">#{i18n.consumers_create_title}</span>
<h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field"
required="true"/>
- <h:commandButton action="#{consumersMgr.createConsumer}" value="#{i18n.consumers_create_submit}"
- styleClass="portlet-form-button"/>
+ <h:commandButton id="createConsumerButton" action="#{consumersMgr.createConsumer}"
+ value="#{i18n.consumers_create_submit}" styleClass="portlet-form-button"/>
<h:message for="consumerName" errorClass="portlet-msg-error"/>
</h:form>
- <!-- Separation -->
- <hr/>
-
- <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
- <thead class="portlet-section-header">
- <tr>
- <th>#{i18n.consumers_table_column_consumer}
+ <!-- Consumers list -->
+ <h:form>
+ <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" rendered="#{!empty consumersMgr.consumers}"
+ rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"
+ styleClass="datatable objectList" width="100%">
+ <h:column>
+ <f:facet name="header">
+ #{i18n.consumers_table_column_consumer}
<div style="font-size: 90%; display:inline; font-weight: normal;">
[#{i18n.consumers_table_column_consumer_status} <span class="active">#{i18n.path_consumers_active}</span>,
<span class="inactive">#{i18n.path_consumers_inactive}</span>,
<span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>]
</div>
- </th>
- <th>#{i18n.consumers_table_column_actions}</th>
- </tr>
- </thead>
- <tbody>
- <h:form>
- <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status">
- <tr>
- <td
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- <h:outputText value="#{consumer.producerId} (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
- #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
- </td>
- <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
- <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_configure}"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"
- styleClass="actionRefresh">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_refresh}"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"
- styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="activate" value="#{!consumer.active}"/>
- <h:outputText value="#{consumer.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}"/>
- </h:commandLink>
- <c:if
- test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
- | <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="register" value="#{!consumer.producerInfo.registered}"/>
- <h:outputText value="#{consumer.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}"/>
- </h:commandLink>
- </c:if> | <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete"
- actionListener="#{consumersMgr.selectConsumer}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_delete}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </h:form>
- </tbody>
- </table>
+ </f:facet>
+
+ <h:outputText style="display:block; width:100%;"
+ styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}"
+ value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{cons.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet>
+
+ <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure" id="configure">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_configure}
+ </h:commandLink> |
+ <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_refresh}
+ </h:commandLink> |
+ <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate"
+ styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ <f:param name="activate" value="#{!cons.active}"/>
+ #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}
+ </h:commandLink>
+ <h:panelGroup rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}">
+ |
+ <h:commandLink action="#{consumersMgr.registerConsumer}" id="register"
+ styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ <f:param name="register" value="#{!cons.producerInfo.registered}"/>
+ #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}
+ </h:commandLink>
+ </h:panelGroup> |
+ <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete"
+ actionListener="#{consumersMgr.selectConsumer}">
+ <f:param name="id" value="#{cons.producerId}"/>
+ #{i18n.consumers_table_action_delete}
+ </h:commandLink>
+ </h:column>
+ </h:dataTable>
+ </h:form>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
@@ -7,7 +7,7 @@
<ui:define name="topnav">
<h:form>
<ul class="topnav">
- <li><h:commandLink action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
+ <li><h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
<li id="currentTab">#{i18n.nav_tabs_producer_config}</li>
<ui:remove>
<li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -31,8 +31,9 @@
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
-import java.util.Collection;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -64,9 +65,9 @@
consumers.put(CONSUMER2, consumer);
}
- public Collection getConfiguredConsumers()
+ public List<WSRPConsumer> getConfiguredConsumers()
{
- return consumers.values();
+ return new ArrayList<WSRPConsumer>(consumers.values());
}
public WSRPConsumer getConsumer(String id)
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -25,7 +25,7 @@
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
-import java.util.Collection;
+import java.util.List;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -34,7 +34,7 @@
*/
public interface ConsumerRegistry
{
- Collection getConfiguredConsumers();
+ List<WSRPConsumer> getConfiguredConsumers();
WSRPConsumer getConsumer(String id);
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -36,9 +36,9 @@
import org.jboss.portal.wsrp.WSRPConsumer;
import javax.naming.InitialContext;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -325,9 +325,9 @@
consumers = null;
}
- public Collection getConfiguredConsumers()
+ public List<WSRPConsumer> getConfiguredConsumers()
{
- return Collections.unmodifiableCollection(consumers.values());
+ return new ArrayList<WSRPConsumer>(consumers.values());
}
public WSRPConsumer getConsumer(String id)
17 years, 7 months
- 1
- 0