Author: mkratt
Date: 2008-03-25 11:02:58 -0700 (Tue, 25 Mar 2008)
New Revision: 8391
Modified:
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
openlaszlo/trunk/demos/lzpix/classes/test/test-dataman.lzx
openlaszlo/trunk/demos/lzpixmobile/classes/test/test-dataman.lzx
openlaszlo/trunk/examples/musicdhtml/main.lzx
openlaszlo/trunk/lps/components/charts/barchart/barchart.lzx
openlaszlo/trunk/lps/components/charts/columnchart/columnchart.lzx
openlaszlo/trunk/lps/components/incubator/draglib.lzx
openlaszlo/trunk/lps/utils/startup-solo.lzx
openlaszlo/trunk/test/leak/view_leaks.lzx
openlaszlo/trunk/test/text/key_events.lzx
Log:
Change 20080324-mkratt-6 by [EMAIL PROTECTED] on 2008-03-24 20:46:17 EST
in /cygdrive/c/cygwin/home/mamye/src/svn/openlaszlo/trunkwork
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: More update your source to use <handler> tag
New Features:
Bugs Fixed: LPP-5646 and LPP-5582
Technical Reviewer: prominik (pending)
QA Reviewer: max (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details: fix test-dataman.lzx
Tests: example and demo in bug
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
2008-03-25 18:00:16 UTC (rev 8390)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
2008-03-25 18:02:58 UTC (rev 8391)
@@ -1,6 +1,6 @@
/**
*
- * @copyright Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved.
+ * @copyright Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved.
* Use is subject to license terms.
*
* @access public
@@ -39,8 +39,10 @@
*
* <simplelayout spacing="10" />
* <text width="200" oninit="checkSubviews()">
- * <method name="checkSubviews"
- * event="onaddsubview" reference="replicationParent">
+ * <handler name="onaddsubview" reference="replicationParent"
+ * method="checkSubviews">
+ * </handler>
+ * <method name="checkSubviews">
* this.setText( 'number of subviews: ' +
* replicationParent.subviews.length );
* </method>
@@ -53,7 +55,9 @@
* <datapath xpath="vegetables:/* /name()" <span
class="redText">spacing="5" replication="resize"</span>/>
*
* <text datapath="name()" valign="middle"/>
- * <method name="toggleSize" event="onclick">
+ * <handler name="onclick" method="toggleSize">
+ * <handler>
+ * <method name="toggleSize">
* if ( this.height != 40 ){
* this.animate ( 'height', 40 , 500 );
* } else {
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-03-25 18:00:16 UTC (rev 8390)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
2008-03-25 18:02:58 UTC (rev 8391)
@@ -53,7 +53,7 @@
LinkedHashMap attrs = new LinkedHashMap();
List children = new Vector();
/** A set {eventName: String -> True) of names of event handlers
- * declared with <method event="xxx"/>. */
+ * declared with <handler name="xxx"/>. */
LinkedHashMap delegates = new LinkedHashMap();
/* Unused */
LinkedHashMap events = new LinkedHashMap();
Modified: openlaszlo/trunk/demos/lzpix/classes/test/test-dataman.lzx
===================================================================
--- openlaszlo/trunk/demos/lzpix/classes/test/test-dataman.lzx 2008-03-25
18:00:16 UTC (rev 8390)
+++ openlaszlo/trunk/demos/lzpix/classes/test/test-dataman.lzx 2008-03-25
18:02:58 UTC (rev 8391)
@@ -6,7 +6,7 @@
-->
<include href="../dataman.lzx" />
- <!--method event="oninit">
+ <!--handler name="oninit">
///
// CHANGE user_id HERE TO GET DIFFERENT USER'S PUBLIC PHOTOS
@@ -17,7 +17,7 @@
argvalue:"[EMAIL PROTECTED]"}
]
gDataMan.doFlickrRequest(photods, argobj);
- </method-->
+ </handler-->
<class name="photolist">
<text datapath="@title" resize="true"/>
@@ -153,4 +153,5 @@
* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
-<!-- @LZX_VERSION@
\ No newline at end of file
+<!-- @LZX_VERSION@
+ -->
\ No newline at end of file
Modified: openlaszlo/trunk/demos/lzpixmobile/classes/test/test-dataman.lzx
===================================================================
--- openlaszlo/trunk/demos/lzpixmobile/classes/test/test-dataman.lzx
2008-03-25 18:00:16 UTC (rev 8390)
+++ openlaszlo/trunk/demos/lzpixmobile/classes/test/test-dataman.lzx
2008-03-25 18:02:58 UTC (rev 8391)
@@ -11,7 +11,7 @@
-->
<include href="../dataman.lzx" />
- <!--method event="oninit">
+ <!--handler name="oninit">
///
// CHANGE user_id HERE TO GET DIFFERENT USER'S PUBLIC PHOTOS
@@ -22,7 +22,7 @@
argvalue:"[EMAIL PROTECTED]"}
]
gDataMan.doFlickrRequest(photods, argobj);
- </method-->
+ </handler-->
<class name="photolist">
<text datapath="@title" resize="true"/>
Modified: openlaszlo/trunk/examples/musicdhtml/main.lzx
===================================================================
--- openlaszlo/trunk/examples/musicdhtml/main.lzx 2008-03-25 18:00:16 UTC
(rev 8390)
+++ openlaszlo/trunk/examples/musicdhtml/main.lzx 2008-03-25 18:02:58 UTC
(rev 8391)
@@ -3,9 +3,9 @@
if (n != null) audioplayer.setAttribute(n, v * 1);
</method>
- <!--method event="oninit">
+ <!--handler name="oninit">
Lz.callMethod('audioplayer.setSource(\'music.mp3\')');
- </method-->
+ </handler-->
<view name="audioplayer">
<view>
@@ -57,7 +57,7 @@
</view>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
<!-- @LZX_VERSION@ -->
Modified: openlaszlo/trunk/lps/components/charts/barchart/barchart.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/barchart/barchart.lzx
2008-03-25 18:00:16 UTC (rev 8390)
+++ openlaszlo/trunk/lps/components/charts/barchart/barchart.lzx
2008-03-25 18:02:58 UTC (rev 8391)
@@ -169,13 +169,13 @@
y="${(chart1.y + chart1.height)/2}"
options="ignorelayout"
fillColor="0x339933">
- <method event="onitemmouseclick"
args="item">
+ <handler name="onitemmouseclick"
args="item">
var topseries = this.chart.getDataSeries();
topseries.getDataSeries(item.identifier).enabled = item.linevisible;
this.chart.renderPlotArea();
item.linevisible = !item.linevisible;
- </method>
+ </handler>
</legend>
</canvas>
</example>
Modified: openlaszlo/trunk/lps/components/charts/columnchart/columnchart.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/columnchart/columnchart.lzx
2008-03-25 18:00:16 UTC (rev 8390)
+++ openlaszlo/trunk/lps/components/charts/columnchart/columnchart.lzx
2008-03-25 18:02:58 UTC (rev 8391)
@@ -158,13 +158,13 @@
chart="${chart1}" x="${chart1.x + chart1.width}"
y="${(chart1.y +
chart1.height)/2}" options="ignorelayout"
fillColor="0x339933"
borderWidth="3">
- <method event="onitemmouseclick"
args="item">
+ <handler name="onitemmouseclick"
args="item">
var topseries = this.chart.getDataSeries();
topseries.getDataSeries(item.identifier).enabled = item.linevisible;
this.chart.renderPlotArea();
item.linevisible = !item.linevisible;
- </method>
+ </handler>
</legend>
</canvas>
</example>
Modified: openlaszlo/trunk/lps/components/incubator/draglib.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/draglib.lzx 2008-03-25
18:00:16 UTC (rev 8390)
+++ openlaszlo/trunk/lps/components/incubator/draglib.lzx 2008-03-25
18:02:58 UTC (rev 8391)
@@ -1,4 +1,4 @@
-<!--- @copyright 2005-2007 Laszlo Systems, Inc. All Rights Reserved.
+<!--- @copyright 2005-2008 Laszlo Systems, Inc. All Rights Reserved.
Use is subject to license terms.
-->
<library>
@@ -9,13 +9,13 @@
<example executable="false">
<class name="dragger" >
...
- <method event="onmousedown">
+ <handler name="onmousedown">
checkdrag.apply();
- </method>
- <method event="onmouseup">
+ </handler>
+ <handler name="onmouseup">
canvas.dragimage.stopdrag(this);
checkdrag.remove();
- </method>
+ </handler>
<checkdragstate name="checkdrag" draggername="dragimage"/>
</class>
@@ -32,17 +32,17 @@
LzTrack.register(this, 'target');
</method>
- <method event="onmousetrackover">
+ <handler name="onmousetrackover">
setAttribute('bgcolor', 0xffff00); // hilite
- </method>
- <method event="onmousetrackout">
+ </handler>
+ <handler name="onmousetrackout">
setAttribute('bgcolor', null); // normal
- </method>
- <method event="onmousetrackup">
+ </handler>
+ <handler name="onmousetrackup">
setAttribute('bgcolor', null); // normal
canvas.dragimage.dropcomplete(this);
Debug.write('dropped: '+dragimage.source.text);
- </method>
+ </handler>
</class>
</example>
Modified: openlaszlo/trunk/lps/utils/startup-solo.lzx
===================================================================
--- openlaszlo/trunk/lps/utils/startup-solo.lzx 2008-03-25 18:00:16 UTC (rev
8390)
+++ openlaszlo/trunk/lps/utils/startup-solo.lzx 2008-03-25 18:02:58 UTC (rev
8391)
@@ -19,7 +19,7 @@
<dataset name="ping" type="http"/>
- <method reference="svars" event="ondata">
+ <handler name="ondata" reference="svars">
global.ping_interval =
Number(svars.getPointer().xpathQuery("/params/@ping_interval"));
global.ping_timeout =
Number(svars.getPointer().xpathQuery("/params/@timeout"));
global.ping_url = svars.getPointer().xpathQuery("/params/@ping_url");
@@ -36,20 +36,20 @@
ping.setSrc(ping_url);
ping.doRequest();
- </method>
+ </handler>
- <method reference="ping" event="ondata">
+ <handler name="ondata" reference="ping">
Debug.write('SUCCESS: LzBrowser.loadURL(',succ_url,');');
LzBrowser.loadURL(succ_url);
- </method>
+ </handler>
- <method reference="ping" event="ontimeout">
+ <handler name="ontimeout" reference="ping">
Debug.write('ping.ontimeout');
canvas.checkloaded();
- </method>
+ </handler>
- <method reference="ping" event="onerror">
+ <handler name="onerror" reference="ping">
<![CDATA[
Debug.write('ping.onerror, elapsed ', (getTimer() - appstart));
if ( (getTimer() - appstart) > ping_timeout) {
@@ -59,7 +59,7 @@
LzTimer.addTimer(global.pdel, ping_interval);
}
]]>
- </method>
+ </handler>
<method name="checkloaded">
@@ -87,7 +87,7 @@
-->
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
Modified: openlaszlo/trunk/test/leak/view_leaks.lzx
===================================================================
--- openlaszlo/trunk/test/leak/view_leaks.lzx 2008-03-25 18:00:16 UTC (rev
8390)
+++ openlaszlo/trunk/test/leak/view_leaks.lzx 2008-03-25 18:02:58 UTC (rev
8391)
@@ -33,7 +33,8 @@
<attribute name="de" init="0"/>
- <method name="setupdel" event="oninit">
+ <handler name="oninit" method="setupdel"/>
+ <method name="setupdel">
del = new LzDelegate ( this, "createView");
del2 = new LzDelegate ( this, "deleteView");
</method>
@@ -56,7 +57,8 @@
LzTimer.addTimer( del2, 10 );
</method>
- <method name="OI" event="onidle" reference="LzIdle">
+ <handler name="onidle" reference="LzIdle" method="OI"/>
+ <method name="OI">
var myx=800*math.random();
var myy=20 + 580*math.random();
this.setAttribute("i", ++i);
Modified: openlaszlo/trunk/test/text/key_events.lzx
===================================================================
--- openlaszlo/trunk/test/text/key_events.lzx 2008-03-25 18:00:16 UTC (rev
8390)
+++ openlaszlo/trunk/test/text/key_events.lzx 2008-03-25 18:02:58 UTC (rev
8391)
@@ -1,10 +1,10 @@
<canvas debug="true">
-<!-- <method event="onkeydown" reference="LzKeys" args="k">-->
+<!-- <handler name="onkeydown" reference="LzKeys" args="k">-->
<!-- Debug.write("LzKeys onkeydown " + k );-->
-<!-- </method>-->
-<!-- <method event="onkeyup" reference="LzKeys" args="k">-->
+<!-- </handler>-->
+<!-- <handler name="onkeyup" reference="LzKeys" args="k">-->
<!-- Debug.write("LzKeys onkeyup " + k );-->
-<!-- </method>-->
+<!-- </handler>-->
<debug y="70"/>
<class name="myinput" extends="inputtext">
<handler name="onfocus">
@@ -157,7 +157,7 @@
</view>
<simplelayout />
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004, 2008 Laszlo Systems, Inc. All Rights Reserved.
*
+* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
</canvas>
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
