From do-not-reply at jboss.org Tue Aug 24 12:49:44 2010
Content-Type: multipart/mixed; boundary="===============2125852898117320949=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r3916 - in
 exo/portal/branches/3.1.x/web: portal/src/main/webapp/groovy/webui/form and 1
 other directory.
Date: Tue, 24 Aug 2010 12:49:44 -0400
Message-ID: <201008241649.o7OGnilo004751@svn01.web.mwc.hst.phx2.redhat.com>

--===============2125852898117320949==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: hoang_to
Date: 2010-08-24 12:49:43 -0400 (Tue, 24 Aug 2010)
New Revision: 3916

Modified:
   exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/eX=
o/portal/UIPortalControl.js
   exo/portal/branches/3.1.x/web/portal/src/main/webapp/groovy/webui/form/U=
ISearchForm.gtmpl
Log:
EXOGTN-26: Search form in User/Group management does not support 'Enter' as=
 key assist

Modified: exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javasc=
ript/eXo/portal/UIPortalControl.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/e=
Xo/portal/UIPortalControl.js	2010-08-24 16:45:50 UTC (rev 3915)
+++ exo/portal/branches/3.1.x/web/eXoResources/src/main/webapp/javascript/e=
Xo/portal/UIPortalControl.js	2010-08-24 16:49:43 UTC (rev 3916)
@@ -58,21 +58,31 @@
   }  =

 };
 =

-UIPortalControl.prototype.onEnterPress =3D function(e) {
-	var e =3D window.event || e;
-	var uiPortalLoginFormAction =3D document.getElementById("UIPortalLoginFor=
mAction");
-	if(uiPortalLoginFormAction) {
-		var code;
-		if(!e) e =3D window.event;
-		if(e.keyCode) code =3D e.keyCode;
-		else if (e.which) code =3D e.which;
-		if(code =3D=3D13) {
-			if(this.t !=3D 13) {
-		    uiPortalLoginFormAction.onclick() ;
-			}
-		  this.t =3D code;
-		}
-	}
+/**
+ * Process enter key press
+ * @param {Event} e this event
+ * @param {String} executeScript javascript command to execute if enter ke=
y was pressed
+ */
+UIPortalControl.prototype.onEnterPress =3D function(e, executeScript) {
+ var e =3D window.event || e;
+ var code;
+ if(!e) e =3D window.event;
+ if(e.keyCode) code =3D e.keyCode;
+ else if (e.which) code =3D e.which;
+ if(code =3D=3D13) {
+   if(this.t !=3D 13) {
+     var uiPortalLoginFormAction =3D document.getElementById("UIPortalLogi=
nFormAction");
+     if(uiPortalLoginFormAction) {
+       uiPortalLoginFormAction.onclick() ;
+     }
+     else
+     {
+       if(executeScript)
+         eval(executeScript);
+     }
+   }
+   this.t =3D code;
+ }
 };
 =

 /*********** Scroll Manager *************/

Modified: exo/portal/branches/3.1.x/web/portal/src/main/webapp/groovy/webui=
/form/UISearchForm.gtmpl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- exo/portal/branches/3.1.x/web/portal/src/main/webapp/groovy/webui/form/=
UISearchForm.gtmpl	2010-08-24 16:45:50 UTC (rev 3915)
+++ exo/portal/branches/3.1.x/web/portal/src/main/webapp/groovy/webui/form/=
UISearchForm.gtmpl	2010-08-24 16:49:43 UTC (rev 3916)
@@ -6,19 +6,21 @@
 					<div class=3D"MiddleBar">
 						<div class=3D"UISearchForm">
 							<%uiform.begin()%>
-							<div class=3D"QuickSet">
+							 <%String quickSearchlink =3D uicomponent.event("QuickSearch") ;%>
+							    <script type=3D"text/javascript">
+									var executeScript =3D "<%=3DquickSearchlink%>";
+								</script>
+						      <div class=3D"QuickSet" onkeypress=3D"eXo.portal.UIPortalContr=
ol.onEnterPress(event, executeScript)">
 								<div class=3D"SearchTitle"><%=3D_ctx.appRes("UISearch.label.Search=
")%>:</div>
 								<% =

 									QuickSearchInputSet =3D uiform.getQuickSearchInputSet();
 									for(field in QuickSearchInputSet.getChildren()) {
 										uiform.renderField(field) =

 									}	 =

-									String quickSearchlink =3D uicomponent.event("QuickSearch"); =

 								%>
 								<a class=3D"SimpleSearchIcon" href=3D"$quickSearchlink" title=3D"<=
%=3D _ctx.appRes("UISearch.label.QuickSearch") %>">
 									<span></span>
 								</a>
-								 =

 							</div>	=

 							<%uiform.end()%>	 =

 						</div>


--===============2125852898117320949==--