From 1789ff275b122befcb786c13b32d9bbd66c3be56 Mon Sep 17 00:00:00 2001
From: phuong_vu <phuong.vu@exoplatform.com>
Date: Mon, 30 Jul 2012 14:36:10 +0700
Subject: [PATCH] Make gatein-jquery example portlet work with requirejs

---
 .../portal/samples/jquery/JQueryPortlet.java  |  4 ----
 .../main/webapp/WEB-INF/gatein-resources.xml  | 13 ++++++----
 .../src/main/webapp/javascript/version.js     | 24 +++++++++----------
 .../src/main/webapp/jsp/views/index.jsp       |  8 ++++---
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/examples/portlets/jquery/src/main/java/org/gatein/portal/samples/jquery/JQueryPortlet.java b/examples/portlets/jquery/src/main/java/org/gatein/portal/samples/jquery/JQueryPortlet.java
index b14de6f5a..f72b24506 100644
--- a/examples/portlets/jquery/src/main/java/org/gatein/portal/samples/jquery/JQueryPortlet.java
+++ b/examples/portlets/jquery/src/main/java/org/gatein/portal/samples/jquery/JQueryPortlet.java
@@ -34,10 +34,6 @@ public class JQueryPortlet extends GenericPortlet
    @Override
    public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException
    {
-      //Two lines of code below ensure that ON-LOAD resources jquery is available in the rendering phase
-      //We need this as the JQueryPortlet resource does not declare dependency on jquery resource
-      response.addProperty("org.gatein.javascript.dependency", "jquery");
-
       String view = request.getParameter("view");
       if(view == null || !view.endsWith(".jsp"))
       {
diff --git a/examples/portlets/jquery/src/main/webapp/WEB-INF/gatein-resources.xml b/examples/portlets/jquery/src/main/webapp/WEB-INF/gatein-resources.xml
index 3e582ada7..9d28a8252 100644
--- a/examples/portlets/jquery/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/examples/portlets/jquery/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -26,25 +26,28 @@
    	xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2_1">
 
 
-  <module>
+  <scripts>
     <name>jquery-1.6.4</name>
     <script>
       <name>jquery-1.6.4</name>
       <path>/javascript/jquery-1.6.4.js</path>
     </script>
-  </module>
+  </scripts>
 
   <portlet>
     <name>JQueryPortlet</name>
-    <module>
+    <scripts>
       <script>
         <name>version</name>
         <path>/javascript/version.js</path>
       </script>
       <depends>
-        <module>jquery-1.6.4</module>
+        <scripts>jquery-1.6.4</scripts>
       </depends>
-    </module>
+      <depends>
+        <scripts>bootstrap</scripts>
+      </depends>
+    </scripts>
   </portlet>
 
 </gatein-resources>
diff --git a/examples/portlets/jquery/src/main/webapp/javascript/version.js b/examples/portlets/jquery/src/main/webapp/javascript/version.js
index 35ec0b0b9..8e4731a30 100644
--- a/examples/portlets/jquery/src/main/webapp/javascript/version.js
+++ b/examples/portlets/jquery/src/main/webapp/javascript/version.js
@@ -1,15 +1,15 @@
-$(".version").remove();
-
-$("#portletJQuery").click(function()
-{
-  var target = $(this);
-  $('#result').append("<p>The JQuery's version: " + $().jquery + "</p>");
-  $('#result').children('p').fadeOut(3200);
+$(function() {
+	$("#portletJQuery").click(function() {
+		$('#result').append("<p>The JQuery's version: " + $().jquery + "</p>");
+		$('#result').children('p').fadeOut(3200);
+	});
 });
 
-$("#gateinJQuery").click(function()
+require(["SHARED/jquery"], function($) 
 {
-  var target = $(this);
-  gj('#result').append("<p>The JQuery's version: " + gj().jquery + "</p>");
-  gj('#result').children('p').fadeOut(3200);
-});
+	$("#gateinJQuery").click(function() 
+	{
+		$('#result').append("<p>The JQuery's version: " + $().jquery + "</p>");
+		$('#result').children('p').fadeOut(3200);
+	});
+});
\ No newline at end of file
diff --git a/examples/portlets/jquery/src/main/webapp/jsp/views/index.jsp b/examples/portlets/jquery/src/main/webapp/jsp/views/index.jsp
index 9a426d733..9f54c1ac1 100644
--- a/examples/portlets/jquery/src/main/webapp/jsp/views/index.jsp
+++ b/examples/portlets/jquery/src/main/webapp/jsp/views/index.jsp
@@ -1,4 +1,4 @@
-<div style=" width: 98,5%; height: 210px; overflow: hidden;">
+<div style=" width: 98,5%; height: 253px; overflow: hidden;">
 <div style="float: left; width: 70%">
 <ul>
   <li>
@@ -9,8 +9,10 @@
   </li>
   <li>
     <p style="color: blue">Get information on GateIn 's own JQuery use:</p>
-    <pre>gj('#result').append("&lt;p&gt;The JQuery's version: " + gj().jquery + "&lt;/p&gt;");</pre>
-    <pre>gj('#result').children('p').fadeOut(3200);</pre>
+    <pre>require(["SHARED/jquery"], function($) {</pre>
+    <pre>  $('#result').append("&lt;p&gt;The JQuery's version: " + $().jquery + "&lt;/p&gt;");</pre>
+    <pre>  $('#result').children('p').fadeOut(3200);</pre> 
+    <pre>});</pre>
     <div id="gateinJQuery"><span style="color:green">Click here</span></div>
   </li>
 </ul>