From portal-commits at lists.jboss.org Fri Mar 30 12:07:35 2007
Content-Type: multipart/mixed; boundary="===============6853516171608984783=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r6882 -
 trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic.
Date: Fri, 30 Mar 2007 12:07:35 -0400
Message-ID: <E1HXJdX-0006q5-IL@committer01.frg.pub.inap.atl.jboss.com>

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

Author: julien(a)jboss.com
Date: 2007-03-30 12:07:35 -0400 (Fri, 30 Mar 2007)
New Revision: 6882

Modified:
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPort=
letRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegi=
onRenderer.java
Log:
improved DnD implementation, less javascript

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/D=
ynaPortletRenderer.java
=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/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPor=
tletRenderer.java	2007-03-30 14:18:57 UTC (rev 6881)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPor=
tletRenderer.java	2007-03-30 16:07:35 UTC (rev 6882)
@@ -52,6 +52,11 @@
    /** @see PortletRenderer#render */
    public void render(RenderContext renderContext, PortletRenderContext pr=
c) throws RenderException
    {
+      doDND(renderContext, prc);
+   }
+
+   private void doDND(RenderContext renderContext, PortletRenderContext pr=
c) throws RenderException
+   {
       if (DynaRegionRenderer.isEnabled())
       {
          // Provide handle on content if needed
@@ -61,18 +66,27 @@
             DynaWindowRenderer.handleProvided.set(Boolean.TRUE);
 =

             //
-            renderContext.getMarkupFragment().append("<span class=3D\"hand=
le\">");
+            StringBuffer out =3D renderContext.getMarkupFragment();
+            out.append("<span class=3D\"handle\">");
             delegate.render(renderContext, prc);
-            renderContext.getMarkupFragment().append("</span>");
+            out.append("</span>");
          }
          else
          {
-            delegate.render(renderContext, prc);
+            doCatchClicks(renderContext, prc);
          }
       }
       else
       {
-         delegate.render(renderContext, prc);
+         doCatchClicks(renderContext, prc);
       }
    }
+
+   private void doCatchClicks(RenderContext renderContext, PortletRenderCo=
ntext prc) throws RenderException
+   {
+//      StringBuffer out =3D renderContext.getMarkupFragment();
+//      out.append("<div class=3D\"portlet-bilto\">");
+      delegate.render(renderContext, prc);
+//      out.append("</div>");
+   }
 }

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/D=
ynaRegionRenderer.java
=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/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaReg=
ionRenderer.java	2007-03-30 14:18:57 UTC (rev 6881)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaReg=
ionRenderer.java	2007-03-30 16:07:35 UTC (rev 6882)
@@ -39,10 +39,14 @@
 public class DynaRegionRenderer implements RegionRenderer
 {
 =

-   /** . */
+   /**
+    * .
+    */
    private static final ThreadLocal enabledLocal =3D new ThreadLocal();
 =

-   /** . */
+   /**
+    * .
+    */
    private RegionRenderer delegate;
 =

    public static boolean isEnabled()
@@ -83,77 +87,79 @@
             markup.append("<script type=3D'text/javascript'>\n");
             markup.append("remote_server_url=3D\"").append(remoteURL).appe=
nd(";\"\n");
 =

-            markup.append("regions_on_page =3D new Object();\n");
-
-            String sendData =3D
-               "function sendData(action, windowId, fromPos, fromRegionId,=
 toPos, toRegionId)\n" +
-                  "{\n" +
-                  "   var options =3D {\n" +
-                  "      method: 'post',\n" +
-                  "      postBody: 'action=3D' + action + '&windowId=3D' +=
 windowId + '&fromPos=3D' + fromPos + '&fromRegion=3D' + fromRegionId + '&t=
