From richfaces-svn-commits at lists.jboss.org Wed Jun 18 18:50:43 2008
Content-Type: multipart/mixed; boundary="===============4979930797828377464=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r9105 -
 trunk/sandbox/ui/hotKey/src/main/templates/org/richfaces.
Date: Wed, 18 Jun 2008 18:50:42 -0400
Message-ID: <E1K96UE-0004zy-UW@committer01.frg.pub.inap.atl.jboss.com>

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

Author: nbelaevski
Date: 2008-06-18 18:50:42 -0400 (Wed, 18 Jun 2008)
New Revision: 9105

Modified:
   trunk/sandbox/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jspx
Log:
JavaScript escapement for hotKey implemented

Modified: trunk/sandbox/ui/hotKey/src/main/templates/org/richfaces/htmlHotK=
ey.jspx
=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
--- trunk/sandbox/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jsp=
x	2008-06-18 22:46:49 UTC (rev 9104)
+++ trunk/sandbox/ui/hotKey/src/main/templates/org/richfaces/htmlHotKey.jsp=
x	2008-06-18 22:50:42 UTC (rev 9105)
@@ -1,4 +1,5 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
 <f:root =

 	xmlns:f=3D"http://ajax4jsf.org/cdk/template" =

 	xmlns:c=3D" http://java.sun.com/jsf/core" =

@@ -68,17 +69,25 @@
 		<![CDATA[
 		selector =3D (String) attributes.get("selector");         =

 		if (selector !=3D null && selector.length() !=3D 0) {
-			selector =3D HtmlUtil.expandIdSelector(selector, component, context);
+			selector =3D getUtils().escapeJavaScript(
+					HtmlUtil.expandIdSelector(selector, component, context));
 		}
 		]]>
 	</jsp:scriptlet>	=

 =

+	<c:object var=3D"key" type=3D"java.lang.Object" value=3D"#{attributes['ke=
y']}"/>
+	<jsp:scriptlet>
+		<![CDATA[
+		key =3D getUtils().escapeJavaScript(key);
+		]]>
+	</jsp:scriptlet>	=

+
 	<span id=3D"#{clientId}" style=3D"display:none"
 		x:passThruWithExclusions=3D"id"
 		>
 		=

 		<script>
-			new Richfaces.hotKey("#{clientId}","#{attributes['key']}","#{selector}"=
, #{options}, function(event) { #{attributes['handler']} });
+			new Richfaces.hotKey("#{clientId}","#{key}","#{selector}", #{options}, =
function(event) { #{attributes['handler']} });
 		</script>
 	</span>
 </f:root>
\ No newline at end of file


--===============4979930797828377464==--