[Laszlo-checkins] r8960 - in openlaszlo/trunk: WEB-INF/lps/lfc/services WEB-INF/lps/server/src/org/openlaszlo/compiler demos/lzpix/classes demos/lzpix/views

hqm@openlaszlo.org hqm at openlaszlo.org
Thu May 1 11:58:29 PDT 2008


Author: hqm
Date: 2008-05-01 11:58:25 -0700 (Thu, 01 May 2008)
New Revision: 8960

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/services/LzFocus.lzs
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
   openlaszlo/trunk/demos/lzpix/classes/dataman.lzx
   openlaszlo/trunk/demos/lzpix/views/error.lzx
Log:
Change 20080501-hqm-c by hqm at badtzmaru.home on 2008-05-01 14:57:01 EDT
    in /Users/hqm/openlaszlo/trunk5
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: fixes for swf9, lzpix

New Features:

Bugs Fixed:

Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:

+ create "ignore"'ed arg for constraint handler

+ make LzFocus inherit LzMiniNode so it can handle sendEvent 
    

Tests:



Modified: openlaszlo/trunk/WEB-INF/lps/lfc/services/LzFocus.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/services/LzFocus.lzs	2008-05-01 18:36:43 UTC (rev 8959)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/services/LzFocus.lzs	2008-05-01 18:58:25 UTC (rev 8960)
@@ -19,7 +19,7 @@
   * 
   * @shortdesc Handles keyboard focus.
   */
-dynamic class LzFocusClass {
+dynamic class LzFocusService extends LzMiniNode {
 
     /** Sent when the focus changes, with the argument being the view
      * that was just focused. If nothing is focussed, this event is sent with null.
@@ -33,7 +33,7 @@
     var csel = null;
     var cseldest = null;
 
-    function LzFocusClass () {
+    function LzFocusService () {
     }
 
     function initialize () {
@@ -354,6 +354,6 @@
     }
 }
 
-var LzFocus = new LzFocusClass();
+var LzFocus = new LzFocusService();
 LzFocus.initialize();
 

Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java	2008-05-01 18:36:43 UTC (rev 8959)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java	2008-05-01 18:58:25 UTC (rev 8960)
@@ -1,4 +1,4 @@
-/* -*- mode: Java; c-basic-offset: 4; -*- */
+/* -*- mode: Java; c-basic-offset: 2; -*- */
 /* ***************************************************************************
  * NodeModel.java
  * ***************************************************************************/
@@ -244,8 +244,12 @@
       String body = "\n#beginAttribute\n" + srcloc + value + "\n#endAttribute\n)";
       String pragmas =
         "\n#pragma 'withThis'\n";
-      if (when.equals(WHEN_ONCE) || when.equals(WHEN_ALWAYS)) {
+      String args = "";
+      if (when.equals(WHEN_ONCE)) {
         // default
+      } else if (when.equals(WHEN_ALWAYS)) {
+        // will be called from sendEvent, so needs to take one arg
+        args="$lzc$ignore";
       } else if (when.equals(WHEN_PATH)) {
         installer = "dataBindAttribute";
       } else if (when.equals(WHEN_STYLE)) {
@@ -260,7 +264,7 @@
         // Binders are called by LzDelegate.execute, which passes the
         // value sent by sendEvent, so we have to accept it, but we
         // ignore it
-        "$lzc$ignore",
+        args,
         pragmas,
         "this." + installer + "(" +
         ScriptCompiler.quote(name) + "," +

Modified: openlaszlo/trunk/demos/lzpix/classes/dataman.lzx
===================================================================
--- openlaszlo/trunk/demos/lzpix/classes/dataman.lzx	2008-05-01 18:36:43 UTC (rev 8959)
+++ openlaszlo/trunk/demos/lzpix/classes/dataman.lzx	2008-05-01 18:58:25 UTC (rev 8960)
@@ -40,7 +40,7 @@
             if (noFlickr == 'true') gGlobals.setAttribute("SHOULDCONNECT", false); 
         </handler>
 
-        <method name="dsError">
+        <method name="dsError" args="ignore">
             gError.show();
         </method>
         

Modified: openlaszlo/trunk/demos/lzpix/views/error.lzx
===================================================================
--- openlaszlo/trunk/demos/lzpix/views/error.lzx	2008-05-01 18:36:43 UTC (rev 8959)
+++ openlaszlo/trunk/demos/lzpix/views/error.lzx	2008-05-01 18:58:25 UTC (rev 8960)
@@ -18,7 +18,7 @@
         </handler>
     </mybutton>
 
-    <method name="show" args="etext">
+    <method name="show" args="etext=null">
         this.setVisible( true );
     </method>
 </view>



More information about the Laszlo-checkins mailing list