oPos=3D' + toPos + '&toRegion=3D' + toRegionId,\n" +
-                  "      onSuccess: function(t)\n" +
-                  "      {\n" +
-                  "      },\n" +
-                  "      onSuccess: function(t)\n" +
-                  "      {\n" +
-                  "      },\n" +
-                  "      on404: function(t)\n" +
-                  "      {\n" +
-                  "         alert('Error 404: location \"' + t.statusText =
+ '\" was not found.');\n" +
-                  "      },\n" +
-                  "      onFailure: function(t)\n" +
-                  "      {\n" +
-                  "         alert('Error ' + t.status + ' -- ' + t.statusT=
ext);\n" +
-                  "      },\n" +
-                  "      onLoading: function(t)\n" +
-                  "      {\n" +
-                  "      }\n" +
-                  "   }\n" +
-                  "   new Ajax.Request(remote_server_url, options);\n" +
-                  "}";
+            String sendData =3D "" +
+               "function sendData(action, windowId, fromPos, fromRegionId,=
 toPos, toRegionId) {\n" +
+               "   var options =3D {\n" +
+               "      method: 'post',\n" +
+               "      postBody: 'action=3D' + action + '&windowId=3D' + wi=
ndowId + '&fromPos=3D' + fromPos + '&fromRegion=3D' + fromRegionId + '&toPo=
s=3D' + toPos + '&toRegion=3D' + toRegionId,\n" +
+               "      onSuccess: function(t)\n" +
+               "      {\n" +
+               "      },\n" +
+               "      onSuccess: function(t)\n" +
+               "      {\n" +
+               "      },\n" +
+               "      on404: function(t)\n" +
+               "      {\n" +
+               "         alert('Error 404: location \"' + t.statusText + '=
\" was not found.');\n" +
+               "      },\n" +
+               "      onFailure: function(t)\n" +
+               "      {\n" +
+               "         alert('Error ' + t.status + ' -- ' + t.statusText=
);\n" +
+               "      },\n" +
+               "      onLoading: function(t)\n" +
+               "      {\n" +
+               "      }\n" +
+               "   }\n" +
+               "   new Ajax.Request(remote_server_url, options);\n" +
+               "}";
             markup.append(sendData);
 =

             //
-            String t =3D
+            String t =3D "" +
                "function snapshot() {\n" +
-                  "for(region in regions_on_page) {\n" +
-                  "var regionId =3D regions_on_page[region];\n" +
-                  "var regionDiv =3D $(region);\n" +
-                  "for (var i =3D 0;i < regionDiv.childNodes.length;i++) {=
\n" +
-                  "var child =3D regionDiv.childNodes[i];\n" +
-                  "child['regionId'] =3D regionId;\n" +
-                  "child['pos'] =3D i;\n" +
-                  "}\n" +
-                  "}\n" +
-                  "\n}";
 =

+               // Find draggable regions
+               "   var regions_on_page =3D document.getElementsByClassName=
(\"draggable-region\");\n" +
+
+               // Save current state in the DOM itself
+               "   for(var i =3D 0;i < regions_on_page.length;i++) {\n" +
+               "      var regionDiv =3D regions_on_page[i]\n" +
+               "      for (var j =3D 0;j < regionDiv.childNodes.length;j++=
) {\n" +
+               "         var child =3D regionDiv.childNodes[j];\n" +
+               "         child['regionId'] =3D regionDiv.id;\n" +
+               "         child['pos'] =3D j;\n" +
+               "       }\n" +
+               "   }\n" +
+               "}\n";
+
             markup.append(t);
 =

-            String s =3D
-               "   var WindowMoveObserver =3D Class.create();\n" +
-                  "   WindowMoveObserver.prototype =3D\n" +
-                  "   {\n" +
-                  "      initialize: function(element)\n" +
-                  "      {\n" +
-                  "         this.element =3D $(element);\n" +
-                  "      },\n" +
-                  "      onStart: function()\n" +
-                  "      {\n" +
-                  "      },\n" +
-                  "      onEnd: function()\n" +
-                  "      {\n" +
-                  "         var elt =3D Draggables.activeDraggable.element=
;\n" +
-                  "         var fromRegionId =3D elt['regionId'];\n" +
-                  "         var fromPos =3D elt['pos'];\n" +
-                  "         snapshot();\n" +
-                  "         var toRegionId =3D elt['regionId'];\n" +
-                  "         var toPos =3D elt['pos'];\n" +
-                  "         sendData('windowmove', elt.id, fromPos, fromRe=
gionId, toPos, toRegionId);\n" +
-                  "      }\n" +
-                  "   };\n";
+            String s =3D "" +
+               "var WindowMoveObserver =3D Class.create();\n" +
+               "WindowMoveObserver.prototype =3D\n" +
+               "{\n" +
+               "   initialize: function(element)\n" +
+               "   {\n" +
+               "      this.element =3D $(element);\n" +
+               "   },\n" +
+               "   onStart: function()\n" +
+               "   {\n" +
+               "   },\n" +
+               "   onEnd: function()\n" +
+               "   {\n" +
+               "      var elt =3D Draggables.activeDraggable.element;\n" +
+               "      var fromRegionId =3D elt['regionId'];\n" +
+               "      var fromPos =3D elt['pos'];\n" +
+               "      snapshot();\n" +
+               "      var toRegionId =3D elt['regionId'];\n" +
+               "      var toPos =3D elt['pos'];\n" +
+               "      sendData('windowmove', elt.id, fromPos, fromRegionId=
, toPos, toRegionId);\n" +
+               "   }\n" +
+               "};\n";
             markup.append(s);
 =

