portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r224629 - /portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-macros.vm
Date Sun, 24 Jul 2005 16:48:37 GMT
Author: rwatler
Date: Sun Jul 24 09:48:35 2005
New Revision: 224629

URL: http://svn.apache.org/viewcvs?rev=224629&view=rev
Log:
use '"' character as JS string literal delimiters for menu definitions to permit use of '\''
character in titles

Modified:
    portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-macros.vm

Modified: portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-macros.vm
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-macros.vm?rev=224629&r1=224628&r2=224629&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-macros.vm
(original)
+++ portals/jetspeed-2/trunk/portal-webapp/src/webapp/WEB-INF/decorations/layout/html/jscookmenu/decorator-macros.vm
Sun Jul 24 09:48:35 2005
@@ -130,7 +130,7 @@
 #macro (nestJSCookMenuDefinition $_menu)
 #set($menuTitle = $_menu.getTitle($preferedLocale))
 #set($menuName = $_menu.getShortTitle($preferedLocale))
-['', '$!{menuName}', '', '', '$!{menuTitle}',
+["", "$!{menuName}", "", "", "$!{menuTitle}",
 #foreach($element in $_menu.elements.iterator())
   #if($velocityCount > 1),#end
   #if($element.elementType == "option")
@@ -138,10 +138,10 @@
     #set($linkName = $element.getShortTitle($preferedLocale))
     #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
     #if(($element.type == "page") || ($element.type == "folder"))
-      ['', '${linkName}', '${linkUrl}', '', '$!{linkTitle}']
+      ["", "${linkName}", "${linkUrl}", "", "$!{linkTitle}"]
     #elseif($element.type == "link")
       #set($linkTarget = $element.target)
-      ['', '${linkName}', '${linkUrl}', '$!{linkTarget}', '$!{linkTitle}']
+      ["", "${linkName}", "${linkUrl}", "$!{linkTarget}", "$!{linkTitle}"]
     #end
   #elseif($element.elementType == "menu")
     #nestJSCookMenuDefinition($element)
@@ -165,10 +165,10 @@
     #set($linkName = $element.getShortTitle($preferedLocale))
     #set($linkUrl = $jetspeed.getAbsoluteUrl($element.url))
     #if(($element.type == "page") || ($element.type == "folder"))
-      ['', '${linkName}', '${linkUrl}', '', '$!{linkTitle}']
+      ["", "${linkName}", "${linkUrl}", "", "$!{linkTitle}"]
     #elseif($element.type == "link")
       #set($linkTarget = $element.target)
-      ['', '${linkName}', '${linkUrl}', '$!{linkTarget}', '$!{linkTitle}']
+      ["", "${linkName}", "${linkUrl}", "$!{linkTarget}", "$!{linkTitle}"]
     #end
   #elseif($element.elementType == "menu")
     #nestJSCookMenuDefinition($element)



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message