From seam-commits at lists.jboss.org Thu Jun 18 02:13:35 2009
Content-Type: multipart/mixed; boundary="===============4676308004035403976=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r11173 - in sandbox/trunk/modules/xwidgets:
 src/main/javascript and 1 other directory.
Date: Thu, 18 Jun 2009 02:01:16 -0400
Message-ID: <E1MHAgW-0005a4-7Z@committer01.frg.pub.inap.atl.jboss.com>

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

Author: shane.bryzak(a)jboss.com
Date: 2009-06-18 02:01:16 -0400 (Thu, 18 Jun 2009)
New Revision: 11173

Modified:
   sandbox/trunk/modules/xwidgets/examples/helloworld/index.html
   sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw
   sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Button.js
   sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Button.js
   sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
Log:
extremely rough first draft of component events

Modified: sandbox/trunk/modules/xwidgets/examples/helloworld/index.html
=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
--- sandbox/trunk/modules/xwidgets/examples/helloworld/index.html	2009-06-1=
8 01:52:13 UTC (rev 11172)
+++ sandbox/trunk/modules/xwidgets/examples/helloworld/index.html	2009-06-1=
8 06:01:16 UTC (rev 11173)
@@ -7,7 +7,7 @@
     <script src=3D"../../src/main/javascript/xw.js"></script>
       =

     <script type=3D"text/javascript">           =

-      // Can't set the resource base to another path =

+      // Can't set the resource base to a higher path
       // because of browser security restrictions
       //xw.setResourceBase("../../src/main/javascript");
       =


Modified: sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw
=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
--- sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw	2009-06-18 0=
1:52:13 UTC (rev 11172)
+++ sandbox/trunk/modules/xwidgets/examples/helloworld/test.xw	2009-06-18 0=
6:01:16 UTC (rev 11173)
@@ -3,6 +3,12 @@
   <panel>
     <label value=3D"Hello World!"/>
     =

-    <button value=3D"Click me!"/>
+    <button value=3D"Click me!">
+      <event type=3D"onclick">
+        <action type=3D"script">
+          <![CDATA[alert("Hi there!");]]>
+        </action>
+      </event>
+    </button>
   </panel>
 </view>
\ No newline at end of file

Modified: sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Button.js
=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
--- sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Button.js	2009-06=
-18 01:52:13 UTC (rev 11172)
+++ sandbox/trunk/modules/xwidgets/examples/helloworld/xw.Button.js	2009-06=
-18 06:01:16 UTC (rev 11173)
@@ -19,6 +19,18 @@
        this.parent.control.appendChild(this.control);
        var text =3D document.createTextNode(this.value);
        this.control.appendChild(text);       =

+       =

+       if (!xw.Sys.isUndefined(this.events))
+       {        =

+         if (!xw.Sys.isUndefined(this.events.onclick))
+         {
+           var events =3D this.events;
+           var action =3D function() {
+             events.onclick.invoke();
+           };
+           xw.Sys.chainEvent(this.control, "click", action);
+         }
+       }
      }    =

   }
 }

Modified: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Button.js
=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
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Button.js	2009-06=
-18 01:52:13 UTC (rev 11172)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Button.js	2009-06=
-18 06:01:16 UTC (rev 11173)
@@ -19,6 +19,18 @@
        this.parent.control.appendChild(this.control);
        var text =3D document.createTextNode(this.value);
        this.control.appendChild(text);       =

+       =

+       if (!xw.Sys.isUndefined(this.events))
+       {        =

+         if (!xw.Sys.isUndefined(this.events.onclick))
+         {
+           var events =3D this.events;
+           var action =3D function() {
+             events.onclick.invoke();
+           };
+           xw.Sys.chainEvent(this.control, "click", action);
+         }
+       }
      }    =

   }
 }

Modified: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
=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
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js	2009-06-18 01:=
52:13 UTC (rev 11172)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js	2009-06-18 06:=
01:16 UTC (rev 11173)
@@ -97,6 +97,11 @@
   return value.substring(0, 1).toUpperCase() + value.substring(1, value.le=
ngth); =

 }
 =

