[Openutils-svn] SF.net SVN: openutils:[4353] magnoliamodules/trunk/ openutils-mgnlcontextmenu/src/main

[<luc...@us...>]

Revision: 4353
          http://openutils.svn.sourceforge.net/openutils/?rev=4353&view=rev
Author:   lucaboati
Date:     2013-09-30 09:52:13 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
add init() function to fix menu in blossom components

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java	2013-09-27 16:13:35 UTC (rev 4352)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java	2013-09-30 09:52:13 UTC (rev 4353)
@@ -173,6 +173,18 @@
         return output;
     }
 
+    @SuppressWarnings({"rawtypes" })
+    public static void initContextMenu()
+    {
+        HttpServletRequest request = getRequest();
+        List list = (List) request.getAttribute(EDIT_MESSAGE_INFOS_KEY);
+        if (list == null)
+        {
+            list = new ArrayList();
+            request.setAttribute(EDIT_MESSAGE_INFOS_KEY, list);
+        }
+    }
+
     @SuppressWarnings({"unchecked", "rawtypes" })
     public static ElementInfo addEditMessageInfo(String key, String path, String elementId)
     {

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld	2013-09-27 16:13:35 UTC (rev 4352)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld	2013-09-30 09:52:13 UTC (rev 4353)
@@ -139,10 +139,15 @@
     <function-signature>java.util.List endSortList(java.lang.String)</function-signature>
   </function>
   <function>
+    <name>init</name>
+    <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
+    <function-signature>void initContextMenu()</function-signature>
+  </function>
+  <function>
     <name>addEditMessageInfo</name>
     <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class>
-    <function-signature>net.sourceforge.openutils.mgnlcontextmenu.el.ElementInfo
-      addEditMessageInfo(java.lang.String, java.lang.String, java.lang.String)</function-signature>
+    <function-signature>net.sourceforge.openutils.mgnlcontextmenu.el.ElementInfo addEditMessageInfo(java.lang.String,
+      java.lang.String, java.lang.String)</function-signature>
   </function>
   <function>
     <name>editMessageInfos</name>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-09-27 16:13:35 UTC (rev 4352)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-09-30 09:52:13 UTC (rev 4353)
@@ -11,6 +11,7 @@
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${content.title}</title>
       <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script>
+      ${contextmenu:init()} 
       ${contextmenu:links()}
       <cms:init />
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" />
@@ -30,6 +31,14 @@
             <ul>
               <li>
                 add
+                <code>${'$'}{contextmenu:init()}</code>
+                if you are using blossom (just before
+                <code>&amp;lt;/head&amp;gt;</code>
+                )
+              </li>
+              <li>add the jquery library</li>
+              <li>
+                add
                 <code>${'$'}{contextmenu:links()}</code>
                 (just before
                 <code>&amp;lt;/head&amp;gt;</code>
@@ -42,28 +51,12 @@
                 <code>&amp;lt;/body&amp;gt;</code>
                 )
               </li>
-              <li>add the jquery library</li>
             </ul>
           </p>
         </section>
         <cms:area name="main" />
       </div>
-      <!-- <jsp:include page="/templates/samples-contextmenu/page-editmenu.jsp" /> -->
       ${contextmenu:scripts()}
-      <c:if test="${!empty mgnlSortLists}">
-        <script type="text/javascript">
-          <![CDATA[ jQuery(document).ready( function() {]]>
-          <c:forEach var="item" items="${mgnlSortLists}">
-            <![CDATA[jQuery('#${item.containerId}').sortList({
-              url: '${item.url}',
-              path: '${item.path}',
-              name: '${item.name}',
-              order: ${item.order}
-            });]]>
-          </c:forEach>
-          <![CDATA[});]]>
-        </script>
-      </c:if>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl	2013-09-27 16:13:35 UTC (rev 4352)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl	2013-09-30 09:52:13 UTC (rev 4353)
@@ -4,8 +4,9 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>${content.title!}</title>
     
+    ${contextmenu.init()}
+
     <script src="${contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script>
-    
     ${contextmenu.links()}
     
     [@cms.init /]
@@ -25,9 +26,10 @@
         <p>
           <span>Add the following to your template in order to initialize the contextmenu module:</span>
           <ul>
+            <li>add <code>${'$'}{contextmenu.init()}</code> if you are using blossom (just before <code>&lt;/head&gt;</code>)</li>
+            <li>add the jquery library</li>
             <li>add <code>${'$'}{contextmenu.links()}</code> (just before <code>&lt;/head&gt;</code>)</li>
             <li>add <code>${'$'}{contextmenu.scripts()}</code> (just before <code>&lt;/body&gt;</code>)</li>
-            <li>add the jquery library</li>
           </ul>
         </p>
       </section>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.