Minor refactor on amd-js example portlet

vstorm83 · Oct 8, 2012 · 78b5a1f · 78b5a1f
1 parent 3f46e34
commit 78b5a1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/examples/portlets/amd-js/src/main/webapp/jqueryPlugin/view.jsp b/examples/portlets/amd-js/src/main/webapp/jqueryPlugin/view.jsp
@@ -17,7 +17,6 @@
   &lt;module&gt;
       &lt;name&gt;jquery-plugin&lt;/name&gt;     
       &lt;script&gt;
-         &lt;name&gt;jquery-plugin&lt;/name&gt;
          &lt;path&gt;/jqueryPlugin/jquery-plugin.js&lt;/path&gt;
       &lt;/script&gt;
       &lt;depends&gt;
@@ -30,7 +29,6 @@
      &lt;name&gt;JQueryPluginPortlet&lt;/name&gt;
      &lt;module&gt;
        &lt;script&gt;
-         &lt;name&gt;jqueryPlugin&lt;/name&gt;
          &lt;path&gt;/jqueryPlugin/jqueryPluginPortlet.js&lt;/path&gt;
        &lt;/script&gt;
        &lt;depends&gt;

diff --git a/examples/portlets/amd-js/src/main/webapp/requirejs/jsp/requirejsPortlet.jsp b/examples/portlets/amd-js/src/main/webapp/requirejs/jsp/requirejsPortlet.jsp
@@ -20,13 +20,15 @@
 		<div style="clear: both;margin-top:51px;
 				border-color: #DDDDDD #DDDDDD transparent; border-top-style: solid; border-top-width: 1px;">
 			<ol>
+				<li>
+					All js files in this example are native requirejs. The code shown is simplified to make it easier to read
+				</li>
 				<li>
 					Each js library should be a GateIn resource - declare it in gatein-resources.xml
 					<pre class="code" lang="html">
                  &lt;module&gt;
                     &lt;name&gt;text&lt;/name&gt;     
                     &lt;script&gt;
-                       &lt;name&gt;requirejs.text&lt;/name&gt;
                        &lt;path&gt;/requirejs/js/plugins/text.js&lt;/path&gt;
                     &lt;/script&gt;
                     &lt;depends&gt;
@@ -39,7 +41,6 @@
                    &lt;name&gt;RequireJSPortlet&lt;/name&gt;
                    &lt;module&gt;
                       &lt;script&gt;
-                         &lt;name&gt;starter&lt;/name&gt;
                          &lt;path&gt;/requirejs/js/requirejsPortlet.js&lt;/path&gt;
                       &lt;/script&gt;
                       &lt;depends&gt;
@@ -62,7 +63,7 @@
 					<ul>
 						<li>
 							<strong>"text.js"</strong> is not only a native requirejs lib, but also a requirejs-plugin. We use <strong>&lt;resource&gt;</strong> tag 
-							to declare a requirejs-plugin resource
+							to declare a <a href="http://requirejs.org/docs/plugins.html" target="_blank">requirejs-plugin resource</a>
 						</li>
 						<li>
 							Notice how we use <strong>&lt;depends&gt;</strong> tag to declare dependencies - 
@@ -84,7 +85,6 @@
                  &lt;module&gt;
                     &lt;name&gt;foo&lt;/name&gt;     
                     &lt;script&gt;
-                       &lt;name&gt;foo&lt;/name&gt;
                        &lt;path&gt;/path/foo.js&lt;/path&gt;
                     &lt;/script&gt;
                     &lt;depends&gt;

diff --git a/...ebuibasedsamples/src/main/webapp/groovy/webui/component/UISampleRightClickPopupMenu.gtmpl b/...ebuibasedsamples/src/main/webapp/groovy/webui/component/UISampleRightClickPopupMenu.gtmpl
@@ -11,8 +11,8 @@
     String id = uicomponent.getParent().getId();
 
   	JavascriptManager jsmanager = _ctx.getRequestContext().getJavascriptManager();
-  	jsmanager.require("SHARED/webui-ext", "webuiExt")
-             .addScripts("webuiExt.UIRightClickPopupMenu.disableContextMenu('"+id+"') ;");
+  	jsmanager.require("SHARED/uiRightClickPopupMenu", "uiRightClickPopupMenu")
+             .addScripts("uiRightClickPopupMenu.disableContextMenu('"+id+"') ;");
     uicomponent.renderUIComponent(uiPopupMenu) ;
   }
 %>