+xw.Sys.chainEvent =3D function(ctl, eventName, eventFunc)
+{
+  return ctl.addEventListener(eventName, eventFunc, false);
+}
+
 /**
  * Control manager =

  */
@@ -185,13 +190,16 @@
       var element =3D elements.item(i);    =

       if (element instanceof Element)
       {
-        var controlName =3D xw.Sys.capitalize(element.tagName);           =
                     =

-        if (!xw.Sys.arrayContains(this.controls, controlName))
+        if (element.tagName !=3D "event")
         {
-          this.controls.push(controlName);
-        }        =

-        =

-        this.parseChildNodes(element.childNodes);    =

+          var controlName =3D xw.Sys.capitalize(element.tagName);         =
                       =

+          if (!xw.Sys.arrayContains(this.controls, controlName))
+          {
+            this.controls.push(controlName);
+          }        =

+          =

+          this.parseChildNodes(element.childNodes);    =

+        }
       }
     }
   }    =

@@ -218,33 +226,68 @@
   xw.ViewParser.prototype.parseControl =3D function(element, parentControl)
   {    =

     var tag =3D element.tagName;
-    var controlName =3D tag.substring(0,1).toUpperCase() + =

-                      tag.substring(1, tag.length);
     =

-    // TODO Test for events here
-    =

-    // TODO improve this    =

-    var control =3D eval("new xw.controls." + controlName + "()");    =

-    control.parent =3D parentControl;
-    =

-    if (xw.Sys.isUndefined(parentControl.children))
+    if (tag =3D=3D "event")
     {
-      parentControl.children =3D new Array();
+      if (xw.Sys.isUndefined(parentControl.events))
+      {        =

+        parentControl.events =3D {};
+      }
+      xw.EventParser.parse(element, parentControl.events);
     }
-    parentControl.children.push(control);
+    else
+    {            =

+      // TODO improve this    =

+      var controlName =3D xw.Sys.capitalize(tag);
+      var control =3D eval("new xw.controls." + controlName + "()");    =

+      control.parent =3D parentControl;
+      =

+      if (xw.Sys.isUndefined(parentControl.children))
+      {
+        parentControl.children =3D new Array();
+      }
+      parentControl.children.push(control);
+      =

+      if (element.hasAttributes())
+      {
+        // Set control properties
+        for (var i =3D 0; i < element.attributes.length; i++)
+        {
+          var name =3D element.attributes[i].name;
+          var value =3D element.getAttribute(name);
+          control[name] =3D value;
+        }
+      }
     =

-    if (element.hasAttributes())
+      this.parseChildren(element.childNodes, control);      =

+    }    =

+  }
+}
+
+xw.EventParser =3D {};
+xw.EventParser.parse =3D function(element, events)
+{
+  var eventType =3D element.getAttribute("type");
+  for (var i =3D 0; i < element.childNodes.length; i++)
+  {
+    var child =3D element.childNodes.item(i);
+    if (child instanceof Element && child.tagName =3D=3D "action")
     {
-      // Set control properties
-      for (var i =3D 0; i < element.attributes.length; i++)
+      if (child.getAttribute("type") =3D=3D "script")
       {
-        var name =3D element.attributes[i].name;
-        var value =3D element.getAttribute(name);
-        control[name] =3D value;
+        for (var j =3D 0; j < child.childNodes.length; j++)
+        {
+          if (child.childNodes[j].nodeType =3D=3D 4) // CDATA_SECTION_NODE
+          {
+            var actionScript =3D child.childNodes[j].nodeValue;
+            var action =3D new xw.Action();
+            action.script =3D actionScript;
+            events[eventType] =3D action;
+          }
+        }                                =

       }
+      break; =

     }
-  =

-    this.parseChildren(element.childNodes, control);
   }
 }
 =

@@ -327,6 +370,19 @@
   }
 }
 =

+xw.Action =3D function()
+{
+  this.script =3D null;
+  =

+  xw.Action.prototype.invoke =3D function()
+  {
+    if (!xw.Sys.isUndefined(this.script))
+    {
+      return eval(this.script);
+    }
+  }
+}
+
 /**
  * A single instance of a view
  */


--===============4676308004035403976==--