-            String u =3D "function removeWindow(elementId)\n" +
+            String u =3D "" +
+               "function removeWindow(elementId)\n" +
                "{\n" +
                "   var effectElement =3D document.getElementById(elementId=
)\n" +
                "   new Effect.BlindUp(effectElement);\n" +
@@ -169,24 +175,24 @@
          }
          else if ("AJAXFooter".equals(rrc.getId()))
          {
-            markup.append("<script>\n");
-            markup.append(
-               "\n" +
-                  "var toto =3D new Array();\n" +
-                  "for(region in regions_on_page) {\n" +
-                  "   toto.push(region);\n" +
-                  "}\n" +
-                  "for(region in regions_on_page) {\n" +
-                  "Sortable.create(region, {dropOnEmpty:true,handle:'handl=
e',tag:'div',containment:toto,constraint:false, ghosting: false,\n" +
-                  "   onChange: function(el)\n" +
-                  "   {\n" +
-                  "   },\n" +
-                  "   onUpdate: function (el)\n" +
-                  "   {\n" +
-                  "   }\n" +
-                  "});\n" +
-                  "}\n");
+            markup.append("<script>\n" +
 =

+               // Find the draggable regions
+               "var regions_on_page =3D document.getElementsByClassName(\"=
draggable-region\");\n" +
+               =

+               //
+               "for(var i =3D 0;i < regions_on_page.length;i++) {\n" +
+               "   var region =3D regions_on_page[i];" +
+               "   Sortable.create(region, {dropOnEmpty:true,handle:'handl=
e',tag:'div',containment:regions_on_page,constraint:false, ghosting: false,=
\n" +
+               "      onChange: function(el)\n" +
+               "      {\n" +
+               "      },\n" +
+               "      onUpdate: function (el)\n" +
+               "      {\n" +
+               "      }\n" +
+               "   });\n" +
+               "}\n");
+
             //
             markup.append("Draggables.addObserver(new WindowMoveObserver()=
);\n");
 =

@@ -209,16 +215,11 @@
       //
       if (regionEnabled)
       {
-         // Keep a map of logical regions to div containers
-         markup.append("<script>").
-                append("regions_on_page[\"bilto-").append(rrc.getId()).app=
end("\"]=3D\"").append(rrc.getId()).append("\";").
-                append("</script>");
-
          //
          delegate.preRender(renderContext, rrc);
 =

          // =

-         markup.append("<div id=3D\"bilto-").append(rrc.getId()).append("\=
">");
+         markup.append("<div class=3D\"draggable-region\" id=3D\"").append=
(rrc.getId()).append("\">");
       }
       else
       {
@@ -237,7 +238,7 @@
          markup.append("<div>&nbsp;</div>");
          markup.append("</div>");
       }
-      =

+
       //
       delegate.postRender(renderContext, rrc);
 =

@@ -245,7 +246,9 @@
       enabledLocal.set(null);
    }
 =

-   /** @see RegionRenderer#render */
+   /**
+    * @see RegionRenderer#render
+    */
    public void render(RenderContext renderContext, final RegionRenderConte=
xt rrc) throws RenderException
    {
       delegate.render(renderContext, rrc);


--===============6853516171608984783==--