[Laszlo-checkins] r8410 - in openlaszlo/branches/devildog: . WEB-INF/lps/lfc/data WEB-INF/lps/lfc/helpers WEB-INF/lps/lfc/kernel/swf WEB-INF/lps/server/src/org/openlaszlo/compiler demos/amazon demos/amazon-soap demos/calendar demos/chat demos/lzpix demos/lzpix/classes demos/lzpix/classes/test demos/lzpix/tests demos/lzpix/views demos/lzpixmobile/classes demos/lzpixmobile/classes/test demos/vacation-survey demos/weather demos/weatherblox docs/src/nav docs/src/reference docs/src/xsl examples examples/components examples/components/testmedia examples/contactlist examples/image-loading examples/javarpc examples/mobile/clock examples/mobile/weather examples/musicdhtml examples/xmldata lps/admin lps/components/base lps/components/charts lps/components/charts/addon lps/components/charts/barchart lps/components/charts/columnchart lps/components/charts/common lps/components/charts/linechart lps/components/charts/piechart lps/components/charts/styles lps/components/debugger lps/components/extensions/views lps/components/incubator lps/components/rpc lps/components/rpc/library/swf lps/utils test/leak test/lztest test/smoke test/text
hqm@openlaszlo.org
hqm at openlaszlo.org
Tue Mar 25 16:24:03 PDT 2008
Author: hqm
Date: 2008-03-25 16:23:22 -0700 (Tue, 25 Mar 2008)
New Revision: 8410
Modified:
openlaszlo/branches/devildog/
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/helpers/LzFont.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf/LzAudio.as
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/ClassCompiler.java
openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
openlaszlo/branches/devildog/demos/amazon-soap/address.lzx
openlaszlo/branches/devildog/demos/amazon-soap/amazon.lzx
openlaszlo/branches/devildog/demos/amazon-soap/classlib.lzx
openlaszlo/branches/devildog/demos/amazon-soap/creditcard.lzx
openlaszlo/branches/devildog/demos/amazon-soap/recommendation.lzx
openlaszlo/branches/devildog/demos/amazon-soap/soap-api.lzx
openlaszlo/branches/devildog/demos/amazon/amazon.lzx
openlaszlo/branches/devildog/demos/amazon/classlib.lzx
openlaszlo/branches/devildog/demos/amazon/recommendation.lzx
openlaszlo/branches/devildog/demos/amazon/shoppinglist.lzx
openlaszlo/branches/devildog/demos/calendar/day.lzx
openlaszlo/branches/devildog/demos/chat/chatlib.lzx
openlaszlo/branches/devildog/demos/lzpix/classes/dataman.lzx
openlaszlo/branches/devildog/demos/lzpix/classes/notes.lzx
openlaszlo/branches/devildog/demos/lzpix/classes/test/test-dataman.lzx
openlaszlo/branches/devildog/demos/lzpix/test-button.lzx
openlaszlo/branches/devildog/demos/lzpix/test-url.lzx
openlaszlo/branches/devildog/demos/lzpix/tests/pivoylayout-test.lzx
openlaszlo/branches/devildog/demos/lzpix/tests/test-auth.lzx
openlaszlo/branches/devildog/demos/lzpix/views/error.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboard.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboardinterior.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/favorites.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/linkbutton.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/notes.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/photocollection.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/spinner.lzx
openlaszlo/branches/devildog/demos/lzpixmobile/classes/test/test-dataman.lzx
openlaszlo/branches/devildog/demos/vacation-survey/vacation-survey.lzx
openlaszlo/branches/devildog/demos/weather/weather.lzx
openlaszlo/branches/devildog/demos/weatherblox/weather_component.lzx
openlaszlo/branches/devildog/docs/src/nav/toc.xml
openlaszlo/branches/devildog/docs/src/reference/wrappers.xml
openlaszlo/branches/devildog/docs/src/xsl/lzx2js2doc.xsl
openlaszlo/branches/devildog/examples/components/datacombobox_example.lzx
openlaszlo/branches/devildog/examples/components/floatinglist_example.lzx
openlaszlo/branches/devildog/examples/components/grid_example.lzx
openlaszlo/branches/devildog/examples/components/list_example.lzx
openlaszlo/branches/devildog/examples/components/menu_example.lzx
openlaszlo/branches/devildog/examples/components/slider_example.lzx
openlaszlo/branches/devildog/examples/components/style_example.lzx
openlaszlo/branches/devildog/examples/components/testmedia/frosty.lzx
openlaszlo/branches/devildog/examples/components/tree_example.lzx
openlaszlo/branches/devildog/examples/contactlist/contactlist.lzx
openlaszlo/branches/devildog/examples/image-loading/dataimage.lzx
openlaszlo/branches/devildog/examples/javarpc/accentedtext.lzx
openlaszlo/branches/devildog/examples/javarpc/returnjavabean.lzx
openlaszlo/branches/devildog/examples/javarpc/returnperson.lzx
openlaszlo/branches/devildog/examples/javarpc/returnpojo.lzx
openlaszlo/branches/devildog/examples/mobile/clock/clock-test.lzx
openlaszlo/branches/devildog/examples/mobile/clock/clock.lzx
openlaszlo/branches/devildog/examples/mobile/weather/test.lzx
openlaszlo/branches/devildog/examples/modeexample.lzx
openlaszlo/branches/devildog/examples/musicdhtml/audiokernel.lzx
openlaszlo/branches/devildog/examples/musicdhtml/main.lzx
openlaszlo/branches/devildog/examples/paging.lzx
openlaszlo/branches/devildog/examples/sessionwindow.lzx
openlaszlo/branches/devildog/examples/systemprop.lzx
openlaszlo/branches/devildog/examples/xmldata/xmldata.lzx
openlaszlo/branches/devildog/lps/admin/cacheinfo.lzx
openlaszlo/branches/devildog/lps/admin/console.lzx
openlaszlo/branches/devildog/lps/admin/logconfig.lzx
openlaszlo/branches/devildog/lps/admin/serverinfo.lzx
openlaszlo/branches/devildog/lps/admin/version.lzx
openlaszlo/branches/devildog/lps/components/base/basecombobox.lzx
openlaszlo/branches/devildog/lps/components/base/basecomponent.lzx
openlaszlo/branches/devildog/lps/components/base/basescrollbar.lzx
openlaszlo/branches/devildog/lps/components/charts/addon/library.lzx
openlaszlo/branches/devildog/lps/components/charts/addon/zoomarea.lzx
openlaszlo/branches/devildog/lps/components/charts/barchart/barchart.lzx
openlaszlo/branches/devildog/lps/components/charts/columnchart/columnchart.lzx
openlaszlo/branches/devildog/lps/components/charts/common/axis.lzx
openlaszlo/branches/devildog/lps/components/charts/common/chart.lzx
openlaszlo/branches/devildog/lps/components/charts/common/datalabel.lzx
openlaszlo/branches/devildog/lps/components/charts/common/datamarker.lzx
openlaszlo/branches/devildog/lps/components/charts/common/dataseries.lzx
openlaszlo/branches/devildog/lps/components/charts/common/datatip.lzx
openlaszlo/branches/devildog/lps/components/charts/common/horizontalaxis.lzx
openlaszlo/branches/devildog/lps/components/charts/common/label.lzx
openlaszlo/branches/devildog/lps/components/charts/common/legend.lzx
openlaszlo/branches/devildog/lps/components/charts/common/library.lzx
openlaszlo/branches/devildog/lps/components/charts/common/rectangularchart.lzx
openlaszlo/branches/devildog/lps/components/charts/common/valueline.lzx
openlaszlo/branches/devildog/lps/components/charts/common/valuepoints.lzx
openlaszlo/branches/devildog/lps/components/charts/common/valueregion.lzx
openlaszlo/branches/devildog/lps/components/charts/common/verticalaxis.lzx
openlaszlo/branches/devildog/lps/components/charts/library.lzx
openlaszlo/branches/devildog/lps/components/charts/linechart/linechart.lzx
openlaszlo/branches/devildog/lps/components/charts/piechart/piechart.lzx
openlaszlo/branches/devildog/lps/components/charts/piechart/piechartplotarea.lzx
openlaszlo/branches/devildog/lps/components/charts/styles/chartstyle.lzx
openlaszlo/branches/devildog/lps/components/debugger/debugger.lzx
openlaszlo/branches/devildog/lps/components/extensions/views/LzTextFormat.lzx
openlaszlo/branches/devildog/lps/components/incubator/draglib.lzx
openlaszlo/branches/devildog/lps/components/incubator/ulink.lzx
openlaszlo/branches/devildog/lps/components/rpc/library/swf/rpc.js
openlaszlo/branches/devildog/lps/components/rpc/rpc.lzx
openlaszlo/branches/devildog/lps/components/rpc/sessionrpc.lzx
openlaszlo/branches/devildog/lps/components/rpc/soap.lzx
openlaszlo/branches/devildog/lps/components/rpc/xmlrpc.lzx
openlaszlo/branches/devildog/lps/utils/startup-solo.lzx
openlaszlo/branches/devildog/test/leak/view_leaks.lzx
openlaszlo/branches/devildog/test/lztest/lztest-placement.lzx
openlaszlo/branches/devildog/test/smoke/compiler.lzl
openlaszlo/branches/devildog/test/text/key_events.lzx
Log:
Merged revisions 8358-8402 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
.......
r8359 | ptw | 2008-03-24 09:16:23 -0400 (Mon, 24 Mar 2008) | 29 lines
Change 20080322-ptw-K by ptw at dueling-banjos.local on 2008-03-22 15:33:49 EDT
in /Users/ptw/OpenLaszlo/ringding-clean
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Fix regression due to class attribute vs. child
Bugs Fixed:
LPP-5663 'Conflict between class name attribute and child attribute named "name"'
Technical Reviewer: hqm (pending)
QA Reviewer: mamye (pending)
Details:
ClassCompiler: Note className as global (for overwrite
detection). No need to remove meta-attributes from model as they
will not be included any more.
NodeModel: Default superclass model correctly. When compiling a
class, do not include meta-attributes ("name", "extends", "with")
in the attributes of the class. No need to look up names as
possibly conflicting with class now that class names are entered
in the global table.
debugger: Update so as not to trigger deprecated warnings.
Tests:
smokecheck, test in bug no longer warns
.......
r8360 | dda | 2008-03-24 09:18:35 -0400 (Mon, 24 Mar 2008) | 26 lines
Change 20080322-dda-A by dda at lester.local on 2008-03-22 23:33:39 EDT
in /Users/dda/laszlo/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Added tests for optional args to smokecheck
New Features:
Bugs Fixed: LPP-5273
Technical Reviewer: ptw (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Added tests for optional arguments into the smokecheck
test suite.
Tests:
smokecheck (SWF8/DHTML) passes with new tests.
.......
r8365 | hqm | 2008-03-24 10:55:19 -0400 (Mon, 24 Mar 2008) | 1 line
remove debug print statements
.......
r8369 | lou | 2008-03-24 11:57:54 -0400 (Mon, 24 Mar 2008) | 22 lines
Change 20080324-lou-O by lou at loumac.local on 2008-03-24 11:45:59 AST
in /Users/lou/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: fix reference page problems for rpc, param, and remotecall
Bugs Fixed: LPP-5651, LPP-5652, LPP-5621 (partial)
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Details:
for all, add introductory paragraphs and code examples that were in r3.4
5652 (remotecall) add return type and value for method invoke()
5621 (rpc) is still missing attributes onload and onunload that were in 3.4
Tests: visual verify
.......
r8375 | max | 2008-03-24 16:17:43 -0400 (Mon, 24 Mar 2008) | 1 line
+ Update testcase to test state placement. Passes in r8279
.......
r8377 | mkratt | 2008-03-24 17:52:18 -0400 (Mon, 24 Mar 2008) | 24 lines
Change 20080324-mkratt-4 by mkratt at IBM-0FBF2B38472 on 2008-03-24 16:34:20 EST
in /cygdrive/c/cygwin/home/mamye/src/svn/openlaszlo/trunkwork
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Update source to use the <handler> tag for event
New Features:
Bugs Fixed: LPP-5646 The event property of methods is deplicated. Please update your source to use the <handler> tag
Technical Reviewer: prominik (pending)
QA Reviewer: max (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Tests: examples and demos list in the bug
.......
r8379 | dda | 2008-03-24 18:25:48 -0400 (Mon, 24 Mar 2008) | 48 lines
Change 20080324-dda-f by dda at lester.local on 2008-03-24 17:45:39 EDT
in /Users/dda/laszlo/src/svn/openlaszlo/trunk-doc2
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: doc: Add charts and some minor cleanups in HTML/Media category
New Features:
Bugs Fixed: LPP-4935 (complete), LPP-5396 (partial)
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: liorio (pending)
Documentation:
See details.
Release Notes:
Details:
- To Contents tab under HTML, replaced LzTextFormat (deprecated) by textformat.
- To Contents tab under Charts, copied list from 3.4.
- Insert @access public judiciously in charts sources.
- In charts sources, worked around a couple problems where <include>
was not always working to pick up contents of needed files.
This was done by inserting a couple of redundant <include> tags
to pick up the needed files. The two problems:
-- <include href="../xxx/file.lzx"> is silently failing to open the file.
I made some primitive attempts to fix in the xsl before deciding to workaround.
-- <include href="piechartplotarea.lzx"> is failing to get included content when used from piechart.lzx.
Did some prelim diagnosis, but still do not know the reason.
- Also corrected an errant include of legend.lzx in piechart.lzx (it was probably
already included elsewhere, allowing it to work).
- Changed the file headers for LzAudio.lzs and LzFont.lzs files to be @access public
in an attempt to produce content for these files. LzFont.html is now produced,
and is referenced from TOC.
- fixed a couple typos in content.
Tests:
Testing content:
Did 'ant reference' in docs/src and checked all the links in the changed sections of the TOC.
Testing charts:
Did 'ant clean; ant; at the top of the tree to rebuild everything (especially charts).
Checked that the doc chart examples run.
Regression:
did smokecheck SWF8/DHTML
.......
r8391 | mkratt | 2008-03-25 14:02:58 -0400 (Tue, 25 Mar 2008) | 24 lines
Change 20080324-mkratt-6 by mkratt at IBM-0FBF2B38472 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
.......
r8392 | lou | 2008-03-25 14:03:01 -0400 (Tue, 25 Mar 2008) | 15 lines
Change 20080325-lou-1 by lou at loumac.local on 2008-03-25 13:56:56 AST
in /Users/lou/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Include introductory paragraphs and code fragment from revision 3.4
Bugs Fixed: LPP-5653
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Tests: visual verify
.......
r8394 | lou | 2008-03-25 14:13:33 -0400 (Tue, 25 Mar 2008) | 15 lines
Change 20080325-lou-w by lou at loumac.local on 2008-03-25 14:06:17 AST
in /Users/lou/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Add intro paragraphs and live code example from 3.4, fix links
Bugs Fixed: LPP-5655
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Tests: visual verify
.......
r8399 | lou | 2008-03-25 14:51:57 -0400 (Tue, 25 Mar 2008) | 15 lines
Change 20080325-lou-k by lou at loumac.local on 2008-03-25 14:47:53 AST
in /Users/lou/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: add introductory paragraph and live code example from 3.4
Bugs Fixed: LPP-5657
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Tests: visual verify
.......
r8400 | max | 2008-03-25 14:59:14 -0400 (Tue, 25 Mar 2008) | 43 lines
Change 20080325-maxcarlson-5 by maxcarlson at Roboto on 2008-03-25 11:42:41 PDT
in /Users/maxcarlson/openlaszlo/trunk-clean
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: UPDATED AGAIN: Update Amazon demo for new AWS version, speed up calendar
New Features:
Bugs Fixed: LPP-5667 - Update Amazon demo with new API
Technical Reviewer: promanik
QA Reviewer: mkratt
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details: LaszloView.lzs - Remove deprecated getAttribute() call.
basescrollbar.lzx - Fix deprecated setVisible() calls.
basecomponent.lzx - Ensure events have listeners before calling sendEvent()
basecombobox.lzx - Fix deprecated setVisible() calls.
shoppinglist.lzx - Update datapaths to use AWS 4 response style.
recommendation.lzx - Update datapaths, requests to use AWS 4 response style.
amazon.lzx - Use a single base URL that contains the API key. Update datapaths to use AWS 4 response style. Fix deprecated setVisible() calls.
classlib.lzx - Fix deprecated setVisible() calls.
day.lzx - Halve calendar startup time by deferring scrollbar instantiation until the day is expanded.
photocollection.lzx - Fix bad classname lookup
clipboardinterior.lzx - Fix bad classname lookup.
Tests: Amazon and calendar run as before. lzpixmobile won't compile on TOT due to another bug.
.......
Property changes on: openlaszlo/branches/devildog
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497 /openlaszlo/trunk:1-8357
+ /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497 /openlaszlo/trunk:1-8402
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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/branches/devildog/WEB-INF/lps/lfc/helpers/LzFont.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/helpers/LzFont.lzs 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/helpers/LzFont.lzs 2008-03-25 23:23:22 UTC (rev 8410)
@@ -4,7 +4,7 @@
* Use is subject to license terms.
*
* @affects lzfont
- * @access private
+ * @access public
* @topic LFC
* @subtopic Helpers
*/
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf/LzAudio.as
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf/LzAudio.as 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf/LzAudio.as 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,7 +1,7 @@
/**
* LzAudio.as
*
- * @copyright Copyright 2001-2006 Laszlo Systems, Inc. All Rights Reserved.
+ * @copyright Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved.
* Use is subject to license terms.
*
* @topic Kernel
@@ -10,6 +10,7 @@
/**
* @shortdesc This service manages audio resource playback.
+ * @access public
*
*/
var LzAudio = new Object;
Modified: openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/ClassCompiler.java
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/ClassCompiler.java 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/ClassCompiler.java 2008-03-25 23:23:22 UTC (rev 8410)
@@ -72,9 +72,12 @@
*/
void updateSchema(Element element, ViewSchema schema, Set visited) {
Element elt = element;
-
+ // Get meta attributes
String classname = elt.getAttributeValue("name");
String superclass = elt.getAttributeValue("extends");
+ // TODO: [2008-03-22 ptw] Need to add all elements of all
+ // mixins to the schema for this class
+ String mixins = elt.getAttributeValue("with");
if (classname == null ||
(schema.enforceValidIdentifier && !ScriptCompiler.isIdentifier(classname))) {
@@ -255,6 +258,8 @@
}
}
String className = tagToClass(tagName);
+ // className will be a global
+ mEnv.addId(className, elt);
ClassModel classModel = schema.getClassModel(tagName);
@@ -266,13 +271,11 @@
// the runtime wants.
NodeModel model = NodeModel.elementAsModel(elt, schema, mEnv);
model = model.expandClassDefinitions();
- model.removeAttribute("name");
classModel.setNodeModel(model);
// Should the package prefix be in the model? Should the
// model store class and tagname separately?
String supertagname = classModel.getSuperclassName();
String superclassname = tagToClass(supertagname);
- model.removeAttribute("extends");
// Build the constructor
String body = "";
Modified: openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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();
@@ -490,7 +490,7 @@
String parentName = this.className;
return
parentName.equals("class")?
- schema.getClassModel(element.getAttributeValue("extends")):
+ schema.getClassModel(element.getAttributeValue("extends", ClassCompiler.DEFAULT_SUPERCLASS_NAME)):
schema.getClassModel(parentName);
}
@@ -634,7 +634,20 @@
}
}
-
+ // Special case for compiling a class, the class
+ // attributes are really 'meta' attributes, not
+ // attributes of the class -- they will be processed by
+ // the ClassModel or ClassCompiler
+ if ("class".equals(className)) {
+ // TODO: [2008-03-22 ptw] This should somehow be
+ // derived from the schema, but this does not work, so
+ // we hard-code the meta-attributes here
+// if (superclassModel.getAttribute(name) != null) {
+ if ("name".equals(name) || "extends".equals(name) || "with".equals(name)) {
+ System.err.println("Skipping meta-attribute: " + name);
+ continue;
+ }
+ }
// Warn for redefine of a flash builtin
// TODO: [2006-01-23 ptw] What about colliding with DHTML globals?
@@ -663,46 +676,32 @@
if ((name.equals("id")) ||
(name.equals("name") &&
topLevelDeclaration() && !className.equals("class"))) {
-
- ClassModel superclassModel = schema.getClassModel(value);
- if (superclassModel != null && !superclassModel.isBuiltin()) {
+ ElementWithLocationInfo dup =
+ (ElementWithLocationInfo) env.getId(value);
+ // we don't want to give a warning in the case
+ // where the id and name are on the same element,
+ // i.e., <view id="foo" name="foo"/>
+ if (dup != null && dup != element) {
+ String locstring =
+ CompilerUtils.sourceLocationPrettyString(dup);
env.warn(
-/* (non-Javadoc)
- * @i18n.test
- * @org-mes="You have given the " + p[0] + " an attribute " + p[1] + "=\"" + p[2] + "\", " + "which may overwrite the class \"" + p[3] + "\"."
- */
- org.openlaszlo.i18n.LaszloMessages.getMessage(
- NodeModel.class.getName(),"051018-559", new Object[] {getMessageName(), name, value, value})
- ,element);
+ /* (non-Javadoc)
+ * @i18n.test
+ * @org-mes="Duplicate id attribute \"" + p[0] + "\" at " + p[1]
+ */
+ org.openlaszlo.i18n.LaszloMessages.getMessage(
+ NodeModel.class.getName(),"051018-576", new Object[] {value, locstring})
+ ,
+ element);
} else {
- ElementWithLocationInfo dup =
- (ElementWithLocationInfo) env.getId(value);
- // we don't want to give a warning in the case
- // where the id and name are on the same element,
- // i.e., <view id="foo" name="foo"/>
- if (dup != null && dup != element) {
- String locstring =
- CompilerUtils.sourceLocationPrettyString(dup);
- env.warn(
-/* (non-Javadoc)
- * @i18n.test
- * @org-mes="Duplicate id attribute \"" + p[0] + "\" at " + p[1]
- */
- org.openlaszlo.i18n.LaszloMessages.getMessage(
- NodeModel.class.getName(),"051018-576", new Object[] {value, locstring})
-,
- element);
- } else {
- // TODO: [07-18-03 hqm] We will canonicalize
- // all id's to lowercase, because actionscript
- // is not case sensitive. but in the future,
- // we should preserve case.
- env.addId(value, element);
- }
+ // TODO: [07-18-03 hqm] We will canonicalize
+ // all id's to lowercase, because actionscript
+ // is not case sensitive. but in the future,
+ // we should preserve case.
+ env.addId(value, element);
}
}
-
Schema.Type type;
try {
if (className.equals("class")) {
@@ -776,8 +775,7 @@
if (name.equals("name")) {
Element parent = element.getParentElement();
if (parent != null) {
- for (Iterator iter2 = parent.getChildren().iterator(); iter2.hasNext();
- ) {
+ for (Iterator iter2 = parent.getChildren().iterator(); iter2.hasNext(); ) {
Element e = (Element) iter2.next();
if (!e.getName().equals("resource") && !e.getName().equals("font")
&& e != element && value.equals(e.getAttributeValue("name"))) {
Modified: openlaszlo/branches/devildog/demos/amazon/amazon.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon/amazon.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon/amazon.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -9,14 +9,13 @@
<include href="address.lzx"/>
<include href="creditcard.lzx"/>
<include href="recommendation.lzx"/>
- <attribute name="developerToken" value="D3VSV378UEERZB" type="string" />
+ <attribute name="baseURL" value="http://webservices.amazon.com/onca/xml?Service=AWSECommerceService&SubscriptionId=1ZJXY3M2VMFG0W1ZF1R2&AssociateTag=webservices" type="string" />
<!-- dataset holding customer's recommendations -->
- <dataset name="dsRecommend" request="false" type="http" src="http://xml.amazon.com/onca/xml3"/>
+ <dataset name="dsRecommend" request="false" type="http"/>
<!-- dataset to search items by keywoard -->
- <dataset name="dsKeyword" type="http" request="false"
- src="http://xml.amazon.com/onca/xml3"/>
+ <dataset name="dsKeyword" type="http" request="false"/>
<datapointer xpath="dsKeyword:/*">
<handler name="ondata">
@@ -36,8 +35,8 @@
<datapointer xpath="dsAsin:/*">
<handler name="ondata">
- recommend.setVisible( false );
- cdinfo.setVisible( true );
+ recommend.setAttribute('visible', false );
+ cdinfo.setAttribute('visible', true );
cdinfo.bringToFront();
infoLoader.hide();
</handler>
@@ -127,21 +126,21 @@
matching the keyword search -->
<view name="searchResults"
width="${parent.width}">
- <datapath xpath="dsKeyword:/ProductInfo/Details" pooling="true" />
+ <datapath xpath="dsKeyword:/ItemSearchResponse/Items/Item" pooling="true" />
<view width="${parent.width}" clickable="true"
onmouseover="setBGColor(0xFFFFFF)"
onmouseout="setBGColor(0xCAD0EC)">
<simplelayout axis="y"/>
- <text x="4" font="lztahoe8,Arial,Helvetica" datapath="ProductName/text()" width="${parent.width-6}" resize="false"/>
- <text x="4" font="lztahoe8,Arial,Helvetica" datapath="Artists/Artist[1]/text()" width="${parent.width-6}" resize="false"/>
+ <text x="4" font="lztahoe8,Arial,Helvetica" datapath="ItemAttributes/Title/text()" width="${parent.width-6}" resize="false"/>
+ <text x="4" font="lztahoe8,Arial,Helvetica" datapath="ItemAttributes/Artist[1]/text()" width="${parent.width-6}" resize="false"/>
<!-- When one item is clicked, a request is sent to Amazon for deatailed informations about the item -->
<handler name="onclick">
<![CDATA[
- var dsAsin=canvas.datasets.dsAsin;
- var qsAsin = "t=webservices&dev-t="+canvas.developerToken+"&AsinSearch="+parent.datapath.xpathQuery("Asin/text()")+"&mode=music&type=heavy&page=1&f=xml";
infoLoader.show();
- dsAsin.setQueryString(qsAsin);
+ var asin = parent.datapath.xpathQuery("ASIN/text()");
+ var url = canvas.baseURL + "&Operation=ItemLookup&ItemId=" + asin + "&ResponseGroup=ItemAttributes,OfferSummary,Images,Tracks,Reviews,EditorialReview";
+ dsAsin.setSrc(url);
dsAsin.doRequest();
]]>
</handler>
@@ -177,7 +176,7 @@
<view id="cdinfo" x="223" y="10" width="${parent.width-2*x}"
height="${parent.height-y}"
- datapath="dsAsin:/ProductInfo/Details"
+ datapath="dsAsin:/ItemLookupResponse/Items/Item"
bgcolor="#CAD0EC" font="Arial,Helvetica" fontsize="11">
<simplelayout axis="y" spacing="16"/>
@@ -186,15 +185,15 @@
onmouseover="setResourceNumber(2);"
onmouseout="setResourceNumber(1);"
onmouseup="setResourceNumber(1);"
- onclick="recommend.setVisible( true); cdinfo.setVisible( false ); recommend.bringToFront();"/>
+ onclick="recommend.setAttribute('visible', true); cdinfo.setAttribute('visible', false ); recommend.bringToFront();"/>
<view name="info" width="${parent.width}" height="136">
<simplelayout axis="x" spacing="10"/>
<!-- Display CD cover: Image is draggable into either the shopping cart or the wish list -->
- <view id="cover" datapath="ImageUrlMedium/text()"
- onmousedown="dragger.start(parent.parent.datapath.xpathQuery('ImageUrlSmall/text()'))"
+ <view id="cover" datapath="SmallImage/URL/text()"
+ onmousedown="dragger.start(parent.parent.datapath.xpathQuery('SmallImage/URL/text()'))"
onmouseup="dragger.stop(); itemDropped(parent.parent.datapath);"
ondblclick="cart.addItem(parent.parent.datapath)">
<attribute name="source" value="${this.data}"/>
@@ -208,13 +207,13 @@
</view>
<view width="${parent.width-cover.width}">
- <text datapath="ProductName/text()" width="${parent.width}" fontstyle="bold" fontsize="18" fgcolor="#666699"/>
- <text y="20" datapath="Artists/Artist[1]/text()" width="${parent.width}" fontstyle="bold" fontsize="12" fgcolor="#666699"/>
- <text y="40" fgcolor="#666699">Label:</text><text x="90" y="40" datapath="Manufacturer/text()" width="${parent.width}" fgcolor="#666699"/>
- <text y="55" fgcolor="#666699">Realease Date:</text><text x="90" y="55" datapath="ReleaseDate/text()" width="${parent.width}" fgcolor="#666699"/>
+ <text datapath="ItemAttributes/Title/text()" width="${parent.width}" fontstyle="bold" fontsize="18" fgcolor="#666699"/>
+ <text y="20" datapath="ItemAttributes/Artist[1]/text()" width="${parent.width}" fontstyle="bold" fontsize="12" fgcolor="#666699"/>
+ <text y="40" fgcolor="#666699">Label:</text><text x="90" y="40" datapath="ItemAttributes/Manufacturer/text()" width="${parent.width}" fgcolor="#666699"/>
+ <text y="55" fgcolor="#666699">Release Date:</text><text x="90" y="55" datapath="ItemAttributes/ReleaseDate/text()" width="${parent.width}" fgcolor="#666699"/>
<text y="70" fgcolor="#666699">Availability:</text><text x="90" y="70" datapath="Availability/text()" width="${parent.width}" fgcolor="#666699"/>
- <text y="87" fgcolor="#666699" fontsize="14">List Price:</text><text x="90" y="87" datapath="ListPrice/text()" width="${parent.width}" fontsize="14" fgcolor="#666699"/>
- <text y="105" fgcolor="#666699" fontstyle="bold" fontsize="16">Our Price:</text><text x="90" y="105" datapath="OurPrice/text()" width="${parent.width}" fontstyle="bold" fontsize="16" fgcolor="#666699"/>
+ <text y="87" fgcolor="#666699" fontsize="14">List Price:</text><text x="90" y="87" datapath="ItemAttributes/ListPrice/FormattedPrice/text()" width="${parent.width}" fontsize="14" fgcolor="#666699"/>
+ <text y="105" fgcolor="#666699" fontstyle="bold" fontsize="16">Our Price:</text><text x="90" y="105" datapath="OfferSummary/LowestNewPrice/FormattedPrice/text()" width="${parent.width}" fontstyle="bold" fontsize="16" fgcolor="#666699"/>
<mouseview resource="cart_butt" x="214" y="105" width="54" height="18"
onclick="cart.addItem(parent.parent.parent.datapath)"/>
<mouseview resource="wish_butt" x="270" y="105" width="54" height="18"
@@ -228,7 +227,7 @@
<tabpanel name="editorialTab" label="Editorial Review" oninit="this.setAnnotation( '-' );">
<text x="8" y="8" id="pokeme"
- datapath="ProductDescription/text()"
+ datapath="EditorialReviews/EditorialReview[1]/Content/text()"
multiline="true" width="${parent.width-16}">
<method name="applyData" args="t">
<![CDATA[
@@ -245,27 +244,36 @@
<tabpanel label="Tracks">
<view width="${parent.width}" height="${parent.height-20}"
- datapath="Tracks" clip="true">
- <handler name="ondata">
- var dp = this.datapath.dupePointer();
- dp.selectChild();
- var numberTracks = countNodesByName( dp, 'Track' );
- numberTracks = (numberTracks == 0) ? "-" : numberTracks;
- this.parent.setAnnotation( numberTracks );
- </handler>
+ clip="true">
+ <view datapath="Tracks" width="100%">
+ <handler name="ondata">
+ <![CDATA[
+ var discs = this.datapath.xpathQuery('Disc')
+ if (! discs) return;
+ if (! discs.length) discs = [ discs ];
+ var tracks = 0;
+ for (i in discs) {
+ var n = discs[i];
+ if (n && n.childNodes) tracks += n.childNodes.length;
+ }
+ parent.parent.setAnnotation(tracks);
+ ]]>
+ </handler>
+ <simplelayout/>
+ <view datapath="Disc" width="100%">
+ <simplelayout/>
+ <text name="discnum"/>
+ <handler name="ondata">
+ this.discnum.setText('Disc ' + this.datapath.xpathQuery('@Number'));
+ </handler>
- <view y="8" x="8" width="${parent.width}">
- <simplelayout axis="y"/>
- <!-- Repeated view displaying the list of tracks -->
- <view width="${parent.width}">
- <attribute name="trackid" type="string" value=""/>
- <handler name="onclonenumber" args="n">
- this.trackid = n+1 + '.';
- </handler>
- <datapath xpath="Track" pooling="true" />
- <simplelayout axis="x" spacing="4"/>
- <text name="tid" label="${parent.trackid}" width="20"/>
- <text datapath="text()" width="${parent.width}"/>
+ <!-- Repeated view displaying the list of tracks -->
+ <view width="${parent.width}">
+ <datapath xpath="Track" pooling="true" />
+ <simplelayout axis="x" spacing="4"/>
+ <text name="tid" datapath="@Number" width="20"/>
+ <text datapath="text()" width="${parent.width}"/>
+ </view>
</view>
</view>
<scrollbar/>
@@ -279,19 +287,19 @@
<view width="${parent.width}">
<view x="8" y="8" width="${parent.width-50}"
id="customerReviewsContainer">
- <datapath xpath="Reviews" pooling="true"/>
+ <datapath xpath="CustomerReviews" pooling="true"/>
<simplelayout axis="y" spacing="0"/>
<handler name="ondata">
var dp = this.datapath.dupePointer();
dp.selectChild();
- var numberReviews = countNodesByName( dp, 'CustomerReview' );
+ var numberReviews = countNodesByName( dp, 'Review' );
this.parent.parent.parent.setAnnotation( numberReviews );
</handler>
<!-- Repeated view displaying the list of customer review -->
- <view datapath="CustomerReview" width="${parent.width}"
+ <view datapath="Review" width="${parent.width}"
name="replicatedReviews">
<simplelayout axis="y" spacing="4"/>
<view width="${parent.width}"
@@ -307,7 +315,7 @@
<!-- View displaying the body of the review when its title is clicked !-->
<view name="detail" height="0" width="${parent.width}" clip="true">
<view name="comment" width="${parent.width}">
- <text x="10" datapath="Comment/text()" multiline="true" width="${parent.width}"/>
+ <text x="10" datapath="Content/text()" multiline="true" width="${parent.width}"/>
</view>
</view>
</view>
@@ -331,7 +339,6 @@
<inputtext name="searchKey" x="20" y="3" fontsize="11">
<handler name="onkeydown" args="k">
if (k==13) {
-Debug.write("Searching");
parent.search();
}
</handler>
@@ -340,9 +347,9 @@
<![CDATA[
searchLoader.show();
main.animate("x", main.open_posX, 0, false);
- var dsKeyword=canvas.datasets.dsKeyword;
- var qsKeyword = "t=webservices&dev-t="+canvas.developerToken+"&KeywordSearch="+escape(searchKey.getText())+"&mode=music&type=lite&page=1&f=xml";
- dsKeyword.setQueryString(qsKeyword);
+ var search = escape(searchKey.getText());
+ var url = canvas.baseURL + "&Operation=ItemSearch&Keywords=" + search + "&SearchIndex=Music&ResponseGroup=ItemAttributes";
+ dsKeyword.setSrc(url);
dsKeyword.doRequest();
]]>
</method>
Modified: openlaszlo/branches/devildog/demos/amazon/classlib.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon/classlib.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon/classlib.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -82,7 +82,7 @@
-classroot.width );
classroot.panelDragger.apply();
if(classroot.container.content.visible != true){
- classroot.container.content.setVisible(true);
+ classroot.container.content.setAttribute('visible', true);
}
</handler>
<handler name="onmouseup">
@@ -91,7 +91,7 @@
// User has just closed the tab by dragging the panel
// manually.
classroot.opened = 'false';
- classroot.container.content.setVisible(false);
+ classroot.container.content.setAttribute('visible', false);
}
parent.tabButton.setResourceNumber(classroot.opened=='true'?4:1);
classroot.panelDragger.remove();
@@ -106,7 +106,7 @@
</view>
<method name="open">
- this.container.content.setVisible(true);
+ this.container.content.setAttribute('visible', true);
this.animate("width",openingsize,333,false);
</method>
@@ -120,7 +120,7 @@
</method>
<method name="hidecontent">
- this.container.content.setVisible(false);
+ this.container.content.setAttribute('visible', false);
</method>
<!-- Nudge the tab left then right to give feedback that something's
@@ -203,10 +203,10 @@
options="ignorelayout">
<method name="show">
this.bringToFront();
- this.setVisible( true );
+ this.setAttribute('visible', true );
</method>
<method name="hide">
- this.setVisible( false );
+ this.setAttribute('visible', false );
</method>
</class>
Modified: openlaszlo/branches/devildog/demos/amazon/recommendation.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon/recommendation.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon/recommendation.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -3,7 +3,7 @@
<class name="cdview" width="${parent.width}" height="82">
<resizelayout axis="x" spacing="8"/>
- <view name="cover" datapath="ImageUrlSmall/text()" y="7" width="50" height="50" clip="true"
+ <view name="cover" datapath="SmallImage/URL/text()" y="7" width="50" height="50" clip="true"
onmouseover="dragsmall.display(this, this.datapath.xpathQuery('text()'))"
onmouseout="dragsmall.hide()"
onmousedown="dragsmall.start()"
@@ -21,11 +21,11 @@
<view y="7" options="releasetolayout" name="info">
<simplelayout axis="y" spacing="-3"/>
- <text fontsize="12" fontstyle="bold" datapath="ProductName/text()"
+ <text fontsize="12" fontstyle="bold" datapath="ItemAttributes/Title/text()"
visible="${ width > 40 }"
multiline="true" name="title"
width="${parent.width - 15}" fgcolor="#666699"/>
- <text datapath="Artists/Artist[1]/text()"
+ <text datapath="ItemAttributes/Artist[1]/text()"
visible="${ width < parent.width - 5 &&
parent.title.height <40 }"
resize="true"
@@ -36,7 +36,7 @@
fgcolor="#666699">
<simplelayout axis="x" spacing="4"/>
<text>Our Price:</text>
- <text datapath="OurPrice/text()" width="50"/>
+ <text datapath="OfferSummary/LowestNewPrice/FormattedPrice/text()" width="50"/>
</view>
</view>
<view y="${classroot.cover.height + 8}"
@@ -57,9 +57,9 @@
// Get more information about the current CD.
<![CDATA[
infoLoader.show();
- var dsAsin=canvas.datasets.dsAsin;
- var qsAsin = "t=webservices&dev-t="+canvas.developerToken+"&AsinSearch="+this.datapath.xpathQuery("Asin/text()")+"&mode=music&type=heavy&page=1&f=xml";
- dsAsin.setQueryString(qsAsin);
+ var asin = this.datapath.xpathQuery("ASIN/text()");
+ var url = canvas.baseURL + "&Operation=ItemLookup&ItemId=" + asin + "&ResponseGroup=ItemAttributes,OfferSummary,Images,Tracks,Reviews,EditorialReview";
+ dsAsin.setSrc(url);
dsAsin.doRequest();
]]>
@@ -74,9 +74,8 @@
<method name="getRecommendations">
<![CDATA[
- var dsRecommend=canvas.datasets.dsRecommend;
- var qsRecommend = "t=webservices&dev-t="+canvas.developerToken+"&AsinSearch=B00005YW4H,B00006IX86,B000005J56,B00006AAJF,B0002RUPH4,B00006IX6E,B000069HKH,B00006JP29,B000000QFU,B000002L2Z&mode=music&type=lite&page=1&f=xml";
- dsRecommend.setQueryString(qsRecommend);
+ var url = canvas.baseURL + "&Operation=ItemLookup&ItemId=B00005YW4H,B00006IX86,B000005J56,B00006AAJF,B0002RUPH4,B00006IX6E,B000069HKH,B00006JP29,B000000QFU,B000002L2Z&ResponseGroup=ItemAttributes,OfferSummary,Images";
+ dsRecommend.setSrc(url);
dsRecommend.doRequest();
]]>
</method>
@@ -89,12 +88,12 @@
<view options="releasetolayout">
<simplelayout axis="y" spacing="1"/>
<!-- Repeated view displaying the list of items matching the keyword search -->
- <cdview datapath="dsRecommend:/ProductInfo/Details[1-5]"/>
+ <cdview datapath="dsRecommend:/ItemLookupResponse/Items/Item[1-5]"/>
</view>
<view options="releasetolayout">
<simplelayout axis="y" spacing="1"/>
<!-- Repeated view displaying the list of items matching the keyword search -->
- <cdview datapath="dsRecommend:/ProductInfo/Details[6-10]"/>
+ <cdview datapath="dsRecommend:/ItemLookupResponse/Items/Item[6-10]"/>
</view>
</view>
@@ -102,7 +101,7 @@
</library>
<!-- * 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/branches/devildog/demos/amazon/shoppinglist.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon/shoppinglist.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon/shoppinglist.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -10,9 +10,9 @@
<simplelayout axis="y" spacing="6"/>
<!-- Repeated view displaying list of items in the shopping cart -->
<view x="12" width="${parent.width}">
- <datapath xpath="Details" pooling="true"/>
+ <datapath xpath="Item" pooling="true"/>
<simplelayout axis="x" spacing="6"/>
- <view datapath="ImageUrlSmall/text()" width="50" height="50" clip="true"
+ <view datapath="SmallImage/URL/text()" width="50" height="50" clip="true"
onmouseover="dragsmall.display(this, this.datapath.getNodeText());"
onmouseout="dragsmall.hide();"
onmousedown="dragsmall.start();"
@@ -22,12 +22,12 @@
<view width="$once{parent.width}" fgcolor="#666699">
<simplelayout axis="y"/>
- <text fontsize="12" fontstyle="bold" datapath="ProductName/text()" width="${parent.width}"/>
- <text datapath="Artists/Artist[1]/text()" width="${parent.width}"/>
+ <text fontsize="12" fontstyle="bold" datapath="ItemAttributes/Title/text()" width="${parent.width}"/>
+ <text datapath="ItemAttributes/Artist[1]/text()" width="${parent.width}"/>
<view fontsize="12" fontstyle="bold">
<simplelayout axis="x" spacing="4"/>
<text>Our Price:</text>
- <text datapath="OurPrice/text()" width="${parent.width}"/>
+ <text datapath="OfferSummary/LowestNewPrice/FormattedPrice/text()" width="${parent.width}"/>
</view>
</view>
@@ -51,19 +51,19 @@
<method name="addItem" args="dpath">
this.panel_to_nudge.nudge();
- this.setAttribute("total", total+parseFloat(dpath.xpathQuery("OurPrice/text()").substring(1)));
+ this.setAttribute("total", total+parseFloat(dpath.xpathQuery("OfferSummary/LowestNewPrice/FormattedPrice/text()").substring(1)));
datapath.addNodeFromPointer(dpath);
</method>
<method name="removeItem" args="dpath">
- this.setAttribute("total", total-parseFloat(dpath.xpathQuery("OurPrice/text()").substring(1)));
+ this.setAttribute("total", total-parseFloat(dpath.xpathQuery("OfferSummary/LowestNewPrice/FormattedPrice/text()").substring(1)));
dpath.deleteNode();
</method>
</class>
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2006 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/branches/devildog/demos/amazon-soap/address.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon-soap/address.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon-soap/address.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -102,7 +102,7 @@
<view>
<simplelayout axis="x" spacing="4"/>
<mouseview resource="ok_butt">
- <method event="onclick">
+ <handler name="onclick">
parent.parent.form.datapath.updateData();
if (parent.parent.mode=="new") {
var dp=canvas.datasets.dsAddressList.getPointer();
@@ -110,14 +110,14 @@
dp.addNodeFromPointer( parent.parent.form.datapath );
}
parent.parent.done();
- </method>
+ </handler>
</mouseview>
<mouseview resource="cancel_butt" onclick="parent.parent.done();"/>
</view>
</class>
</library>
<!-- * 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/branches/devildog/demos/amazon-soap/amazon.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon-soap/amazon.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon-soap/amazon.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -69,10 +69,10 @@
<view name="progressBar" resource="splash_init_bar"
oninit="canvas.initdelay=400" pixellock="true" initstage="early">
- <method event="onpercentcreated" reference="canvas" args="p">
+ <handler name="onpercentcreated" reference="canvas" args="p">
var pp = Math.floor( 90*p );
canvas.splash_anim.stop( pp );
- </method>
+ </handler>
<attribute name="hasSplash" value="true" />
@@ -94,9 +94,9 @@
<view resource="laszlo_powered" x="276" y="13"
onmouseover="setResourceNumber(2)"
onmouseout="setResourceNumber(1)">
- <method event="onclick">
+ <handler name="onclick">
LzBrowser.loadURL("http://laszlosystems.com", "_blank");
- </method>
+ </handler>
</view>
</view>
@@ -129,25 +129,25 @@
<remotecall name="userAsinSearch" funcname="AsinSearchRequest"
remotecontext="$once{canvas.amazon}" dataobject="$once{dsCDInfo}"/>
- <method event="ondata" args="mydata">
+ <handler name="ondata" args="mydata">
recommend.setVisible( false );
cdinfo.setVisible( true );
cdinfo.bringToFront();
infoLoader.hide();
- </method>
- <method event="onerror" args="error">
+ </handler>
+ <handler name="onerror" args="error">
// two ways at getting data
Debug.write('ERROR:', error);
infoLoader.hide();
- </method>
- <method event="ontimeout">
+ </handler>
+ <handler name="ontimeout">
Debug.write( "timeout in dataset: dsCDInfo" );
infoLoader.hide();
- </method>
+ </handler>
<!-- When one item is clicked, a request is sent to Amazon for
deatailed informations about the item -->
- <method event="onclick">
+ <handler name="onclick">
<![CDATA[
infoLoader.show();
var obj = new canvas.amazon.proto.AsinRequest();
@@ -161,7 +161,7 @@
//amazon.proxy.AsinSearchRequest([ obj ], canvas.cdinfodelegate);
]]>
- </method>
+ </handler>
</view>
</view>
@@ -262,11 +262,11 @@
<view width="${parent.width}" height="${parent.height-20}"
datapath="Tracks" clip="true">
- <method event="ondata">
+ <handler name="ondata">
var dp = this.datapath;
var track = dp.xpathQuery('Track');
this.parent.setAnnotation( track.length );
- </method>
+ </handler>
<view y="8" x="8" width="${parent.width}">
<simplelayout axis="y"/>
@@ -292,11 +292,11 @@
<datapath xpath="Reviews[1]/CustomerReviews" pooling="true"/>
<simplelayout axis="y" spacing="0"/>
- <method event="ondata">
+ <handler name="ondata">
var dp = this.datapath;
var cr = dp.xpathQuery('CustomerReview'); // array of customer reviews
this.parent.parent.parent.setAnnotation( cr.length );
- </method>
+ </handler>
<!-- Repeated view displaying the list of customer review -->
@@ -338,11 +338,11 @@
<mouseview resource="search_butt" y="1" onclick="SOAPsearch()">
<inputtext id="searchKey" x="20" y="3" fontsize="11">
- <method event="onkeydown" args="k">
+ <handler name="onkeydown" args="k">
if (k==13) {
parent.SOAPsearch();
}
- </method>
+ </handler>
</inputtext>
<remotecall name="myKSR1" funcname="KeywordSearchRequest"
@@ -372,20 +372,20 @@
]]>
</method>
- <method event="ondata" args="data">
+ <handler name="ondata" args="data">
Debug.write('[1] dsKeyword got data:', data);
searchLoader.hide();
- </method>
+ </handler>
- <method event="onerror">
+ <handler name="onerror">
Debug.write( "onerror in dataset: dsKeyword" );
searchLoader.hide();
- </method>
+ </handler>
- <method event="ontimeout">
+ <handler name="ontimeout">
Debug.write( "ontimeout in dataset: dsKeyword" );
searchLoader.hide();
- </method>
+ </handler>
</mouseview>
@@ -599,7 +599,7 @@
</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/branches/devildog/demos/amazon-soap/classlib.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon-soap/classlib.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon-soap/classlib.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -60,7 +60,7 @@
onmousedown="setResourceNumber(classroot.opened=='true'?6:3)"
onmouseup="setResourceNumber(classroot.opened=='true'?4:1)">
<attribute name="resource" value="${classroot.tabresource}"/>
- <method event="onclick">
+ <handler name="onclick">
if (classroot.opened=="true") {
classroot.close();
classroot.opened="false";
@@ -68,17 +68,17 @@
classroot.open();
classroot.opened="true";
}
- </method>
+ </handler>
</view>
<vtabsliderbutton resource="slider_drag">
- <method event="onmousedown">
+ <handler name="onmousedown">
classroot.xdoffset = this.getMouse("x")
-( (canvas.width
-classroot.getAttributeRelative('x', canvas))
-classroot.width );
classroot.panelDragger.apply();
- </method>
- <method event="onmouseup">
+ </handler>
+ <handler name="onmouseup">
if ( !classroot.opened ) classroot.opened = 'true';
if ( classroot.width == parent.width ) {
// User has just closed the tab by dragging the panel
@@ -87,7 +87,7 @@
}
parent.tabButton.setResourceNumber(classroot.opened=='true'?4:1);
classroot.panelDragger.remove();
- </method>
+ </handler>
</vtabsliderbutton>
</view>
@@ -209,7 +209,7 @@
</class>
</library>
<!-- * 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/branches/devildog/demos/amazon-soap/creditcard.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon-soap/creditcard.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon-soap/creditcard.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -90,7 +90,7 @@
<view>
<simplelayout axis="x" spacing="4"/>
<mouseview resource="ok_butt">
- <method event="onclick">
+ <handler name="onclick">
parent.parent.form.datapath.retrieveData();
if (parent.parent.mode=="new") {
Debug.write("new");
@@ -99,7 +99,7 @@
dp.addNodeFromPointer( parent.parent.form.datapath );
}
parent.parent.done();
- </method>
+ </handler>
</mouseview>
<mouseview resource="cancel_butt" onclick="parent.parent.done();"/>
</view>
@@ -107,7 +107,7 @@
</library>
<!-- * 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/branches/devildog/demos/amazon-soap/recommendation.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon-soap/recommendation.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon-soap/recommendation.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -56,20 +56,20 @@
<remotecall name="userAsinSearchDetailed" funcname="AsinSearchRequest"
remotecontext="$once{canvas.amazon}" dataobject="$once{dsCDInfo}">
- <method event="ondata" args="mydata">
+ <handler name="ondata" args="mydata">
recommend.setVisible( false );
cdinfo.setVisible( true );
cdinfo.bringtofront();
infoLoader.hide();
- </method>
- <method event="onerror" args="error">
+ </handler>
+ <handler name="onerror" args="error">
Debug.write('ERROR:', error);
infoLoader.hide();
- </method>
- <method event="ontimeout">
+ </handler>
+ <handler name="ontimeout">
Debug.write( "timeout in dataset: dsCDInfo" );
infoLoader.hide();
- </method>
+ </handler>
</remotecall>
<method name="getInfo">
@@ -93,22 +93,22 @@
<remotecall name="userAsinSearchLite" funcname="AsinSearchRequest"
remotecontext="$once{canvas.amazon}" dataobject="$once{dsRecommend}">
- <method event="ondata" args="mydata">
+ <handler name="ondata" args="mydata">
infoLoader.hide();
- </method>
- <method event="onerror" args="error">
+ </handler>
+ <handler name="onerror" args="error">
Debug.write('ERROR:', error);
infoLoader.hide();
- </method>
- <method event="ontimeout">
+ </handler>
+ <handler name="ontimeout">
Debug.write( "timeout in dataset: dsCDInfo" );
infoLoader.hide();
- </method>
+ </handler>
</remotecall>
- <method event="onload" reference="canvas.amazon">
+ <handler name="onload" reference="canvas.amazon">
<![CDATA[
Debug.write("recommendations asin setup ");
var obj = new canvas.amazon.proto.AsinRequest();
@@ -122,7 +122,7 @@
Debug.write("recommendations asin search for "+obj.asin);
this.userAsinSearchLite.invoke([ obj ]);
]]>
- </method>
+ </handler>
<text y="20" x="10" fontstyle="bold" fontsize="16"
fgcolor="#666699">Your Recommendations:</text>
@@ -145,7 +145,7 @@
</library>
<!-- * 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/branches/devildog/demos/amazon-soap/soap-api.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/amazon-soap/soap-api.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/amazon-soap/soap-api.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,21 +1,21 @@
<library>
<soap name="amazon" wsdl="http://soap.amazon.com/schemas3/AmazonWebServices.wsdl">
- <method event="onload">
+ <handler name="onload">
Debug.write('-- ' + this.name + ':', this.proxy);
- </method>
+ </handler>
<!-- if error isn't handled by call, the error is propagated up to
soap -->
- <method event="onerror" args="error">
+ <handler name="onerror" args="error">
Debug.write('error:', error);
- </method>
+ </handler>
</soap>
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/demos/calendar/day.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/calendar/day.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/calendar/day.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -105,7 +105,9 @@
</view>
</view>
- <scrollbar visible="${scrollable}"/>
+ <state apply="${classroot.opened}">
+ <scrollbar visible="${scrollable}"/>
+ </state>
<view name="scrollview" visible="false">
<state name="scrollState" apply="false"
onapply="parent.bringToFront()">
Modified: openlaszlo/branches/devildog/demos/chat/chatlib.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/chat/chatlib.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/chat/chatlib.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -21,15 +21,15 @@
canvas.viewChat.chatPtr.addNode("message", null, { text: str, multiline: true } );
</method>
- <method event="onconnect">
+ <handler name="onconnect">
this.print("...connected...");
canvas.connected = true;
this.sendMessage("*", "", "userconnect");
canvas.viewPicker.setVisible(false);
canvas.viewChat.setVisible(true);
- </method>
+ </handler>
- <method event="onerror" args="error">
+ <handler name="onerror" args="error">
if (canvas.connected) {
this.print("...connection error...");
} else {
@@ -37,9 +37,9 @@
canvas.dialog.open();
}
canvas.connected = false;
- </method>
+ </handler>
- <method event="ontimeout">
+ <handler name="ontimeout">
if (canvas.connected) {
this.print("...connection timed out...");
} else {
@@ -47,18 +47,18 @@
canvas.dialog.open();
}
canvas.connected = false;
- </method>
+ </handler>
- <method event="ondisconnect">
+ <handler name="ondisconnect">
canvas.connected = false;
this.print("...disconnected...");
canvas.connection.logout();
- </method>
+ </handler>
- <method event="onuserdisconnect" args="user">
+ <handler name="onuserdisconnect" args="user">
this.getList('*');
this.print("user " + user + " disconnected");
- </method>
+ </handler>
<dataset name="message" />
<dataset name="userconnect" />
@@ -80,43 +80,43 @@
<datapointer name="chatPtr" xpath="chatDset:/" />
<datapointer xpath="connection:logoutDset:/*" >
- <method event="ondata">
+ <handler name="ondata">
canvas.myconnection.print("...logged out...");
canvas.viewPicker.setVisible(true);
canvas.viewChat.setVisible(false);
- </method>
- <method event="onerror">
+ </handler>
+ <handler name="onerror">
canvas.viewPicker.setVisible(true);
canvas.viewChat.setVisible(false);
- </method>
+ </handler>
</datapointer>
<datapointer xpath="myconnection:userconnect:/*">
- <method event="ondata">
+ <handler name="ondata">
var from = this.xpathQuery('/from[0]/@name');
this.parent.chatPtr.addNode("message", null,
{ text: "User " + from + " connected!" }
);
canvas.myconnection.getList('*');
- </method>
+ </handler>
</datapointer>
<datapointer xpath="myconnection:message:/*">
- <method event="ondata">
+ <handler name="ondata">
var from = this.xpathQuery('/from[0]/@name');
var mesg = this.xpathQuery('/text()');
this.parent.chatPtr.addNode("message", null,
{ text: from + ": " + mesg}
);
- </method>
+ </handler>
</datapointer>
<datapointer xpath="myconnection:sendMessageDset:/*[1]">
- <method event="onerror">
+ <handler name="onerror">
this.parent.chatPtr.addNode("message", null,
{ text: this.dataset.getErrorString() }
);
- </method>
+ </handler>
</datapointer>
<view width="387" height="287" x="29" y="39" bgcolor="#000000" />
@@ -190,7 +190,7 @@
<view name="viewPicker" x="20" y="20">
<datapointer xpath="connection:loginDset:/login[1]/authentication[1]/response[1]">
- <method event="ondata">
+ <handler name="ondata">
var rt = this.getNodeAttribute('type');
var usr = this.getNodeAttribute('usr');
@@ -202,17 +202,17 @@
canvas.dialog.setAttribute('text', "bad login status: " + status);
canvas.dialog.open();
}
- </method>
+ </handler>
- <method event="onerror">
+ <handler name="onerror">
canvas.dialog.setAttribute('text', "problems contacting authentication server");
canvas.dialog.open();
- </method>
+ </handler>
- <method event="ontimeout">
+ <handler name="ontimeout">
canvas.dialog.setAttribute('text', "authentication server time out");
canvas.dialog.open();
- </method>
+ </handler>
</datapointer>
@@ -245,14 +245,14 @@
<text width="400" height="200" selectable="true"
multiline="true" >
<datapointer xpath="dsetHost:/info[1]/host[1]">
- <method event="ondata">
+ <handler name="ondata">
var surl = LzBrowser.getLoadURL();
var url = new LzURL(surl);
url.host = this.getNodeAttribute('name');
url.query = null;
parent.setText("Chat with other users by having them browse to:\n\n "
+ url.toString() );
- </method>
+ </handler>
</datapointer>
</text>
<simplelayout axis="y" spacing="3" />
@@ -260,15 +260,15 @@
</view> <!-- name=viewPicker -->
- <method event="onkeyup" reference="LzKeys" args="k">
+ <handler name="onkeyup" reference="LzKeys" args="k">
if ( k == 13 ) {
bSend.inputhandler();
}
- </method>
+ </handler>
</library>
<!-- * 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/branches/devildog/demos/lzpix/classes/dataman.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/classes/dataman.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/classes/dataman.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -226,6 +226,10 @@
<!--
* X_LZ_COPYRIGHT_BEGIN ****************************************************
+<<<<<<< .working
* Copyright 2006, 2008 Laszlo Systems, Inc. All Rights Reserved. *
+=======
+* Copyright 2008 Laszlo Systems, Inc. All Rights Reserved. *
+>>>>>>> .merge-right.r8400
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ******************************************************-->
Modified: openlaszlo/branches/devildog/demos/lzpix/classes/notes.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/classes/notes.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/classes/notes.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,7 @@
<!--
* X_LZ_COPYRIGHT_BEGIN ****************************************************
* Copyright 2006, 2008 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ******************************************************-->
<library>
Modified: openlaszlo/branches/devildog/demos/lzpix/classes/test/test-dataman.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/classes/test/test-dataman.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/classes/test/test-dataman.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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,11 +17,11 @@
argvalue:"27412496 at N00"}
]
gDataMan.doFlickrRequest(photods, argobj);
- </method-->
+ </handler-->
<class name="photolist">
<text datapath="@title" resize="true"/>
- <method event="onclick">
+ <handler name="onclick">
///
// display image
@@ -46,7 +46,7 @@
]
gDataMan.doFlickrRequest(infods, argobj);
- </method>
+ </handler>
</class>
<class name="box" >
@@ -64,9 +64,9 @@
<view bgcolor="black" width="${parent.width - 2}" height="1" x="1" y="1" opacity=".5" />
<view bgcolor="black" width="1" height="${parent.height - 3}" x="1" y="2" opacity=".5" />
<inputtext name="txt" y="2" x="5" width="${parent.width - 5}" >
- <method event="onfocus" >
+ <handler name="onfocus" >
this.parent.setAttribute('opacity',1);
- </method>
+ </handler>
</inputtext>
</box>
@@ -86,7 +86,7 @@
<view id="photo" >
<note datapath="infods:/rsp/photo/notes/note" width="0" height="0" x="10" y="10">
- <method event="ondata" args="d" ><![CDATA[
+ <handler name="ondata" args="d" ><![CDATA[
var dp = this.datapath;
this.txtborder.txt.setText( dp.xpathQuery('text()') );
this.setX(Number(dp.xpathQuery('@x')));
@@ -97,7 +97,7 @@
this.setWidth(Number(dp.xpathQuery('@w')));
this.setHeight(Number(dp.xpathQuery('@h')));
*/
- ]]></method>
+ ]]></handler>
</note>
</view>
@@ -123,9 +123,9 @@
</view>
<simplelayout />
- <method event="ondata" args="d" >
+ <handler name="ondata" args="d" >
Debug.write("ondata",d);
- </method>
+ </handler>
</view>
<!--
@@ -135,7 +135,7 @@
<text>enter comma-delieated list of tags here</text>
<edittext name="it" width="100%" text="Garden Statues"/>
<button text="search for tagged photos">
- <method event="onclick">
+ <handler name="onclick">
var argobj = [
{argname:"method",
argvalue:"flickr.photos.search"},
@@ -143,9 +143,15 @@
argvalue:parent.it.getText()}
]
gDataMan.doFlickrRequest(photods, argobj);
- </method>
+ </handler>
</button>
<simplelayout />
</window>
<simplelayout axis="x" spacing="5" />
-</canvas>
\ No newline at end of file
+</canvas>
+<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
+* 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
Modified: openlaszlo/branches/devildog/demos/lzpix/test-button.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/test-button.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/test-button.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,7 @@
<!--
* X_LZ_COPYRIGHT_BEGIN ****************************************************
-* Copyright 2006, 2008 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2007-2008 Laszlo Systems, Inc. All Rights Reserved. *
+>>>>>>> .merge-right.r8400
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ******************************************************-->
<canvas title="test-button.lzx">
Modified: openlaszlo/branches/devildog/demos/lzpix/test-url.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/test-url.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/test-url.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,6 @@
<!--
* X_LZ_COPYRIGHT_BEGIN ****************************************************
-* Copyright 2006, 2008 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2006-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ******************************************************-->
<canvas title="test-urldisplay">
Modified: openlaszlo/branches/devildog/demos/lzpix/tests/pivoylayout-test.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/tests/pivoylayout-test.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/tests/pivoylayout-test.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -130,3 +130,8 @@
<button text="animate pivot_y" onclick="canvas.vw.lyt.animate('pivot_y',100,300)" />
</view>
</canvas>
+<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
+* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
+* Use is subject to license terms. *
+* X_LZ_COPYRIGHT_END ****************************************************** -->
+
Modified: openlaszlo/branches/devildog/demos/lzpix/tests/test-auth.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/tests/test-auth.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/tests/test-auth.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -25,3 +25,8 @@
</text>
</canvas>
+<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
+* 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
Modified: openlaszlo/branches/devildog/demos/lzpix/views/error.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpix/views/error.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpix/views/error.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -24,6 +24,6 @@
</view>
<!--
* X_LZ_COPYRIGHT_BEGIN ****************************************************
-* Copyright 2006, 2008 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2006-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ******************************************************-->
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboard.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboard.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboard.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,10 +1,10 @@
<library>
<class name="clipboardlayout" extends="layout" >
- <method event="oninit" >
+ <handler name="oninit" >
this.updateDelegate.register( parent, "onheight" );
this.updateDelegate.register( parent, "onwidth" );
- </method>
+ </handler>
<method name="update" >
if ( this.locked ) return;
@@ -17,13 +17,13 @@
<include href="photocollection.lzx" />
<class name="clipboardphoto" extends="photo" border="1"
width="30" height="30" clipfactor="1">
- <method event="oninit">
+ <handler name="oninit">
shadow.setVisible( false );
- </method>
+ </handler>
<!-- Clicking on a photo in the clipboard brings that photo into
details view. The animation is a bit odd, because the photo thumbnail
is probably not visible in the album layout. -->
- <method event="onclick">
+ <handler name="onclick">
canvas.details.setImage( this.getImageURL('t'), this.getImageURL('') );
if (photoscontainer.lyt.isgrid) {
photoscontainer.transitionToDetails(this);
@@ -31,7 +31,7 @@
photoscontainer.showPhotoDetails( true, this );
}
photoscontainer.detailphoto = this;
- </method>
+ </handler>
</class>
<class name="clipboard" oninit="this.update()" >
@@ -121,9 +121,9 @@
this.setAttribute('isopen', !this.isopen);
</method>
- <method event="onstop" reference="anm_close" >
+ <handler name="onstop" reference="anm_close" >
scrn.setVisible(false);
- </method>
+ </handler>
</class>
</library>
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboardinterior.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboardinterior.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/clipboardinterior.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,17 +1,17 @@
<photocollection name="interior" bgcolor="0xf0f0f0" clip="true"
- photoclass="clipboardphoto" clickable="true">
- <method event="oninit">
+ photoclass="lz.clipboardphoto" clickable="true">
+ <handler name="oninit">
LzTrack.register( this , 'photos' );
- </method>
+ </handler>
<attribute name="amtrackedover" value="false"/>
- <method event="onmousetrackover">
+ <handler name="onmousetrackover">
this.setAttribute( "amtrackedover", true );
- </method>
- <method event="onmousetrackout">
+ </handler>
+ <handler name="onmousetrackout">
this.setAttribute( "amtrackedover", false );
- </method>
+ </handler>
<wrappinglayout axis="x" yinset="3" xinset="3" spacing="3"/>
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/favorites.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/favorites.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/favorites.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -23,9 +23,9 @@
<attribute name="mymask" when="once"/>
- <method event="oninit">
+ <handler name="oninit">
this.updateDelegate.register( parent, "onx" );
- </method>
+ </handler>
<!--- @keywords private -->
<method name="setAxis" args="a" >
@@ -104,7 +104,7 @@
</method>
<!--- @keywords private -->
- <method event="onmousedown">
+ <handler name="onmousedown">
var now = new Date();
this._lasttime = now.getTime();
this.isMouseDown = true;
@@ -112,12 +112,12 @@
this.stillDownDelegate = new LzDelegate( this, "stillDownEventGenerator");
}
LzTimer.addTimer( this.stillDownDelegate, 500 );
- </method>
+ </handler>
<!--- @keywords private -->
- <method event= "onmouseup">
+ <handler name= "onmouseup">
this.isMouseDown=false;
LzTimer.removeTimer( this.stillDownDelegate );
- </method>
+ </handler>
</class>
?>
@@ -141,23 +141,23 @@
<?ignore // Take out buttons to scroll favorites. Should be temporary. [ben 3.2.2006]
<buttonrepeater name="scrollright" resource="../assets/favorites/arrow-left.png"
x="${-width-5}" y="${Math.round((parent.photos.height - this.height)/2) + parent.photos.y}">
- <method event="onmousestilldown" >
+ <handler name="onmousestilldown" >
parent.photos.interior.animate( 'x', Math.min(parent.photos.interior.x + 30,0), 300 )
- </method>
- <method event="onmouseup" >
+ </handler>
+ <handler name="onmouseup" >
parent.photos.interior.animate( 'x', Math.min(parent.photos.interior.x + 30,0), 100 )
- </method>
+ </handler>
</buttonrepeater>
<buttonrepeater name="scrollleft" resource="../assets/favorites/arrow-right.png"
x="${parent.width + 5}" y="${Math.round((parent.photos.height - this.height)/2) + parent.photos.y}" >
- <method event="onmousestilldown" >
+ <handler name="onmousestilldown" >
parent.photos.interior.animate( 'x', parent.photos.interior.x - 30 , 300 )
- </method>
- <method event="onmouseup" >
+ </handler>
+ <handler name="onmouseup" >
parent.photos.interior.animate( 'x', parent.photos.interior.x - 30 , 100 )
- </method>
+ </handler>
</buttonrepeater>
?>
@@ -170,11 +170,11 @@
<favoriteslayout name="lyt" spacing="15" inset="0"
mymask="parent.parent"/>
<photo datapath="favoritesds:/rsp/photos/photo">
- <method event="onclick">
+ <handler name="onclick">
var id = datapath.p.getAttr("id");
var tag = datapath.p.getAttr("favoritetag");
classroot.loadSet( tag );
- </method>
+ </handler>
</photo>
</view>
</view>
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/linkbutton.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/linkbutton.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/linkbutton.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -11,9 +11,9 @@
<mybutton
resource="transparent_rsc"
width="${parent.width}" height="${parent.height}" >
- <method event="onclick">
+ <handler name="onclick">
LzBrowser.loadURL( parent.url, parent.targetframe, parent.windowopts);
- </method>
+ </handler>
</mybutton>
</class>
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/notes.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/notes.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/notes.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -77,15 +77,15 @@
<!-- Sets the note's view position and dimensions to match the flickr note.
Scale these to match the scale of the image -->
- <method event="ondata" args="d" > <![CDATA[
+ <handler name="ondata" args="d" > <![CDATA[
if ( !d ) return;
updateDimensions();
- ]]></method>
+ ]]></handler>
<datapointer name="size_dp" />
- <method event="ondata" reference="sizeds" args="d"><![CDATA[
+ <handler name="ondata" reference="sizeds" args="d"><![CDATA[
var dpw = size_dp.setXPath("sizeds:/rsp/sizes/size[1]");
var nname = size_dp.getNodeAttribute("label");
// Debug.write("got size info: ", d);
@@ -104,12 +104,12 @@
this.updateDimensions();
}
- ]]></method>
+ ]]></handler>
- <method event="onheight" reference="gPhV">
+ <handler name="onheight" reference="gPhV">
// Debug.write("onheight");
updateDimensions();
- </method>
+ </handler>
<method name="updateDimensions"><![CDATA[
if ( originalwidth <= 0 ) return;
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/photocollection.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/photocollection.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/photocollection.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -6,7 +6,7 @@
<library>
<class name="photocollection">
- <attribute name="photoclass" value="photo" when="once"/>
+ <attribute name="photoclass" value="lz.photo" when="once"/>
<attribute name="activephotos" value="$once{ [] }"/>
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/spinner.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/spinner.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/spinner.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -8,13 +8,13 @@
<class name="spinner" resource="spinner_rsc" onclick="this.play()" visible="false" >
<attribute name="counter" value="1" />
- <method event="onidle" reference="LzIdle" >
+ <handler name="onidle" reference="LzIdle" >
if (! this.visible ) return;
this.setAttribute('counter', ( this.counter + 1)%6);
if ( this.counter == 0 ) {
var f = (this.frame + 1)%6;
this.setAttribute('frame', f == 0 ? 6 : f);
}
- </method>
+ </handler>
</class>
</library>
Modified: openlaszlo/branches/devildog/demos/lzpixmobile/classes/test/test-dataman.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/lzpixmobile/classes/test/test-dataman.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/lzpixmobile/classes/test/test-dataman.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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,11 +22,11 @@
argvalue:"27412496 at N00"}
]
gDataMan.doFlickrRequest(photods, argobj);
- </method-->
+ </handler-->
<class name="photolist">
<text datapath="@title" resize="true"/>
- <method event="onclick">
+ <handler name="onclick">
///
// display image
@@ -51,7 +51,7 @@
]
gDataMan.doFlickrRequest(infods, argobj);
- </method>
+ </handler>
</class>
<class name="box" >
@@ -69,9 +69,9 @@
<view bgcolor="black" width="${parent.width - 2}" height="1" x="1" y="1" opacity=".5" />
<view bgcolor="black" width="1" height="${parent.height - 3}" x="1" y="2" opacity=".5" />
<inputtext name="txt" y="2" x="5" width="${parent.width - 5}" >
- <method event="onfocus" >
+ <handler name="onfocus" >
this.parent.setAttribute('opacity',1);
- </method>
+ </handler>
</inputtext>
</box>
@@ -91,7 +91,7 @@
<view id="photo" >
<note datapath="infods:/rsp/photo/notes/note" width="0" height="0" x="10" y="10">
- <method event="ondata" args="d" ><![CDATA[
+ <handler name="ondata" args="d" ><![CDATA[
var dp = this.datapath;
this.txtborder.txt.setText( dp.xpathQuery('text()') );
this.setX(Number(dp.xpathQuery('@x')));
@@ -102,7 +102,7 @@
this.setWidth(Number(dp.xpathQuery('@w')));
this.setHeight(Number(dp.xpathQuery('@h')));
*/
- ]]></method>
+ ]]></handler>
</note>
</view>
@@ -128,9 +128,9 @@
</view>
<simplelayout />
- <method event="ondata" args="d" >
+ <handler name="ondata" args="d" >
Debug.write("ondata",d);
- </method>
+ </handler>
</view>
<!--
@@ -140,7 +140,7 @@
<text>enter comma-delieated list of tags here</text>
<edittext name="it" width="100%" text="Garden Statues"/>
<button text="search for tagged photos">
- <method event="onclick">
+ <handler name="onclick">
var argobj = [
{argname:"method",
argvalue:"flickr.photos.search"},
@@ -148,7 +148,7 @@
argvalue:parent.it.getText()}
]
gDataMan.doFlickrRequest(photods, argobj);
- </method>
+ </handler>
</button>
<simplelayout />
</window>
Modified: openlaszlo/branches/devildog/demos/vacation-survey/vacation-survey.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/vacation-survey/vacation-survey.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/vacation-survey/vacation-survey.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -67,9 +67,9 @@
<radiobutton value="'trenton'">Trenton</radiobutton>
</radiogroup>
<button isdefault="true">Vote
- <method event="onclick" >
+ <handler name="onclick" >
surveysubmit.submit();
- </method>
+ </handler>
</button>
</form>
</view>
@@ -127,10 +127,10 @@
<box id="results" x="0" bgcolor="#787878" border="2" visible="false" >
<attribute name="status"
value="$path{'surveydataset:/response/@status'}" />
- <method event="oninit">
+ <handler name="oninit">
survey.bringToFront();
- </method>
- <method event="onstatus">
+ </handler>
+ <handler name="onstatus">
if (this.status == null) {
return;
}
@@ -143,7 +143,7 @@
} else {
this.animate('x', -survey.width - 2, 1500, false);
}
- </method>
+ </handler>
<view x="2" y="2" >
<simplelayout axis="y" />
@@ -195,13 +195,13 @@
id="errors"
text="$path{ '/response/@status' }"
datapath="surveydataset:/">
- <method event="ontext">
+ <handler name="ontext">
<![CDATA[
if ( this.text != null && this.text != 'ok' ){
this.open();
}
]]>
- </method>
+ </handler>
</myalert>
<!-- An alert that fires when the app has problems getting -->
@@ -213,16 +213,16 @@
<myalert title="Problem connecting to server"
id="problems">
<attribute name="status" value="${surveysubmit.status}" />
- <method event="ontext"><![CDATA[
+ <handler name="ontext"><![CDATA[
if ( this.text != null && this.text != "" &&
this.text != 'ok' && this.text != 'requesting' ){
this.open();
}
- ]]></method>
+ ]]></handler>
</myalert>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2006 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/branches/devildog/demos/weather/weather.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/weather/weather.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/weather/weather.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -4,7 +4,7 @@
<!-- -->
<!-- Laszlo Application Language (LZX) Example -->
<!-- -->
-<!-- Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. Use -->
+<!-- Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. Use -->
<!-- is subject to license terms. -->
<!--=======================================================================-->
@@ -96,17 +96,17 @@
<!-- the 'onopenstart' event is sent by the tabelement class' -->
<!-- there is also an 'onopenstop' that is not used in this weather -->
<!-- example -->
- <method event="onopenstart">
+ <handler name="onopenstart">
this.top.bg.animate("opacity",.33,333,false);
this.top.titlebox.setColor(0xFFFFFF);
- </method>
+ </handler>
<!-- the 'onclosestart' event is sent by the tabelement class' there -->
<!-- is also an 'onclosestop' that is not used in this example -->
- <method event="onclosestart">
+ <handler name="onclosestart">
this.top.bg.animate("opacity",1,333,false);
this.top.titlebox.setColor(0xCAD0EC);
- </method>
+ </handler>
</class>
<!-- CLASS: weatherSummary -->
@@ -147,11 +147,11 @@
x="15" y="7"><b>Enter Zip Code:</b></text>
<edittext id="zipcode" fontstyle="bold" font="Tahoma,Geneva,sans-serif"
width="80" x="120" y="5" height="20">
- <method event="onkeydown" args="key">
+ <handler name="onkeydown" args="key">
if (key == 13) {
weatherApp.loadWeather();
}
- </method>
+ </handler>
</edittext>
<text width="240" fgcolor="#222222" x="206" y="7">
<b>OK</b>
@@ -287,10 +287,10 @@
</view>
</weathertab>
- <method event="oninit">
+ <handler name="oninit">
// open "Tab1" as the default
this.openTab(tab1,true)
- </method>
+ </handler>
<datapointer xpath="weatherdata:/*" ondata="processData();"
onerror="showError();"
Modified: openlaszlo/branches/devildog/demos/weatherblox/weather_component.lzx
===================================================================
--- openlaszlo/branches/devildog/demos/weatherblox/weather_component.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/demos/weatherblox/weather_component.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,6 @@
<!-- * 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
****************************************************** -->
@@ -60,9 +60,9 @@
<view name="headlogo" resource="assets/laszlo_weather_logo.png"
x="5" stretches="both" width="${resourcewidth / 2}"
height="${resourceheight / 2}">
- <method event="onclick">
+ <handler name="onclick">
LzBrowser.loadURL('http://www.laszlosystems.com', '_blank');
- </method>
+ </handler>
</view>
<view width="1" height="${parent.headlogo.height}"
@@ -76,11 +76,11 @@
<view x="${parent.enterzip.x + 5}" y="${parent.headlogo.height - this.height - 5}">
<simplelayout spacing="6" axis="x"/>
<edittext id="zipcode" width="55" height="22">
- <method event="onkeydown" args="key">
+ <handler name="onkeydown" args="key">
if(key == 13){
weatherApp.loadWeather();
}
- </method>
+ </handler>
</edittext>
<multistatebutton name="okButton" resource="okeydokey" statenum="0"
statelength="3" maxstate="1" y="3"
@@ -100,11 +100,11 @@
text_x="20"
fontstyle="bold"
contentopacity=".8">
- <method event="onselect">
+ <handler name="onselect">
weatherContent.tab1.arrow.animate("rotation", 0, 500, false);
weatherContent.tab2.arrow.animate("rotation", -90, 250, false);
weatherContent.tab3.arrow.animate("rotation", -90, 250, false);
- </method>
+ </handler>
<view name="arrow" resource="assets/arrow_open.png"
placement="header" x="${this.xoffset + 5}" y="${this.yoffset + 5}" opacity="1"
xoffset="${this.width / 2}" yoffset="${this.width / 2}"/>
@@ -169,11 +169,11 @@
</tabelement>
<tabelement name="tab2" text="Radar Maps" text_x="20" fontstyle="bold">
- <method event="onselect">
+ <handler name="onselect">
weatherContent.tab1.arrow.animate("rotation", -90, 250, false);
weatherContent.tab2.arrow.animate("rotation", 0, 500, false);
weatherContent.tab3.arrow.animate("rotation", -90, 250, false);
- </method>
+ </handler>
<view name="arrow" resource="assets/arrow_open.png"
placement="header" x="${this.xoffset + 5}" y="${this.yoffset + 5}" opacity="1"
xoffset="${this.width / 2}" yoffset="${this.width / 2}" rotation="-90"/>
@@ -195,11 +195,11 @@
</tabelement>
<tabelement name="tab3" text="Forecast" text_x="20" fontstyle="bold">
- <method event="onselect">
+ <handler name="onselect">
weatherContent.tab1.arrow.animate("rotation", -90, 250, false);
weatherContent.tab2.arrow.animate("rotation", -90, 250, false);
weatherContent.tab3.arrow.animate("rotation", 0, 500, false);
- </method>
+ </handler>
<view name="arrow" resource="assets/arrow_open.png"
placement="header" x="${this.xoffset + 5}" y="${this.yoffset + 5}" opacity="1"
xoffset="${this.width / 2}" yoffset="${this.width / 2}"/>
@@ -224,9 +224,9 @@
</view>
<view resource="assets/poweredby.swf" x="${(parent.width - this.width) / 2}"
y="${canvas.height - this.height - 5}">
- <method event="onclick">
+ <handler name="onclick">
LzBrowser.loadURL('http://www.blogbox.com', '_blank');
- </method>
+ </handler>
</view>
</class>
Modified: openlaszlo/branches/devildog/docs/src/nav/toc.xml
===================================================================
--- openlaszlo/branches/devildog/docs/src/nav/toc.xml 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/docs/src/nav/toc.xml 2008-03-25 23:23:22 UTC (rev 8410)
@@ -102,7 +102,6 @@
<category title="HTML Markup">
- <item title="LzTextFormat" href="lz.LzTextFormat.html" />
<item title="a" href="tag-a.html"/>
<item title="b" href="tag-b.html"/>
<item title="br" href="tag-br.html"/>
@@ -111,12 +110,13 @@
<item title="img" href="tag-img.html"/>
<item title="p" href="tag-p.html"/>
<item title="pre" href="tag-pre.html"/>
+ <item title="textformat" href="lz.textformat.html" />
<item title="u" href="tag-u.html"/>
</category>
<category title="Media" >
<item title="audio" href="tag-audio.html"/>
- <!-- TODO: [2008-01-28 dda] <item title="font (LzFont)" href="lz.LzFont.html" /> -->
+ <item title="font" href="LzFont.html" />
<item title="face" href="tag-face.html"/>
<item title="frame" href="tag-frame.html"/>
<item title="image" href="lz.image.html"/>
@@ -222,7 +222,42 @@
</category>
<category title="Charts and Graphs">
- <item title="TODO [LPP-4935]" />
+ <item title="axisstyle" href="lz.axisstyle.html"/>
+ <item title="barchart" href="lz.barchart.html"/>
+ <item title="basestyle" href="lz.basestyle.html"/>
+ <item title="chart" href="lz.chart.html"/>
+ <item title="chartbgstyle" href="lz.chartbgstyle.html"/>
+ <item title="chartstyle" href="lz.chartstyle.html"/>
+ <item title="axis" href="lz.axis.html"/>
+ <item title="columnchart" href="lz.columnchart.html"/>
+ <item title="datacolumn" href="lz.datacolumn.html"/>
+ <item title="datamarker" href="lz.datamarker.html"/>
+ <item title="datalabel" href="lz.datalabel.html"/>
+ <item title="dataseries" href="lz.dataseries.html"/>
+ <item title="datastyle" href="lz.datastyle.html"/>
+ <item title="datastylelist" href="lz.datastylelist.html"/>
+ <item title="datatip" href="lz.datatip.html"/>
+ <item title="horizontalaxis" href="lz.horizontalaxis.html"/>
+ <item title="label" href="lz.label.html"/>
+ <item title="labelstyle" href="lz.labelstyle.html"/>
+ <item title="legend" href="lz.legend.html"/>
+ <item title="linechart" href="lz.linechart.html"/>
+ <item title="linestyle" href="lz.linestyle.html"/>
+ <item title="piechart" href="lz.piechart.html"/>
+ <item title="piechartplotarea" href="lz.piechartplotarea.html"/>
+ <item title="plotstyle" href="lz.plotstyle.html"/>
+ <item title="pointstyle" href="lz.pointstyle.html"/>
+ <item title="rectangularchart" href="lz.rectangularchart.html"/>
+ <item title="regionstyle" href="lz.regionstyle.html"/>
+ <item title="tickstyle" href="lz.tickstyle.html"/>
+ <item title="valueline" href="lz.valueline.html"/>
+ <item title="valuelinestyle" href="lz.valuelinestyle.html"/>
+ <item title="valuepoints" href="lz.valuepoints.html"/>
+ <item title="valuepointstyle" href="lz.valuepointstyle.html"/>
+ <item title="valueregion" href="lz.valueregion.html"/>
+ <item title="valueregionstyle" href="lz.valueregionstyle.html"/>
+ <item title="verticalaxis" href="lz.verticalaxis.html"/>
+ <item title="zoomarea" href="lz.zoomarea.html"/>
</category>
<category title="Audio Video">
Modified: openlaszlo/branches/devildog/docs/src/reference/wrappers.xml
===================================================================
--- openlaszlo/branches/devildog/docs/src/reference/wrappers.xml 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/docs/src/reference/wrappers.xml 2008-03-25 23:23:22 UTC (rev 8410)
@@ -207,9 +207,9 @@
<tagname>text</tagname>.</p>
<example>
-<canvas height="30">
+<canvas height="100">
<text multiline="true">
- <p>A pararaph.</p>
+ <p>A paragraph.</p>
<p>Another one.</p>
</text>
</canvas>
Modified: openlaszlo/branches/devildog/docs/src/xsl/lzx2js2doc.xsl
===================================================================
--- openlaszlo/branches/devildog/docs/src/xsl/lzx2js2doc.xsl 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/docs/src/xsl/lzx2js2doc.xsl 2008-03-25 23:23:22 UTC (rev 8410)
@@ -68,6 +68,12 @@
<xsl:param name="path"/>
<xsl:param name="unitid"/>
<xsl:if test="contains($path,'library.lzx')">
+ <!-- TODO [dda 2008-03-24] handle include href="../xxx/name.lzx"
+ To do that, need to create a URI for the parent directory,
+ and pass that as a second arg to document().
+ For now, we require (for doc) that there be at least one
+ 'straight' include of each doc without ..
+ -->
<xsl:variable name="doc" select="document(@href)"/>
<xsl:variable name="newpath" select="concat(substring-before($path,'library.lzx'), at href)"/>
<xsl:apply-templates select="$doc" mode="nested">
Modified: openlaszlo/branches/devildog/examples/components/datacombobox_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/datacombobox_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/datacombobox_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -66,10 +66,10 @@
<view name="stylechooser" layout="axis:x; spacing:4">
<text>Style:</text>
<datacombobox width="120" itemdatapath="styles:/item/">
- <method event="onselect">
+ <handler name="onselect">
var colorchoice = this.getValue();
canvas[colorchoice].setAttribute("isdefault", true);
- </method>
+ </handler>
</datacombobox>
</view>
@@ -99,7 +99,7 @@
</view>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2006 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/branches/devildog/examples/components/floatinglist_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/floatinglist_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/floatinglist_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -19,9 +19,9 @@
<fflist name="flist" />
- <method event="onclick">
+ <handler name="onclick">
flist.setVisible(!flist.visible);
- </method>
+ </handler>
<method name="animate">
genwaypoint();
@@ -47,20 +47,20 @@
<animator name="xanim" start="false" attribute="x" to="${classroot.nextX}" duration="3000">
<attribute name="cycle" value="true"/>
- <method event="onstop">
+ <handler name="onstop">
classroot.genwaypoint();
if (cycle) {
this.doStart();
}
- </method>
+ </handler>
</animator>
<animator name="yanim" start="false" attribute="y" to="${classroot.nextY}" duration="3000">
<attribute name="cycle" value="true"/>
- <method event="onstop">
+ <handler name="onstop">
if (cycle) {
this.doStart();
}
- </method>
+ </handler>
</animator>
</class>
@@ -68,13 +68,13 @@
<textlistitem datapath="items:/item"
text='$path{"text()"}'
value='$path{"@value"}'/>
- <method event="onx" reference="owner">
+ <handler name="onx" reference="owner">
updateAttachLocation();
if (!visible) setVisible(true);
- </method>
- <method event="ony" reference="owner">
+ </handler>
+ <handler name="ony" reference="owner">
updateAttachLocation();
- </method>
+ </handler>
</class>
<view name="content" height="${canvas.height}" width="${canvas.width}">
@@ -133,7 +133,7 @@
height="${canvas.height-40}" width="1"/>
</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/branches/devildog/examples/components/grid_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/grid_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/grid_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -34,16 +34,16 @@
<attribute name="datasel"
value="${ workdef == '1' ? 2 : 1 }"/>
- <method event="ondatasel" name="checkDataSel">
+ <handler name="ondatasel" name="checkDataSel">
if ( !this._initcomplete ) return;
this.selectItem( datasel );
- </method>
+ </handler>
- <method event="oninit">
+ <handler name="oninit">
this.checkDataSel();
- </method>
+ </handler>
- <method event="onselect">
+ <handler name="onselect">
if ( this.value == 1 ){
this.workdef = 0;
this.homedef = 1;
@@ -52,7 +52,7 @@
this.homedef = 0;
}
this.datapath.updateData();
- </method>
+ </handler>
<radiobutton value="1"
onmouseover="parent.immediateparent.domouseover()"
@@ -81,7 +81,7 @@
</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/branches/devildog/examples/components/list_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/list_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/list_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -47,15 +47,15 @@
</list>
<button height="20">Clear Selection
- <method event="onclick">
+ <handler name="onclick">
var val = a3.clearSelection();
- </method>
+ </handler>
</button>
<button height="20">Get Value
- <method event="onclick">
+ <handler name="onclick">
var val = a3.getValue();
a1val.setText(val);
- </method>
+ </handler>
</button>
<text multiline="true" id="a1val" width="200" height="60"/>
</view>
@@ -109,7 +109,7 @@
</view>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/examples/components/menu_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/menu_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/menu_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -106,9 +106,9 @@
<menuitem text="item 1" />
<menuitem text="item 2" />
</menu>
- <method event="onmousedown">
+ <handler name="onmousedown">
this.foo.setOpen(true);
- </method>
+ </handler>
</button>
<button text="openMenu right" width="110" >
@@ -116,9 +116,9 @@
<menuitem text="item 1" />
<menuitem text="item 2" />
</menu>
- <method event="onmousedown">
+ <handler name="onmousedown">
this.foo.setOpen(true);
- </method>
+ </handler>
</button>
<button text="openMenu below" width="110">
@@ -131,9 +131,9 @@
</menu>
</menuitem>
</menu>
- <method event="onmousedown">
+ <handler name="onmousedown">
this.foo.setOpen(true);
- </method>
+ </handler>
</button>
<button text="openMenu left" width="110">
@@ -141,9 +141,9 @@
<menuitem text="item 1" />
<menuitem text="item 2" />
</menu>
- <method event="onmousedown">
+ <handler name="onmousedown">
this.foo.setOpen(true);
- </method>
+ </handler>
</button>
<wrappinglayout spacing="120" axis="x" />
@@ -151,7 +151,7 @@
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/examples/components/slider_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/slider_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/slider_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -14,23 +14,23 @@
<simplelayout/>
<text>minValue</text>
<edittext name="minValueField" text="${theslider.minvalue}">
- <method event="onblur">
+ <handler name="onblur">
canvas.theslider.setMinValue(getText());
- </method>
+ </handler>
</edittext>
<text>maxValue</text>
<edittext name="maxValueField" text="${theslider.maxvalue}">
- <method event="onblur">
+ <handler name="onblur">
canvas.theslider.setMaxValue(getText());
- </method>
+ </handler>
</edittext>
<text>Value</text>
<edittext name="valueField" text="${theslider.value}">
- <method event="onblur">
+ <handler name="onblur">
canvas.theslider.setValue(getText());
- </method>
+ </handler>
</edittext>
</view>
<view x="150" y="20">
@@ -42,7 +42,7 @@
</view>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/examples/components/style_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/style_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/style_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -28,10 +28,10 @@
<view name="stylechooser" layout="axis:x; spacing:4">
<text>Style:</text>
<combobox width="120" editable="false">
- <method event="onselect">
+ <handler name="onselect">
var colorchoice = this.getText();
canvas[colorchoice+'colors'].setAttribute("isdefault", true);
- </method>
+ </handler>
<textlistitem text="silver" />
<textlistitem text="green" />
@@ -184,7 +184,7 @@
</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/branches/devildog/examples/components/testmedia/frosty.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/testmedia/frosty.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/testmedia/frosty.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,7 +1,7 @@
<view name="frosty">
- <method event="oninit">
+ <handler name="oninit">
//Debug.write("Frosty's parent: " + this.parent);
- </method>
+ </handler>
<text multiline="true"
x="6"
height="450" width="420">
@@ -34,7 +34,7 @@
</text>
</view>
<!-- * 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/branches/devildog/examples/components/tree_example.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/components/tree_example.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/components/tree_example.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -62,7 +62,7 @@
<tree style="goldcolors" datapath="mydata:/basket" open="$path{'@isopen'}"
text="$path{'@name'}" multiselect="true">
<tree id="xxx" style="goldcolors" datapath="*" text="$path{'@name'}" isleaf="$path{'@isleaf'}" >
- <method event="onactivate">
+ <handler name="onactivate">
if (this.isleaf) {
var url = this.datapath.xpathQuery('@url');
if (url != null) {
@@ -71,7 +71,7 @@
this.viewInWindow('http://www.google.com/search?q=' + this.text);
}
}
- </method>
+ </handler>
<method name="viewInWindow" args="url">
LzBrowser.loadURL('javascript: var wptr = window.open("' + url + '","test","resizable=1,width=1000,height=700,left=0,top=0,screenX=0,screenY=0,menubar,location,status,scrollbars,toolbar,address"); wptr.focus(); void(0);');
</method>
@@ -149,7 +149,7 @@
</view>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/examples/contactlist/contactlist.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/contactlist/contactlist.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/contactlist/contactlist.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -26,7 +26,7 @@
<basebutton resource="tabrsrc" clickable="true"
width="${parent.width}"
stretches="both">
- <method event="onclick">
+ <handler name="onclick">
if (classroot.height == classroot.minheight) {
classroot.open.setAttribute('visible',true);
newheight = classroot.maxheight;
@@ -35,7 +35,7 @@
newheight = classroot.minheight;
}
classroot.animate('height', newheight, 300);
- </method>
+ </handler>
</basebutton>
<text x="10" y="4" datapath="@displayname" width="100%"/>
@@ -68,7 +68,7 @@
</view>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2006 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/branches/devildog/examples/image-loading/dataimage.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/image-loading/dataimage.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/image-loading/dataimage.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -31,9 +31,9 @@
text="${classroot.text}"
font="Helvetica" fontsize="12" fontstyle="bold"
fgcolor="#FFFFFF" oninit="setVisible(false)" >
- <method event="ontext" >
+ <handler name="ontext" >
this.setX(-this.getTextWidth() - 2 );
- </method>
+ </handler>
</text>
<view bgcolor="#FFFFFF" x="2" y="2"
@@ -52,27 +52,27 @@
this.rsc.setResource(this.subresource);
</method>
- <method event="onmouseover" >
+ <handler name="onmouseover" >
var anm = this.animate('height',20,200,true);
if (!mo_del) this.mo_del = new LzDelegate ( this , "showText" );
this.mo_del.register ( anm , "onstop" );
this.hilite = true;
- </method>
+ </handler>
- <method event="onmouseout" >
+ <handler name="onmouseout" >
this.animate('height',-20,200,true);
this.hideText();
this.hilite = false;
- </method>
+ </handler>
- <method event="onmousedown" >
+ <handler name="onmousedown" >
this.setBGColor(0xFFC600);
- </method>
+ </handler>
- <method event="onmouseup" >
+ <handler name="onmouseup" >
this.setBGColor(0x00769E);
container.showSection(this.section);
- </method>
+ </handler>
<method name="showText" >
if ( this.hilite == true ) {
@@ -228,7 +228,7 @@
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2006 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/branches/devildog/examples/javarpc/accentedtext.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/javarpc/accentedtext.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/javarpc/accentedtext.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -17,41 +17,41 @@
</security>
<javarpc name="accented" scope="none" remoteclassname="examples.AccentedTextExample">
- <method event="onload">
+ <handler name="onload">
Debug.write('proxy:');
Debug.inspect(this.proxy);
- </method>
+ </handler>
<remotecall funcname="getJapaneseChars">
- <method event="ondata" args="str">
+ <handler name="ondata" args="str">
Debug.write('--------------------------');
Debug.write('getJapaneseChars response:');
Debug.write(str);
accText.setText(str);
- </method>
+ </handler>
</remotecall>
<remotecall funcname="getAccentedChars">
- <method event="ondata" args="str">
+ <handler name="ondata" args="str">
Debug.write('--------------------------');
Debug.write('getAccentedChars response:');
Debug.write(str);
accText.setText(str);
- </method>
+ </handler>
</remotecall>
<remotecall funcname="getArrayListOfString">
- <method event="ondata" args="list">
+ <handler name="ondata" args="list">
Debug.write('getArrayListOfString response:');
Debug.inspect(list);
- </method>
+ </handler>
</remotecall>
<remotecall funcname="getVoid">
- <method event="ondata" args="data">
+ <handler name="ondata" args="data">
Debug.write('getVoid response:');
Debug.inspect(data);
- </method>
+ </handler>
</remotecall>
</javarpc>
@@ -72,7 +72,7 @@
</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/branches/devildog/examples/javarpc/returnjavabean.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/javarpc/returnjavabean.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/javarpc/returnjavabean.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -19,21 +19,21 @@
<!-- Java source and class file can be found in WEB-INF/class/examples -->
<javarpc name="returnjavabean" scope="none" objectreturntype="javabean"
remoteclassname="examples.ReturnJavaBeanExample">
- <method event="onload">
+ <handler name="onload">
Debug.write('proxy:');
Debug.inspect(this.proxy);
- </method>
+ </handler>
<remotecall funcname="getJavaBean">
<param value="'laszlo'"/>
<param value="'san francisco'"/>
<param value="'ca'"/>
<param value="'this is a secret (do not return value)'"/>
- <method event="ondata" args="bean">
+ <handler name="ondata" args="bean">
Debug.write('------------------------------');
Debug.write('got bean object (secret is not returned):');
Debug.inspect(bean);
- </method>
+ </handler>
</remotecall>
</javarpc>
@@ -43,7 +43,7 @@
</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/branches/devildog/examples/javarpc/returnperson.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/javarpc/returnperson.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/javarpc/returnperson.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -17,25 +17,25 @@
</security>
<javarpc name="returnperson" scope="none" remoteclassname="examples.ReturnPersonExample">
- <method event="onload">
+ <handler name="onload">
Debug.write('proxy:');
Debug.inspect(this.proxy);
- </method>
+ </handler>
<remotecall funcname="getPerson">
- <method event="ondata" args="person">
+ <handler name="ondata" args="person">
Debug.write('-------------------');
Debug.write('getPerson response:');
Debug.inspect(person);
- </method>
+ </handler>
</remotecall>
<remotecall funcname="getArrayListOfPerson">
- <method event="ondata" args="list">
+ <handler name="ondata" args="list">
Debug.write('------------------------------');
Debug.write('getArrayListOfPerson response:');
Debug.write(list);
- </method>
+ </handler>
</remotecall>
</javarpc>
@@ -50,7 +50,7 @@
</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/branches/devildog/examples/javarpc/returnpojo.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/javarpc/returnpojo.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/javarpc/returnpojo.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -19,17 +19,17 @@
<!-- Java source and class file can be found in WEB-INF/class/examples -->
<javarpc name="returnpojo" scope="none" objectreturntype="pojo"
remoteclassname="examples.ReturnPOJOExample">
- <method event="onload">
+ <handler name="onload">
Debug.write('proxy:');
Debug.inspect(this.proxy);
- </method>
+ </handler>
<remotecall funcname="getPOJO">
- <method event="ondata" args="pojo">
+ <handler name="ondata" args="pojo">
Debug.write('------------------------------');
Debug.write('got pojo:');
Debug.inspect(pojo);
- </method>
+ </handler>
</remotecall>
</javarpc>
@@ -39,7 +39,7 @@
</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/branches/devildog/examples/mobile/clock/clock-test.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/mobile/clock/clock-test.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/mobile/clock/clock-test.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -21,10 +21,10 @@
<!-- trigger the initial animation on the oninit of the canvas.
this helps in the krank process so that the initial time that the app
get's is not stored in internal variables causing two animations to occur. -->
- <method event="oninit" reference="canvas">
+ <handler name="oninit" reference="canvas">
this.del = new LzDelegate ( this, "tick" );
LzTimer.addTimer( this.del, 1000 );
- </method>
+ </handler>
<method name="tick" >
this.onsecond.sendEvent();
LzTimer.addTimer( this.del, 1000 );
@@ -52,7 +52,7 @@
</method>
<!-- Data has been received so process it -->
- <method event="ondata">
+ <handler name="ondata">
<![CDATA[
// Now set the timezone for the city
this.timezoneoffset = (1*this.datapath.xpathQuery('@timezoneoffset'));
@@ -82,12 +82,12 @@
}
this.setTimeZone( myOffset );
]]>
- </method>
+ </handler>
</clock>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2006-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
<!-- @LZX_VERSION@ -->
Modified: openlaszlo/branches/devildog/examples/mobile/clock/clock.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/mobile/clock/clock.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/mobile/clock/clock.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -3,7 +3,7 @@
<!-- -->
<!-- library classes for the world clocks class -->
<!-- -->
-<!-- Copyright 2002-2004 Laszlo Systems, Inc. All Rights Reserved. -->
+<!-- Copyright 2002-2008 Laszlo Systems, Inc. All Rights Reserved. -->
<!-- Unauthorized use, duplication or distribution is strictly prohibited. -->
<!-- This software is the proprietary information of Laszlo Systems, Inc. -->
<!-- Use is subject to license terms. -->
@@ -39,10 +39,10 @@
<!-- AM or PM -->
<text font="Helmet" fontsize="14" name="dayandampm" x="130" y="132" visible="false" >SUN AM
- <method event="ontext" >
+ <handler name="ontext" >
this.setX(100 - Math.floor(this.getTextWidth()/2.0));
this.setVisible(true);
- </method>
+ </handler>
</text>
<!-- HOUR HAND -->
@@ -119,9 +119,9 @@
<!-- This method is called everytime the global object 'secondtimer'(see below) -->
<!-- sends an onsecond event -->
- <method event="onsecond" reference="secondtimer" >
+ <handler name="onsecond" reference="secondtimer" >
this.setCurrentTime();
- </method>
+ </handler>
<method name="setTimeZone" args="tzo" >
Modified: openlaszlo/branches/devildog/examples/mobile/weather/test.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/mobile/weather/test.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/mobile/weather/test.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -25,25 +25,25 @@
Mouseover is subtle and should probably be more pronounced.
-->
<view x="116" y="177" resource="zip_ok_btn_rsc">
- <method event="onmousedown">
+ <handler name="onmousedown">
this.setAttribute('frame', 2);
- </method>
- <method event="onmouseup">
+ </handler>
+ <handler name="onmouseup">
this.setAttribute('frame', 0);
- </method>
- <method event="onmouseover">
+ </handler>
+ <handler name="onmouseover">
this.setAttribute('frame', 1);
- </method>
- <method event="onmouseout">
+ </handler>
+ <handler name="onmouseout">
this.setAttribute('frame', 0);
- </method>
+ </handler>
</view>
<view bgcolor="0xFFFFFF" x="50" y="181" width="66" height="12" />
<inputtext id="zipcode" x="52" y="179" width="60" fontsize="10">94403</inputtext>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2006-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
<!-- @LZX_VERSION@ -->
Modified: openlaszlo/branches/devildog/examples/modeexample.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/modeexample.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/modeexample.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -79,21 +79,21 @@
text="moreinfo"/>
<text x="6" y="52" multiline="true">more information about how to fill<br/>
out this field could go into this expanded area</text>
- <method event="onvisible" args="isvisible">
+ <handler name="onvisible" args="isvisible">
if (isvisible) {
more.setVisible(true);
this.setHeight(50);
}
- </method>
+ </handler>
</view>
<view name="frame" x="4" y="4" width="200" bgcolor="black" height="${input.height+2}">
<inputtext x="1" y="1" bgcolor="white" width="198" name="input">type something here</inputtext>
</view>
- <method event="onfocus" reference="frame.input">
+ <handler name="onfocus" reference="frame.input">
//Debug.write('onfocus', this);
this.open();
- </method>
+ </handler>
<method name="open">
if (!this.isopen) {
this.isopen=true;
@@ -115,9 +115,9 @@
this.tabDel.unregisterAll();
}
</method>
- <method event="onblur" reference="frame.input">
+ <handler name="onblur" reference="frame.input">
this.clickDel.unregisterAll();
- </method>
+ </handler>
<method name="checkForClick"> <![CDATA[
xpos = this.getMouse('x');
ypos = this.getMouse('y');
@@ -163,12 +163,12 @@
<simplelayout/>
<text>focusable view</text>
<text>yellow=has focus</text>
- <method event="onfocus">
+ <handler name="onfocus">
setBGColor(0xffff00);
- </method>
- <method event="onblur">
+ </handler>
+ <handler name="onblur">
setBGColor(0xffffff);
- </method>
+ </handler>
</view>
</view>
<view name="event_tester"
@@ -308,7 +308,7 @@
</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/branches/devildog/examples/musicdhtml/audiokernel.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/musicdhtml/audiokernel.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/musicdhtml/audiokernel.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -12,29 +12,29 @@
<method name="panRight">
this.setPan( this.getPan() + 10)
</method>
- <method event="onlastframe">
+ <handler name="onlastframe">
//Debug.write("Got lastframe");
//LzBrowser.callJS('setCanAttr', null, 'lastframe');
- </method>
- <method event="onstop">
+ </handler>
+ <handler name="onstop">
//Debug.write("Got stop");
- </method>
- <method event="onloadperc" args="l">
+ </handler>
+ <handler name="onloadperc" args="l">
//Debug.write("Got loadperc", l);
LzBrowser.callJS('setCanAttr', null, 'loadperc', l);
- </method>
- <method event="onframe" args="f">
+ </handler>
+ <handler name="onframe" args="f">
//Debug.write("Got frame", f);
LzBrowser.callJS('setCanAttr', null, 'frame', f);
- </method>
- <method event="ontotalframes" args="t">
+ </handler>
+ <handler name="ontotalframes" args="t">
//Debug.write("Got totalframes", t);
LzBrowser.callJS('setCanAttr', null, 'totalframes', t);
- </method>
+ </handler>
</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/branches/devildog/examples/musicdhtml/main.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/musicdhtml/main.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/musicdhtml/main.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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/branches/devildog/examples/paging.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/paging.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/paging.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -69,7 +69,7 @@
<button text="sortit" x="30" y="30" >
<attribute name="last" value="true" />
<attribute name="lastby" value="true" />
- <method event="onclick" >
+ <handler name="onclick" >
var asc = this.last? "ascending" : "descending";
var by = !this.lastby? "@name" : "@color";
this.last = !this.last;
@@ -77,7 +77,7 @@
this.lastby = ! this.lastby;
}
svpar.sview.setOrder( by , asc)
- </method>
+ </handler>
</button>
<view x="300" y="30" width="250" datapath="new:/record" id="newer" >
@@ -118,11 +118,11 @@
</view>
<button text="Add this person to the dataset" align="right">
- <method event="onclick">
+ <handler name="onclick">
this.parent.datapath.updateData();
var dp = canvas.datasets.recs.getPointer();
dp.addNodeFromPointer( this.parent.datapath );
- </method>
+ </handler>
</button>
<simplelayout axis="y" spacing="2" />
@@ -131,7 +131,7 @@
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/examples/sessionwindow.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/sessionwindow.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/sessionwindow.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -5,28 +5,28 @@
<sessionrpc name="session" />
<class name="sessionwindow" extends="window" visible="false" >
- <method event="onload" reference="canvas.session">
+ <handler name="onload" reference="canvas.session">
this.getAttrRPC.invoke();
- </method>
- <method event="onmouseup">
+ </handler>
+ <handler name="onmouseup">
this.setAttrRPC.invoke();
- </method>
+ </handler>
- <method event="onerror" args="mesg">
+ <handler name="onerror" args="mesg">
this.setAttribute('visible', true);
Debug.write('error:', mesg);
- </method>
+ </handler>
<remotecall name="getAttrRPC" funcname="getAttribute"
remotecontext="$once{canvas.session}">
<param><method name="getValue">
return classroot.name + '-pos';
</method></param>
- <method event="ondata" args="pos">
+ <handler name="ondata" args="pos">
classroot.setAttribute('x', pos[0]);
classroot.setAttribute('y', pos[1]);
classroot.setAttribute('visible', true);
- </method>
+ </handler>
</remotecall>
<remotecall name="setAttrRPC" funcname="setAttribute"
@@ -52,7 +52,7 @@
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/examples/systemprop.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/systemprop.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/systemprop.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -10,9 +10,9 @@
<list name="env" width="250" height="200">
<textlistitem name="ti" datapath="envDset:/*" text="$path{'name()'}">
- <method event="onselect">
+ <handler name="onselect">
canvas.display.setText(datapath.xpathQuery('text()'))
- </method>
+ </handler>
</textlistitem>
</list>
@@ -27,27 +27,27 @@
<javarpc name="systemprop" scope="none" classname="SystemProp">
- <method event="onload">
+ <handler name="onload">
this.getProperties.invoke();
- </method>
+ </handler>
- <method event="onerror" args="msg">
+ <handler name="onerror" args="msg">
errormsg.setAttribute('text', 'error: ' + msg)
errormsg.open()
- </method>
+ </handler>
<remotecall name="getProperties" funcname="getProperties"
dataobject="envDset">
- <method event="ondata" args="d">
+ <handler name="ondata" args="d">
Debug.write('data:', d);
- </method>
+ </handler>
</remotecall>
</javarpc>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/examples/xmldata/xmldata.lzx
===================================================================
--- openlaszlo/branches/devildog/examples/xmldata/xmldata.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/examples/xmldata/xmldata.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -97,22 +97,22 @@
<checkbox text="cache in client" id="ccache" />
<checkbox text="cache in server" id="scache">
- <method event="onvalue">
+ <handler name="onvalue">
if (this.value) {
if (typeof(resphead) != "undefined") {
resphead.setAttribute('value', false);
}
}
- </method>
+ </handler>
</checkbox>
<checkbox text="resp headers" id="resphead">
- <method event="onvalue">
+ <handler name="onvalue">
if (this.value) {
if (typeof(scache) != "undefined") {
scache.setAttribute('value', false);
}
}
- </method>
+ </handler>
</checkbox>
<checkbox text="accept encodings" id="accenc" />
<checkbox text="POST" id="post" />
@@ -195,7 +195,7 @@
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/lps/admin/cacheinfo.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/admin/cacheinfo.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/admin/cacheinfo.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -25,7 +25,7 @@
<simplelayout axis="y" spacing="5" />
<view clickable="true">
<datapath xpath="item" replication="lazy" />
- <method event="onclick">
+ <handler name="onclick">
<![CDATA[
if (typeof(classroot.parent.parent.mt) == "undefined") {
Debug.write('itemlist: no parent.parent.mt')
@@ -61,19 +61,19 @@
classroot.parent.parent.mt.setText(str);
]]>
- </method>
- <method event="onmouseup">
+ </handler>
+ <handler name="onmouseup">
this.setAttribute("bgcolor",0xcacaca);
- </method>
- <method event="onmousedown">
+ </handler>
+ <handler name="onmousedown">
this.setAttribute("bgcolor",0xbababa);
- </method>
- <method event="onmouseover">
+ </handler>
+ <handler name="onmouseover">
this.setAttribute("bgcolor",0xcacaca);
- </method>
- <method event="onmouseout">
+ </handler>
+ <handler name="onmouseout">
this.setAttribute("bgcolor",0xeaeaea);
- </method>
+ </handler>
<text width="${canvas.maxtextwidth}" datapath="@key" />
</view>
</view>
@@ -123,7 +123,7 @@
<datapointer xpath="cids:/*[1]">
- <method event="ondata">
+ <handler name="ondata">
var nn = this.getNodeName();
if (nn == "lps-cacheinfo") {
parent.mt.setVisible(false);
@@ -138,7 +138,7 @@
parent.info.setVisible(false);
parent.mt.setText('error: cache info request node is ' + nn);
}
- </method>
+ </handler>
<method name="handleData">
<![CDATA[
var str;
@@ -204,15 +204,15 @@
parent.mt.setText(err);
}
</method>
- <method event="onerror" args="ds">
+ <handler name="onerror" args="ds">
parent.mt.setText(ds.getErrorString());
- </method>
- <method event="ontimeout" >
+ </handler>
+ <handler name="ontimeout" >
parent.mt.setText("Cache info request timed out.");
- </method>
+ </handler>
</datapointer>
<datapointer xpath="ccds:/*[1]">
- <method event="ondata">
+ <handler name="ondata">
var nn = this.getNodeName();
if (nn == "lps") {
parent.mt.setVisible(false);
@@ -227,7 +227,7 @@
parent.info.setVisible(false);
parent.mt.setText('error: clear cache request node is ' + nn);
}
- </method>
+ </handler>
<method name="handleData" >
var cleared = this.xpathQuery('clearcache[1]/@cleared');
if (cleared == 'true') {
@@ -251,12 +251,12 @@
parent.info.mt.setText(err);
}
</method>
- <method event="onerror" args="ds" >
+ <handler name="onerror" args="ds" >
parent.mt.setText(ds.getErrorString());
- </method>
- <method event="ontimeout" >
+ </handler>
+ <handler name="ontimeout" >
parent.mt.setText("Clear cache request timed out.");
- </method>
+ </handler>
</datapointer>
<method name="request">
@@ -273,18 +273,18 @@
<simplelayout axis="x" spacing="5" />
<button onclick="parent.parent.request()">Refresh</button>
<button>View Details
- <method event="onclick" >
+ <handler name="onclick" >
LzBrowser.loadURL("javascript: var wptr = window.open('console.lzx?lzt=cacheinfo&details=1&pwd=" + escape(escape(pwd.getText())) + "', 'test', 'resizable=1,width=1000,height=700,left=0,top=0,screenX=0,screenY=0,menubar,location,status,scrollbars,toolbar,address'); wptr.focus(); void(0);")
- </method>
+ </handler>
</button>
<button>Clear Cache
- <method event="onclick" >
+ <handler name="onclick" >
classroot.mt.setVisible(true);
classroot.info.setVisible(false);
this.mt.setText('Clearing...');
ccds.setQueryParams( { lzt: "clearcache", pwd: pwd.getText() } );
ccds.doRequest();
- </method>
+ </handler>
</button>
</view>
@@ -304,7 +304,7 @@
</library>
<!-- * 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/branches/devildog/lps/admin/console.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/admin/console.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/admin/console.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -13,14 +13,14 @@
<class name="mytabpane" extends="tabpane">
<attribute name="requested" value="false" type="boolean" />
- <method event="onvisible" args="v">
+ <handler name="onvisible" args="v">
<![CDATA[
if (v && ! this.requested) {
this.setAttribute("requested", true);
info.request();
}
]]>
- </method>
+ </handler>
</class>
<simplelayout axis="y" spacing="10" />
@@ -31,11 +31,11 @@
<text font="mono" >Admin password:</text>
<inputtext id="pwd" password="true" font="monob" bgcolor="#fafafa"
width="100">
- <method event="oninit">
+ <handler name="oninit">
if (typeof(global.password) != "undefined") {
this.setText(global.password);
}
- </method>
+ </handler>
</inputtext>
</view>
@@ -62,7 +62,7 @@
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/lps/admin/logconfig.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/admin/logconfig.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/admin/logconfig.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -25,7 +25,7 @@
<datapointer name="cdptr" xpath="config:/*[1]" >
<attribute name="xml" value="" type="string" />
<attribute name="lines" value="0" />
- <method event="ondata">
+ <handler name="ondata">
var nn = this.getNodeName();
if (nn == "configuration") {
this.handleData();
@@ -34,7 +34,7 @@
} else {
parent.mt.setText('error: log config request node is ' + nn);
}
- </method>
+ </handler>
<method name="handleData">
<![CDATA[
// LPS strips out namespace prefix from <log4j:configuration>.
@@ -65,14 +65,14 @@
}
classroot.level0.level1.update.updateable(false);
</method>
- <method event="onerror" args="ds">
+ <handler name="onerror" args="ds">
classroot.a.input.setText(ds.getErrorString());
classroot.level0.level1.update.updateable(false);
- </method>
- <method event="ontimeout">
+ </handler>
+ <handler name="ontimeout">
classroot.a.input.setText("Log config request timed out.");
classroot.level0.level1.update.updateable(false);
- </method>
+ </handler>
<method name="parseXML" args="indent">
<![CDATA[
@@ -119,15 +119,15 @@
<view name="level1">
<simplelayout axis="x" spacing="5" />
<button>Refresh
- <method event="onclick">
+ <handler name="onclick">
<![CDATA[
classroot.a.input.setText('Requesting...');
classroot.request();
]]>
- </method>
+ </handler>
</button>
<button name="update">Update
- <method event="onclick">
+ <handler name="onclick">
<![CDATA[
var xml = classroot.a.input.getText();
var query = "lzt=logconfig&xml=" + escape(xml) +
@@ -142,7 +142,7 @@
dset.setQueryString(query);
dset.doRequest();
]]>
- </method>
+ </handler>
<method name="updateable" args="isOk">
if (isOk) {
this.setAttribute('clickable', true);
@@ -161,9 +161,9 @@
</view>
<button>View Log
- <method event="onclick" >
+ <handler name="onclick" >
LzBrowser.loadURL('javascript: var wptr = window.open("console.lzx?lzt=log&pwd=' + escape(escape(pwd.getText())) + '", "test", "resizable=1,width=1000,height=700,left=0,top=0,screenX=0,screenY=0,menubar,location,status,scrollbars,toolbar,address"); wptr.focus(); void(0);')
- </method>
+ </handler>
</button>
</view>
@@ -178,7 +178,7 @@
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/lps/admin/serverinfo.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/admin/serverinfo.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/admin/serverinfo.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -13,7 +13,7 @@
<class name="serverinfo">
<datapointer xpath="stds:/*[1]">
- <method event="ondata">
+ <handler name="ondata">
var nn = this.getNodeName();
if (nn == "stat") {
parent.mt.setVisible(false);
@@ -28,7 +28,7 @@
parent.servertab.setVisible(false);
parent.mt.setText('error: server info request node is ' + nn);
}
- </method>
+ </handler>
<method name="handleData">
var stat = this.dupePointer();
var info = this.dupePointer();
@@ -43,16 +43,16 @@
parent.mt.setText(err);
}
</method>
- <method event="onerror" args="ds">
+ <handler name="onerror" args="ds">
parent.mt.setVisible(true);
parent.servertab.setVisible(false);
parent.mt.setText(ds.getErrorString());
- </method>
- <method event="ontimeout" >
+ </handler>
+ <handler name="ontimeout" >
parent.mt.setVisible(true);
parent.servertab.setVisible(false);
parent.mt.setText("Server info request timed out.");
- </method>
+ </handler>
</datapointer>
<method name="request">
@@ -198,7 +198,7 @@
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/lps/admin/version.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/admin/version.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/admin/version.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -12,12 +12,12 @@
<attribute name="width" value="500" />
- <method event="oninit">
+ <handler name="oninit">
msg.setText("LPS Version: " + canvas.lpsversion + "\n" +
"LPS Release: " + canvas.lpsrelease + "\n" +
"LPS Build: " + canvas.build + "\n" +
"Flash Player: " + LzBrowser.getVersion());
- </method>
+ </handler>
<text id="msg" width="300" font="monob" fontsize="10"
multiline="true" selectable="true" />
@@ -26,7 +26,7 @@
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2004 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/branches/devildog/lps/components/base/basecombobox.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/base/basecombobox.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/base/basecombobox.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -381,7 +381,7 @@
// reassign classname now that the instance is inited
this.setItemclassname(this.itemclassname);
- cblist.setVisible(false);
+ cblist.setAttribute('visible', false);
</method>
<!--- @keywords private -->
@@ -509,7 +509,7 @@
LzModeManager.makeModal( this );
this.cblist.bringToFront();
- this.cblist.setVisible(true);
+ this.cblist.setAttribute('visible', true);
LzFocus.setFocus(this.cblist, withkey);
this.isopen = true;
@@ -519,7 +519,7 @@
this.isopen = false;
LzModeManager.release( this );
- this.cblist.setVisible(false);
+ this.cblist.setAttribute('visible', false);
if (this['onisopen']) this.onisopen.sendEvent(false);
if ( LzFocus.getFocus() == this.cblist ) {
if (!editable) {
@@ -649,7 +649,7 @@
<!--- @keywords private -->
<method name="_showEnabled">
- interior.cbtext.setVisible(this._enabled);
+ interior.cbtext.setAttribute('visible', this._enabled);
if (!this._enabled) {
if (interior._dsblfield == null) {
var t = new LzText(interior,
@@ -657,11 +657,11 @@
width:interior.width, height:interior.height,
fgcolor:this['style'] ? this.style.textdisabledcolor : null});
} else {
- interior._dsblfield.setVisible(true);
+ interior._dsblfield.setAttribute('visible', true);
}
interior._dsblfield.setText(this.getText());
} else {
- if (interior._dsblfield) interior._dsblfield.setVisible(false);
+ if (interior._dsblfield) interior._dsblfield.setAttribute('visible', false);
}
</method>
Modified: openlaszlo/branches/devildog/lps/components/base/basecomponent.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/base/basecomponent.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/base/basecomponent.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -81,10 +81,10 @@
var newFocusable = (this._enabled && this._focusable);
if (newFocusable != this.focusable) {
this.focusable = newFocusable;
- if (this.onfocusable) this.onfocusable.sendEvent();
+ if (this.onfocusable.ready) this.onfocusable.sendEvent();
}
if (_initcomplete) _showEnabled();
- if (this.on_enabled) this.on_enabled.sendEvent();
+ if (this.on_enabled.ready) this.on_enabled.sendEvent();
]]>
</method>
@@ -93,7 +93,7 @@
this._focusable = isFocusable;
if (this.enabled) {
this.focusable = this._focusable;
- if (this.onfocusable) this.onfocusable.sendEvent();
+ if (this.onfocusable.ready) this.onfocusable.sendEvent();
} else {
this.focusable = false;
}
@@ -174,7 +174,7 @@
}
this.isdefault = def;
- if ( this.onisdefault ){
+ if ( this.onisdefault.ready ){
this.onisdefault.sendEvent( def );
}
</method>
@@ -280,7 +280,7 @@
this.style = s;
_usestyle();
- if (this.onstyle) this.onstyle.sendEvent(this.style);
+ if (this.onstyle.ready) this.onstyle.sendEvent(this.style);
]]>
</method>
Modified: openlaszlo/branches/devildog/lps/components/base/basescrollbar.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/base/basescrollbar.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/base/basescrollbar.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -341,7 +341,7 @@
<method name="_showEnabled">
if (!_enabled) this.thumb.setAttribute(sizeAxis, 0);
else updateThumbSize();
- this.thumb.setVisible(_enabled);
+ this.thumb.setAttribute('visible', _enabled);
if (scrolltarget) this.scrolltarget.setAttribute(scrollattr, 0);
</method>
Modified: openlaszlo/branches/devildog/lps/components/charts/addon/library.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/addon/library.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/addon/library.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,13 +1,14 @@
<!---
- @topic Charting And Graphing
- @subtopic Add-on
+ @access public
+ @topic Components
+ @subtopic Charts
-->
<library>
<include href="zoomarea.lzx" />
<include href="slider/slider.lzx" />
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2005-2007 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2005-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
<!-- @LZX_VERSION@ -->
Modified: openlaszlo/branches/devildog/lps/components/charts/addon/zoomarea.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/addon/zoomarea.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/addon/zoomarea.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,7 +1,13 @@
-<library>
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
+<library>
<!--- An abstract class that provide basic zooming ability.
Allow subclasses to modify the look and feel
and action to be taken
+ @access public
-->
<class name="basezoomarea" visible="false">
<!--- the chart instance -->
Modified: openlaszlo/branches/devildog/lps/components/charts/barchart/barchart.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/barchart/barchart.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/barchart/barchart.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/chartstyle.lzx"/>
<include href="../common/dataseries.lzx"/>
@@ -10,7 +15,10 @@
<include href="barchartplotarea.lzx"/>
<include href="../common/datalabel.lzx"/>
- <!--- A chart class that renders horizontal bars. Inherits from the chart class. (Warning: Of beta quality.) -->
+ <!--- A chart class that renders horizontal bars.
+ Inherits from the chart class. (Warning: Of beta quality.)
+ @access public
+ -->
<class name="barchart" extends="rectangularchart">
<!--- @keyword private -->
<method name="init">
@@ -161,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>
@@ -178,7 +186,7 @@
</library>
<!-- * 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/branches/devildog/lps/components/charts/columnchart/columnchart.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/columnchart/columnchart.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/columnchart/columnchart.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/chartstyle.lzx"/>
<include href="../common/dataseries.lzx"/>
@@ -9,7 +14,11 @@
<include href="../common/databar.lzx"/>
<include href="columnchartplotarea.lzx"/>
- <!--- A chart class that renders vertical bars. Inherits from the chart class. (Warning: Of beta quality.) -->
+ <!---
+ A chart class that renders vertical bars.
+ Inherits from the chart class. (Warning: Of beta quality.)
+ @access public
+ -->
<class name="columnchart" extends="rectangularchart">
<!--- @keyword private -->
<method name="init">
@@ -149,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>
@@ -167,7 +176,7 @@
</library>
<!-- * 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/branches/devildog/lps/components/charts/common/axis.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/axis.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/axis.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/strokestyle.lzx"/>
<include href="../common/label.lzx"/>
@@ -5,6 +10,7 @@
<include href="extensions/drawview.lzx"/>
<!--- A abstract class that represents one of the axes of a rectangular chart. In general, axis isn't instantiated directly
+ @access public
-->
<class name="axis" extends="drawview">
<!--- Data Column that is used to override the values of Tic Marks labels -->
@@ -555,7 +561,7 @@
</library>
<!-- * 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/branches/devildog/lps/components/charts/common/chart.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/chart.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/chart.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="datatip.lzx"/>
<include href="charts/styles/styleparser.lzx"/>
@@ -13,6 +18,7 @@
the relevant dataseries to each axis. Relevent dataseries
for the chart must have columns for each of the axes
that the chart cares about.
+ @access public
-->
<class name="chart" extends="basecomponent">
<!--- @keywords private -->
Modified: openlaszlo/branches/devildog/lps/components/charts/common/datalabel.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/datalabel.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/datalabel.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,7 +1,15 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="label.lzx"/>
<!-- Begin Data Label Class -->
- <!--- Represents the data text which appears on a computerized note -->
+ <!---
+ Represents the data text which appears on a computerized note
+ @access public
+ -->
<class name="datalabel" extends="label">
<!--- @keyword private -->
@@ -24,7 +32,7 @@
</library>
<!-- * 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/branches/devildog/lps/components/charts/common/datamarker.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/datamarker.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/datamarker.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,14 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="extensions/drawview.lzx"/>
- <!--- datamarker for the chart -->
+ <!---
+ datamarker for the chart
+ @access public
+ -->
<class name="datamarker" extends="drawview">
<!--- @keywords private -->
<attribute name="locationx" type="number" value="0"/>
@@ -135,7 +143,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/branches/devildog/lps/components/charts/common/dataseries.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/dataseries.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/dataseries.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,12 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<!--- datacolumn contain a list of values of a series. List of values typically are data for x series,
y series, tooltip series and datalabel series.
+ @access public
-->
<class name="datacolumn">
<!--- the name of the column in the datapath for the series -->
@@ -182,7 +188,9 @@
</class>
<!---
- A dataseries in a container for dataseries and datacolumn. dataseries can be nested.
+ A dataseries in a container for dataseries and datacolumn.
+ dataseries can be nested.
+ @access public
-->
<class name="dataseries">
<!--- enable the dataseries -->
Modified: openlaszlo/branches/devildog/lps/components/charts/common/datatip.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/datatip.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/datatip.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,7 +1,15 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="label.lzx"/>
- <!--- tooltip is a tool tip to be use be the chart elements such as the plot area -->
+ <!---
+ tooltip is a tool tip to be use be the chart elements such as the plot area
+ @access public
+ -->
<class name="datatip" visible="false" extends="label" enableCache="false">
<!--- sets visible to true and positioned the object
@keyword private-->
@@ -34,7 +42,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/branches/devildog/lps/components/charts/common/horizontalaxis.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/horizontalaxis.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/horizontalaxis.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/strokestyle.lzx"/>
<include href="../common/label.lzx"/>
@@ -3,5 +8,8 @@
<include href="axis.lzx"/>
<!-- Begin Horizontal Axis Class -->
- <!--- Represents the X-axis on the rectangular chart extends from Axis class-->
+ <!---
+ Represents the X-axis on the rectangular chart extends from Axis class
+ @access public
+ -->
<class name="horizontalaxis" extends="axis">
<!--- @keyword private-->
@@ -223,7 +231,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/branches/devildog/lps/components/charts/common/label.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/label.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/label.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/chartstyle.lzx"/>
<include href="extensions/drawview.lzx"/>
@@ -2,4 +7,6 @@
<!-- Begin Data Label Class -->
- <!--- An abstract class that applies all features label.
- -->
+ <!---
+ An abstract class that applies all features label.
+ @access public
+ -->
<class name="label" extends="drawview">
@@ -138,7 +145,7 @@
</library>
<!-- * 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/branches/devildog/lps/components/charts/common/legend.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/legend.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/legend.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/strokestyle.lzx"/>
<include href="../piechart/piepiece.lzx"/>
@@ -4,7 +9,10 @@
<include href="utils/layouts/simplelayout.lzx"/>
<include href="extensions/drawview.lzx"/>
- <!--- simple legend class -->
+ <!---
+ simple legend class
+ @access public
+ -->
<class name="legend" extends="drawview" datapath="">
<!--- @keyword private -->
<attribute name="topmargin" type="number" value="5"/>
Modified: openlaszlo/branches/devildog/lps/components/charts/common/library.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/library.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/library.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,7 @@
<!---
- @topic Charting And Graphing
- @subtopic Common
+ @access public
+ @topic Components
+ @subtopic Charts
-->
<library>
<include href="axis.lzx" />
@@ -24,7 +25,7 @@
<include href="virtualdrawview.lzx" />
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2005-2007 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2005-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
<!-- @LZX_VERSION@ -->
Modified: openlaszlo/branches/devildog/lps/components/charts/common/rectangularchart.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/rectangularchart.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/rectangularchart.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="chart.lzx"/>
<include href="horizontalaxis.lzx"/>
@@ -2,3 +7,6 @@
<include href="verticalaxis.lzx"/>
- <!--- class that provides all common features for the rectangular charts like line, bar and column -->
+ <!---
+ class that provides all common features for the rectangular charts like line, bar and column
+ @access public
+ -->
<class name="rectangularchart" extends="chart" clip="true">
Modified: openlaszlo/branches/devildog/lps/components/charts/common/valueline.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/valueline.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/valueline.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../common/label.lzx"/>
<include href="extensions/drawview.lzx"/>
@@ -2,3 +7,6 @@
- <!--- Represents a line in the chart -->
+ <!---
+ Represents a line in the chart
+ @access public
+ -->
<class name="valueline" extends="drawview">
Modified: openlaszlo/branches/devildog/lps/components/charts/common/valuepoints.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/valuepoints.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/valuepoints.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="label.lzx"/>
<include href="datamarker.lzx"/>
@@ -2,3 +7,6 @@
- <!--- Represents a value point in the chart -->
+ <!---
+ Represents a value point in the chart
+ @access public
+ -->
<class name="valuepoints">
Modified: openlaszlo/branches/devildog/lps/components/charts/common/valueregion.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/valueregion.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/valueregion.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,14 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="extensions/drawview.lzx"/>
- <!--- Represents a region of values in the chart -->
+ <!---
+ Represents a region of values in the chart
+ @access public
+ -->
<class name="valueregion" extends="drawview">
<!--- enable the rendering of the value region in the chart -->
<attribute name="regionEnabled" value="true"/>
Modified: openlaszlo/branches/devildog/lps/components/charts/common/verticalaxis.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/common/verticalaxis.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/common/verticalaxis.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/strokestyle.lzx"/>
<include href="../common/label.lzx"/>
@@ -3,5 +8,7 @@
<include href="axis.lzx"/>
<!-- Begin Vertical Axis Class -->
-<!--- Represents the Y axis on the rectangular chart, extends from Axis class -->
+<!--- Represents the Y axis on the rectangular chart, extends from Axis class
+ @access public
+ -->
<class name="verticalaxis" extends="axis">
<!--- @keyword private-->
@@ -153,7 +160,7 @@
<!-- End Vertical Axis Class -->
<!-- * 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/branches/devildog/lps/components/charts/library.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/library.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/library.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,6 +1,7 @@
<!---
- @topic Charting And Graphing
- @subtopic Chart Types
+ @access public
+ @topic Components
+ @subtopic Charts
-->
<library>
<include href="common/library.lzx" />
@@ -9,9 +10,22 @@
<include href="columnchart/columnchart.lzx" />
<include href="linechart/linechart.lzx" />
<include href="piechart/piechart.lzx" />
+
+ <!-- TODO [dda 2008-03-24] The following include is required for doctools.
+ It's implicitly included from other files, but include "../anything"
+ is not handled well by our xsl.
+ -->
+ <include href="styles/chartstyle.lzx"/>
+
+ <!-- TODO [dda 2008-03-24] The following include is required for doctools.
+ For some reason, without it, piechartplotarea is not generated,
+ even though it is included by piechart/piechart.lzx.
+ -->
+ <include href="piechart/piechartplotarea.lzx"/>
+
</library>
<!-- * 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/branches/devildog/lps/components/charts/linechart/linechart.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/linechart/linechart.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/linechart/linechart.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/chartstyle.lzx"/>
<include href="../common/dataseries.lzx"/>
@@ -14,7 +19,11 @@
<include href="linechartplotarea.lzx"/>
- <!--- A chart class that renders as lines. Inherits from the chart class. (Warning: Of beta quality.) -->
+ <!--- A chart class that renders as lines.
+ Inherits from the chart class.
+ (Warning: Of beta quality.)
+ @access public
+ -->
<class name="linechart" extends="rectangularchart">
<!--- @keyword private -->
<method name="init">
@@ -199,7 +208,7 @@
</library>
<!-- * 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/branches/devildog/lps/components/charts/piechart/piechart.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/piechart/piechart.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/piechart/piechart.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/chartstyle.lzx"/>
<include href="../common/dataseries.lzx"/>
@@ -5,13 +10,16 @@
<include href="../common/virtualdrawview.lzx"/>
<include href="../common/datalabel.lzx"/>
<include href="../common/chart.lzx"/>
- <include href="charts/common/legend.lzx"/>
+ <include href="../common/legend.lzx"/>
<include href="piepiece.lzx"/>
<include href="piechartplotarea.lzx"/>
- <!--- A pie chart represents a chart that is displayed in the 2D
+ <!---
+ A pie chart represents a chart that is displayed in the 2D
polar plane. This class inherits immediately from chart class
- and can be instantiated directly. (Warning: Of beta quality.)-->
+ and can be instantiated directly. (Warning: Of beta quality.)
+ @access public
+ -->
<class name="piechart" extends="chart">
<!--- @keywords private -->
@@ -150,9 +158,9 @@
</library>
<!-- * 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@
- -->
\ No newline at end of file
+ -->
Modified: openlaszlo/branches/devildog/lps/components/charts/piechart/piechartplotarea.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/piechart/piechartplotarea.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/piechart/piechartplotarea.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,3 +1,8 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
<include href="../styles/strokestyle.lzx"/>
<include href="../common/viewspoolmanager.lzx"/>
@@ -3,5 +8,8 @@
<include href="extensions/drawview.lzx"/>
- <!--- A pie chart plot area where the pie slices are rendered -->
+ <!---
+ A pie chart plot area where the pie slices are rendered
+ @access public
+ -->
<class name="piechartplotarea" extends="drawview">
<!--- Array that holds the attributes regarding the dimension and position
@@ -124,7 +132,7 @@
</library>
<!-- * 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/branches/devildog/lps/components/charts/styles/chartstyle.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/charts/styles/chartstyle.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/charts/styles/chartstyle.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,8 +1,15 @@
+<!---
+ @access public
+ @topic Components
+ @subtopic Charts
+ -->
<library>
-<!--- base style for all chart style -->
+<!--- base style for all chart styles
+ @access public
+ -->
<class name="basestyle" extends="view" opacity="0">
- <!--- below are the methods copied over from the style class of basecomponents -->
+ <!-- below are the methods copied over from the style class of basecomponents -->
<!--- set a specific style attribute, generating an onstylechanged event
-->
@@ -74,7 +81,9 @@
</method>
</class>
-<!--- style for point and datamarker -->
+<!--- style for point and datamarker
+ @access public
+ -->
<class name="pointstyle" extends="basestyle" width="5" height="5">
<!--- RGB color -->
<attribute name="color" type="color" value="black"/>
@@ -92,7 +101,9 @@
<attribute name="lineWidth" type="number" value="0"/>
</class>
-<!--- style for point or border -->
+<!--- style for point or border
+ @access public
+ -->
<class name="linestyle" extends="basestyle" >
<!--- pixel size for the stroke of the line -->
<attribute name="size" type="number" value="1"/>
@@ -104,7 +115,9 @@
<attribute name="type" type="string" value="solid" />
</class>
-<!--- style for a region -->
+<!--- style for a region
+ @access public
+ -->
<class name="regionstyle" extends="basestyle" stretches="both">
<!--- RGB color on the axis line -->
<attribute name="color" type="color" value="0xFF0000"/>
@@ -117,7 +130,9 @@
</class>
-<!--- style object used for anything that contains a label within the chart. -->
+<!--- style object used for anything that contains a label within the chart.
+ @access public
+ -->
<class name="labelstyle" extends="basestyle" >
<!--- size of border of label background -->
<attribute name="linesize" type="number" value="null"/>
@@ -144,7 +159,9 @@
<!--- tickstyle is used by the axis style to render major and minor ticks on a chart.
- NOTE: tickstyle extends linestyle -->
+ NOTE: tickstyle extends linestyle
+ @access public
+ -->
<class name="tickstyle" extends="linestyle" >
<!--- length of tick in pixels perpendicualr to the axis -->
<attribute name="length" type="number" value="5"/>
@@ -156,7 +173,9 @@
</class>
<!--- valuelinestyle is used to set style to the
- NOTE: valuelinestyle extends basestyle -->
+ NOTE: valuelinestyle extends basestyle
+ @access public
+ -->
<class name="valuelinestyle" extends="basestyle" >
<?STRUCTURE ...
<linestyle name="line" /> <!--- instance of linestyle -->
@@ -166,7 +185,9 @@
</class>
<!--- valuepointstyle is used to set style to the
- NOTE: valuelinestyle extends basestyle -->
+ NOTE: valuelinestyle extends basestyle
+ @access public
+ -->
<class name="valuepointstyle" extends="basestyle" >
<?STRUCTURE ...
<pointstyle name="point"/> <!--- an instance of pointstyle -->
@@ -175,7 +196,9 @@
?>
</class>
-<!--- style for axis -->
+<!--- style for axis
+ @access public
+ -->
<class name="axisstyle" extends="basestyle" >
<!--- direction of the axis: x or y -->
<attribute name="direction" value="y | x" type="string" />
@@ -191,7 +214,9 @@
</class>
-<!--- style for plot area -->
+<!--- style for plot area
+ @access public
+ -->
<class name="plotstyle" extends="basestyle">
<!--- size of border of the plot area -->
<attribute name="linesize" type="number" value="0"/>
@@ -203,7 +228,9 @@
<attribute name="opacity" type="number" value="1"/>
</class>
-<!--- style for chart background -->
+<!--- style for chart background
+ @access public
+ -->
<class name="chartbgstyle" extends="basestyle">
<?STRUCTURE ...
<linestyle name="line"/> <!--- instance of linestyle -->
@@ -211,7 +238,9 @@
?>
</class>
-<!--- dataseriesstyle is used for drawing the appearance of a dataseries -->
+<!--- dataseriesstyle is used for drawing the appearance of a dataseries
+ @access public
+ -->
<class name="datastyle" extends="basestyle" >
<?STRUCTURE ...
@@ -225,7 +254,9 @@
</class>
-<!--- valueregionstyle is used for drawing the appearance of a value region -->
+<!--- valueregionstyle is used for drawing the appearance of a value region
+ @access public
+ -->
<class name="valueregionstyle" extends="basestyle" >
<?STRUCTURE ...
@@ -237,7 +268,9 @@
</class>
-<!--- style for chart, contain nested level of style extend from basestyle -->
+<!--- style for chart, contain nested level of style extend from basestyle
+ @access public
+ -->
<class name="chartstyle" extends="basestyle" >
<!--- @keyword private -->
<attribute name="datastyleindex" value="0" type="number"/>
@@ -302,7 +335,9 @@
<event name="onversion" />
</class>
-<!--- list of datastyle -->
+<!--- list of datastyle
+ @access public
+ -->
<class name="datastylelist" extends="basestyle">
</class>
Modified: openlaszlo/branches/devildog/lps/components/debugger/debugger.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/debugger/debugger.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/debugger/debugger.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -383,7 +383,7 @@
}
} else {
if (!this.consoleRemote && !this['visible']) {
- this.setVisible(true);
+ this.setAttribute('visible', true);
this.bringToFront();
}
// Call the primitive method
@@ -638,8 +638,8 @@
this.bottom.left.doSingleLine();
}
this.adjustMultiline();
- this.top.controls.min.setVisible(!this.minimized);
- this.top.controls.exp.setVisible(this.minimized);
+ this.top.controls.min.setAttribute('visible', !this.minimized);
+ this.top.controls.exp.setAttribute('visible', this.minimized);
</method>
<dragstate name="drag" />
@@ -671,7 +671,7 @@
<basebutton name="close" pixellock="true"
x="${parent.width - this.width - 7}"
resource="closeBtn_rsc"
- onclick="classroot.setVisible(false)" />
+ onclick="classroot.setAttribute('visible', false)" />
<basebutton name="min" pixellock="true"
x="${parent.close.x - this.width}"
resource="minBtn_rsc"
@@ -766,16 +766,16 @@
<view name="left" height="${parent.height}" >
<method name="doSingleLine">
- this.upButton.setVisible(true);
- this.downButton.setVisible(false)
+ this.upButton.setAttribute('visible', true);
+ this.downButton.setAttribute('visible', false)
this.parent.center.input.setMultiline(false);
classroot.savedInputAreaHeight = Math.max(53, this.parent.height);
this.parent.animate("height",classroot.smallInputAreaHeight,333,false);
</method>
<method name="doMultiLine">
- this.downButton.setVisible(true);
- this.upButton.setVisible(false)
+ this.downButton.setAttribute('visible', true);
+ this.upButton.setAttribute('visible', false)
// Check if we have room to grow the input area
var delta = classroot.savedInputAreaHeight - parent.height;
delta = Math.min(classroot.middle.height - (classroot.lineheight * 2) , delta);
@@ -932,14 +932,14 @@
if (typeof(global.lzconsoledebug) != 'undefined') {
this.consoleRemote = true;
- this.setVisible(false);
+ this.setAttribute('visible',false);
// Open the remote debugger socket
__LzDebug.startupConsoleRemote();
} else if (typeof(global.remotedebug) != 'undefined') {
// This case mismatch here is intentional: "remotedebug" is the query arg,
// "Debug.remoteDebug" is the attribute on the Debugger window.
this.remoteDebug = true;
- this.setVisible( false );
+ this.setAttribute('visible', false );
// Open the remote debugger socket
this.startupRemote();
@@ -969,7 +969,7 @@
for (var i = 0; i < this.saved_msgs.length; i++) {
this.__write(this.saved_msgs[i]);
}
- this.setVisible( true );
+ this.setAttribute('visible', true );
this.bringToFront();
}
Modified: openlaszlo/branches/devildog/lps/components/extensions/views/LzTextFormat.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/extensions/views/LzTextFormat.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/extensions/views/LzTextFormat.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -1,9 +1,9 @@
<library>
-<!--- @keyword deprecated
- An object to specify the format of a text object. Used only in
- Javascript by richinputtext.setTextFormat
- (deprecating 5/17/2007 - use textformat instead, per LPP-3406)
+<!---
+ An object to specify the format of a text object. Used only in
+ Javascript by richinputtext.setTextFormat.
+ @shortdesc Formats rich text
-->
<class name="textformat" extends="node">
@@ -51,12 +51,16 @@
</method>
</class>
+<!---
+ LzTextFormat is deprecated. Use 'textformat' instead.
+ @keyword deprecated
+-->
<class name="LzTextFormat" extends="textformat"
oninit="Debug.warn('`LzTextFormat` is deprecated. Use `textformat`.')"/>
</library>
<!-- * 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/branches/devildog/lps/components/incubator/draglib.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/incubator/draglib.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/incubator/draglib.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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/branches/devildog/lps/components/incubator/ulink.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/incubator/ulink.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/incubator/ulink.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -40,10 +40,10 @@
label.setText(makeTags(this.hoverTags)+this.text);
</handler>
- <method event ="onmouseout">
+ <handler name="onmouseout">
label.setAttribute('fgcolor', this.color);
label.setText(this.text);
- </method>
+ </handler>
<handler name="onclick">
LzBrowser.loadURL(this.href, this.target)
Modified: openlaszlo/branches/devildog/lps/components/rpc/library/swf/rpc.js
===================================================================
--- openlaszlo/branches/devildog/lps/components/rpc/library/swf/rpc.js 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/rpc/library/swf/rpc.js 2008-03-25 23:23:22 UTC (rev 8410)
@@ -5,7 +5,7 @@
/* LZ_COPYRIGHT_BEGIN */
/****************************************************************************
- * Copyright (c) 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
+ * Copyright (c) 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms *
****************************************************************************/
/* LZ_COPYRIGHT_END */
@@ -43,10 +43,6 @@
// FIXME [2005-06-28 pkang]: would be nice to fix this in the platform.
- Debug.write('__LZloaderReturnData', 'data=', data);
- Debug.write('... loadmc=', loadmc);
- Debug.write('...responseheaders=', responseheaders);
-
_root.LzLoadQueue.loadFinished( loadmc );
var delegate = null;
Modified: openlaszlo/branches/devildog/lps/components/rpc/rpc.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/rpc/rpc.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/rpc/rpc.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -184,54 +184,119 @@
rpc passes in an empty array.</p>
<example title="Invoking remote function using proxy function stub">
- <canvas debug="true" height="280">
-
- <debug x="10" y="40" width="470" height="230" />
-
- <soap name="temperature" autoload="false"
- wsdl="http://developerdays.com/cgi-bin/tempconverter.exe/wsdl/ITempConverter">
-
- <method name="init">
- super.init();
- Debug.write('soap service loading...');
- this.load();
- </method>
-
- <handler name="onload">
- Debug.write('temperature service loaded!');
- Debug.write('---');
-
- // don't allow others to call RPC object until proxy is loaded.
- canvas.convert.setVisible(true);
- </handler>
-
- </soap>
-
- <button name="convert" text="convert" x="10" y="10" visible="false">
-
- <attribute name="myDel"
- value="$once{new LzDelegate(this, 'myhandler')}" />
-
- <handler name="onclick">
- var f = 100;
- canvas.temperature.proxy.FtoC([ f ], this.myDel)
- Debug.write('Invoking FtoC...');
- </handler>
-
- <method name="myhandler" args="data">
- Debug.write('got data:', data);
- </method>
-
- </button>
-
- </canvas>
+ <canvas debug="true" height="280">
+
+ <debug x="10" y="40" width="470" height="230" />
+
+ <soap name="temperature" autoload="false"
+ wsdl="http://developerdays.com/cgi-bin/tempconverter.exe/wsdl/ITempConverter">
+ <method name="init">
+ super.init();
+ Debug.write('soap service loading...');
+ this.load();
+ </method>
+ <handler name="onload">
+ Debug.write('temperature service loaded!');
+ Debug.write('---');
+
+ // don't allow others to call RPC object until proxy is loaded.
+ canvas.convert.setAttribute('visible', true);
+ </handler>
+ </soap>
+ <button name="convert" text="convert" x="10" y="10" visible="false">
+ <attribute name="myDel" value="$once{new LzDelegate(this, 'myhandler')}" />
+ <handler name="onclick">
+ var f = 100;
+ canvas.temperature.proxy.FtoC([ f ], this.myDel)
+ Debug.write('Invoking FtoC...');
+ </handler>
+ <method name="myhandler" args="data">
+ Debug.write('got data:', data);
+ </method>
+
+ </button>
+
+ </canvas>
</example>
+ <p>Alternatively, you can use remotecall for a more declarative approach to invoking functions.
+ See the remotecall reference or the RPC chapter of the Developer's Guide for more information.</p>
+ <example title="Invoking remote function using remotecall">
+ <canvas debug="true" height="280">
+
+ <debug x="10" y="40" width="470" height="230" />
+
+ <soap name="temperature" autoload="false"
+ wsdl="http://developerdays.com/cgi-bin/tempconverter.exe/wsdl/ITempConverter">
+
+ <method name="init">
+ super.init();
+ Debug.write('soap service loading...');
+ this.load();
+ </method>
+
+ <handler name="onload">
+ Debug.write('temperature service loaded!');
+ Debug.write('---');
+
+ // don't allow others to call RPC object until proxy is loaded.
+ canvas.convert.setAttribute('visible', true);
+ </handler>
+
+ <remotecall funcname="FtoC">
+ <param value="100" />
+
+ <handler name="ondata" args="value">
+ Debug.write('got data:', value);
+ </handler>
+ <handler name="onerror" args="errmsg">
+ Debug.write('error:', errmsg);
+ </handler>
+
+ </remotecall>
+
+ </soap>
+
+ <button name="convert" text="convert" x="10" y="10" visible="false">
+ <handler name="onclick">
+ canvas.temperature.FtoC.invoke();
+ Debug.write('Invoking FtoC...');
+ </handler>
+ </button>
+
+ </canvas>
+ </example>
+ <p><b>See Also:</b></p>
+ <ul>
+ <li>
+ <a href="../reference/javarpc.html"><code class="classname">javarpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/soap.html"><code class="classname">soap</code></a>
+ </li>
+ <li>
+ <a href="../reference/xmlrpc.html"><code class="classname">xmlrpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/remotecall.html"><code class="classname">remotecall</code></a>
+ </li>
+ <li>
+ <a href="../guide/rpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: RPC chapter</a>
+ </li>
+ <li>
+ <a href="../guide/rpc-javarpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: JavaRPC chapter</a>
+ </li>
+ <li>
+ <a href="../guide/rpc-soap.html" target="laszlo-dguide" shape="rect">Developer's Guide: SOAP chapter</a>
+ </li>
+ <li>
+ <a href="../guide/rpc-xmlrpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: XML-RPC chapter</a>
+ </li>
+ </ul>
+
</text>
</doc>
</class>
-
- <!--- A class to invoke rpc methods more declaratively. -->
<class name="remotecall" extends="node">
<!--- Name of remotecall. Default is value of funcname attribute. -->
<attribute name="name" value="$once{null}" />
@@ -276,7 +341,7 @@
LzDelegate passed in contains a property called 'dataobject', the
return value will be mapped to it. The dataobject property can be
a dataset or a LzDataElement object.
- @return Number the unique sequence request number associated with
+ @return Number: the unique sequence request number associated with
this call, or -1 if there was a problem invoking this method. -->
<method name="invoke" args="params, delegate">
<![CDATA[
@@ -390,7 +455,238 @@
}
]]>
</method>
+ <doc>
+ <tag name="shortdesc"><text>A class to use rpc methods declaratively</text></tag><text>
+ <p>The <remotecall> element allows for a more declarative style approach to using RPC functions. Calling
+ function stubs will generally result in your code looking very scripty.</p>
+ <p>Remotecall requires the funcname attribute to be set. Funcname refers to the remote function name. By default,
+ the name of the remotecall is the same as funcname unless explicitly set to something else. Multiple remotecalls
+ can refer to the same funcname, but remotecall names must be unique within the same element context.</p>
+ <p><param> elements declared in the remotecall body are used when invoking the remote function. The declaration order of
+ <param>s should match what the remote function expects.</p>
+ <example title="Using RPC methods">
+ <canvas debug="true" height="280">
+
+ <debug x="10" y="40" width="470" height="230" />
+
+ <soap name="temperature" autoload="false"
+ wsdl="http://developerdays.com/cgi-bin/tempconverter.exe/wsdl/ITempConverter">
+
+ <method name="init">
+ super.init();
+ Debug.write('soap service loading...');
+ this.load();
+ </method>
+
+ <handler name="onload">
+ Debug.write('temperature service loaded!');
+ Debug.write('---');
+
+ // don't allow others to call RPC object until proxy is loaded.
+ canvas.convert.setAttribute('visible', true);
+ </handler>
+
+ <handler name="ondata" args="value">
+ Debug.write('soap object parent ondata:', value);
+ </handler>
+
+ <remotecall <em>name="ftoc1" funcname="FtoC"</em>>
+ <param value="100" />
+ </remotecall>
+
+ <remotecall <em>name="ftoc2" funcname="FtoC"</em>>
+ <param value="200" />
+ <handler name="ondata" args="value">
+ Debug.write('ftoc ondata:', value);
+ </handler>
+ </remotecall>
+
+ </soap>
+
+ <view name="convert" x="10" y="10" visible="false"
+ layout="axis: x; spacing: 5">
+ <button text="convert 100F to C">
+ <handler name="onclick">
+ canvas.temperature.ftoc1.invoke()
+ Debug.write('Invoking FtoC 1...');
+ </handler>
+ </button>
+ <button text="convert 200F to C">
+ <handler name="onclick">
+ canvas.temperature.ftoc2.invoke()
+ Debug.write('Invoking FtoC 2...');
+ </handler>
+ </button>
+ </view>
+
+ </canvas>
+ </example>
+ <p>Any events not handled by remotecall can be handled by a remotecall's parent. A remotecall element can be
+ declared anywhere in the view hierarchy. However, if it's not within an RPC object
+ (like <soap>, <javarpc, <xmlrpc>), the remotecontext attribute must be set. The remotecontext tells the
+ remotemethod which RPC object t>o refer to when invoking the remote method.</p>
+ <example>
+ <canvas debug="true" height="280">
+
+ <debug x="10" y="40" width="470" height="230" />
+
+ <soap name="temperature" autoload="false"
+ wsdl="http://developerdays.com/cgi-bin/tempconverter.exe/wsdl/ITempConverter">
+
+ <method name="init">
+ super.init();
+ Debug.write('soap service loading...');
+ this.load();
+ </method>
+
+ <handler name="onload">
+ Debug.write('temperature service loaded!');
+ Debug.write('---');
+
+ // don't allow others to call RPC object until proxy is loaded.
+ canvas.convert.setAttribute('visible', true);
+ </handler>
+
+ <handler name="ondata" args="value">
+ Debug.write('soap object ondata:', value);
+ </handler>
+
+ <handler name="onerror" args="errmsg">
+ Debug.write('error:', errmsg);
+ </handler>
+
+ </soap>
+
+ <view name="convert" x="10" y="10" visible="false"
+ layout="axis: x; spacing: 5">
+
+ <button text="convert 100F to C">
+
+ <handler name="onclick">
+ this.FtoC.invoke()
+ Debug.write('Converting 100F to Celsius...');
+ </handler>
+
+ <remotecall funcname="FtoC"
+ remotecontext="$once{canvas.temperature}">
+ <param value="100" />
+ </remotecall>
+
+ </button>
+
+ <button text="convert 200F to C">
+
+ <handler name="onclick">
+ this.FtoC.invoke()
+ Debug.write('Converting 200F to Celsius...');
+ </handler>
+
+ <remotecall funcname="FtoC"
+ remotecontext="$once{canvas.temperature}">
+ <param value="200" />
+ <handler name="ondata" args="value">
+ Debug.write('200F in Celsius is', value);
+ </handler>
+ </remotecall>
+ </button>
+ </view>
+
+ </canvas>
+</example>
+<p>The order in which events (ondata, onerror) are handled are as follow:</p>
+<ol>
+
+ <li>Use event handler defined in remotecall.</li>
+
+ <li>Else use event handler defined in parent.</li>
+
+ <li>Else if remotecall is defined outside of RPC object (i.e. remotecontext
+ attribute is set) use event handler defined in RPC object (i.e. remotecontext
+ value).</li>
+
+ <li>Otherwise event is not handled.</li>
+
+</ol>
+<p>To databind to a successful return value, you can set the dataobject
+ attribute to a dataset. For more information on databinding with RPC, see the
+ <a href="../guide/rpc.html" target="laszlo-dguide" shape="rect">RPC chapter</a></p>
+<example>
+ <canvas debug="true" height="300" width="680">
+
+ <debug x="225" width="450" height="280" />
+
+ <dataset name="googleDset" />
+
+ <soap name="google" wsdl="http://api.google.com/GoogleSearch.wsdl">
+ <handler name="onload">
+ Debug.write('google soap service stub loaded');
+ </handler>
+
+ <handler name="onerror" args="error">
+ Debug.write('error:', error);
+ </handler>
+
+ <remotecall name="search" funcname="doGoogleSearch"
+ dataobject="googleDset">
+
+ <param value="'2TKUw4ZQFHJ84ByemZK0EXV0Lj+7xGOx'" />
+ <param value="'sweet'" />
+ <param value="1" />
+ <param value="10" />
+ <param value="true" />
+ <param value="''" />
+ <param value="true" />
+ <param value="''" />
+ <param value="''" />
+ <param value="''" />
+
+ <handler name="ondata" args="value">
+ Debug.write('got result');
+ Debug.inspect(value);
+ </handler>
+
+ </remotecall>
+ </soap>
+
+ <view layout="spacing: 5" >
+ <button text="search" onclick="google.search.invoke()" />
+ <view bgcolor="yellow" layout="axis: y" >
+ <view>
+ <datapath xpath="googleDset:/resultElements/item" pooling="true" />
+ <text datapath="URL/text()" resize="true"/>
+ </view>
+ </view>
+ </view>
+ </canvas>
+ </example>
+
+
+ <p><b>See Also:</b></p>
+
+ <ul>
+ <li>
+ <a href="../reference/param.html"><code class="classname">param</code></a>
+ </li>
+ <li>
+ <a href="../reference/rpc.html"><code class="classname">rpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/javarpc.html"><code class="classname">javarpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/soap.html"><code class="classname">soap</code></a>
+ </li>
+ <li>
+ <a href="../reference/xmlrpc.html"><code class="classname">xmlrpc</code></a>
+ </li>
+ <li>
+ <a href="../guide/rpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: RPC chapter</a>
+ </li>
+ </ul>
+ </text>
+ </doc>
+
</class>
@@ -401,6 +697,44 @@
value attribute and getValue method are declared, param will use
getValue(). -->
<attribute name="value" value="null" type="expression" />
+ <doc>
+ <tag name="shortdesc"><text>param tag for remotecall</text></tag>
+ <text>
+ <p>Tag to declaratively set parameter values for <remotecall>. If a
+ getValue method is declared in the body of remotecall, use its return as
+ value for paramter. If both getValue method and value attribute are set in
+ param, getValue wins.</p>
+ <programlisting title="Usage example">
+ <remotecall name="func1" funcname="someFunc">
+ <param value="'some string value'" />
+ </remotecall>
+
+ <remotecall name="func2" funcname="someFunc">
+ <param>
+ <method name="getValue">
+ return 'some string value';
+ </method>
+ </param>
+ </remotecall>
+
+ <remotecall name="func2" funcname="someFunc">
+ <!-- param will use getValue's return value. -->
+ <param value="'a value'">
+ <method name="getValue">
+ return 'some string value';
+ </method>
+ </param>
+ </remotecall>
+ </programlisting>
+ <p> <b>See Also:</b></p>
+ <ul>
+ <li>
+ <a href="../reference/remotecall.html"><code class="classname">remotecall</code></a>
+ </li>
+ </ul>
+
+ </text>
+ </doc>
</class>
</library>
Modified: openlaszlo/branches/devildog/lps/components/rpc/sessionrpc.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/rpc/sessionrpc.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/rpc/sessionrpc.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -9,24 +9,6 @@
</allow>
</security>
- <!--- A class to get an http session object and invoke its methods. Remote
- method signatures are:
-
- getAttribute(name) - returns object, array, or primitive type.
- getAttributeNames() - returns array of attribute names.
- getId() - returns remote session id
- getMaxInactiveInterval() - returns max inactive interval for session.
- invalidate() - invalidate remote session
- isNew() - returns true if the client does not yet know about the
- session or if the client chooses not to join the session.
- removeAttribute(name) - remove attribute named name; returns void.
- setAttribute(name,value) - set attribute named name with value; returns
- void.
- setMaxInactiveInterval(interval) - set max inactive interval for
- session.
-
- See javax.servlet.http.HttpSession in the Java Servlet API
- documentation for more information. -->
<class name="sessionrpc" extends="rpc">
<!--- @keywords private -->
@@ -71,12 +53,204 @@
return ok;
</method>
-
+<doc>
+ <tag name="shortdesc"><text>SessionRPC object</text></tag>
+ <text>
+ <p>A class to get an http session object and invoke its methods. Remote method
+ signatures are:</p>
+
+
+ <ul>
+
+ <li>
+ <dfn>getAttribute(name)</dfn>: returns object, array, or primitive
+ type.</li>
+
+ <li>
+ <dfn>getAttributeNames()</dfn>: returns array of attribute names.</li>
+
+ <li>
+ <dfn>getId()</dfn>: returns remote session id</li>
+
+ <li>
+ <dfn>getMaxInactiveInterval()</dfn>: returns max inactive interval for
+ session.</li>
+
+ <li>
+ <dfn>invalidate()</dfn>: invalidate remote session.</li>
+
+ <li>
+ <dfn>isNew()</dfn>: returns true if the client does not yet know about the
+ session or if the client chooses not to join the session.</li>
+
+ <li>
+ <dfn>removeAttribute(name)</dfn>: remove attribute named name; returns
+ void.</li>
+
+ <li>
+ <dfn>setAttribute(name,value)</dfn>: set attribute named name with value;
+ returns void.</li>
+
+ <li>
+ <dfn>setMaxInactiveInterval(interval)</dfn>: set max inactive interval for
+ session.</li>
+
+ </ul>
+
+
+ <p>See <a href="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/http/HttpSession.html" shape="rect">
+ javax.servlet.http.HttpSession</a> in the <a href="http://java.sun.com/products/servlet/2.3/javadoc/" shape="rect">Java Servlet API</a>
+ documentation for details.</p>
+ <example>
+ <canvas width="800" height="450" debug="true">
+
+ <debug x="300" y="20" width="500" height="400" />
+
+ <include href="rpc/sessionrpc.lzx" />
+
+ <dataset name="idDset" />
+
+ <sessionrpc id="session" autoload="false">
+
+ <handler name="oninit">
+ Debug.write('loading session object...')
+ this.load();
+ </handler>
+
+ <handler name="onload">
+ Debug.write('session object loaded');
+ canvas.buttons.setAttribute('visible', true);
+ </handler>
+
+ <handler name="ondata" args="data">
+ Debug.write("default ondata:", data);
+ </handler>
+
+ <handler name="onerror" args="error">
+ Debug.write("default onerror:", error);
+ </handler>
+
+ <remotecall funcname="getId" />
+
+ <remotecall name="getIdWithDset" funcname="getId" dataobject="idDset" />
+
+ <remotecall funcname="getMaxInactiveInterval" />
+
+ <remotecall funcname="isNew" />
+
+ <remotecall funcname="setMaxInactiveInterval">
+ <param value="15" />
+ </remotecall>
+
+ <remotecall name="setmyattr" funcname="setAttribute">
+ <param value="'myattr'" />
+ <param value="'MY ATTRIBUTE'" />
+ </remotecall>
+
+ <remotecall name="setmyother" funcname="setAttribute">
+ <param value="'myother'" />
+ <param value="'MY OTHER'" />
+ </remotecall>
+
+ <remotecall name="getmyattr" funcname="getAttribute">
+ <param value="'myattr'" />
+ </remotecall>
+
+ <remotecall name="getmyother" funcname="getAttribute">
+ <param value="${'myother'}" />
+ </remotecall>
+
+ <remotecall funcname="getAttributeNames" />
+
+ <remotecall name="removemyattr" funcname="removeAttribute">
+ <param value="'myattr'" />
+ </remotecall>
+
+ <remotecall name="removemyother" funcname="removeAttribute">
+ <param value="'myother'" />
+ </remotecall>
+
+ </sessionrpc>
+
+
+ <view name="buttons" x="10" y="10" layout="spacing: 5" visible="false">
+ <button text="getId" onclick="session.getId.invoke()" />
+ <button text="getIdWithDset" onclick="session.getIdWithDset.invoke()" />
+ <view height="20" width="50">
+ <text datapath="idDset:/text()" width="240" bgcolor="red"/>
+ </view>
+ <button text="getMaxInactiveInterval" onclick="session.getMaxInactiveInterval.invoke()" />
+ <button text="isNew" onclick="session.isNew.invoke()" />
+ <button text="setMaxInactiveInterval" onclick="session.setMaxInactiveInterval.invoke()" />
+
+ <view x="20" layout="spacing: 5">
+
+ <attribute name="myDel" value="null" type="expression" />
+
+ <handler name="oninit">
+ this.myDel = new LzDelegate(this, 'myhandler');
+ </handler>
+
+ <method name="myhandler" args="data">
+ Debug.write('myhandler:', data);
+ </method>
+
+ <button text="setmyattr" onclick="session.setmyattr.invoke()" />
+
+ <button text="setmyother" onclick="session.setmyother.invoke()" />
+
+ <button text="getmyattr" onclick="session.getmyattr.invoke()" />
+
+ <button text="getmyother" onclick="session.getmyother.invoke()" />
+
+ <button text="getmyattr (w/params)" onclick="session.getmyattr.invoke(['myattr'])" />
+
+ <button text="getmyattr (w/params and delegate)">
+ <handler name="onclick">
+ session.getmyattr.invoke(['myattr'], parent.mydel);
+ </handler>
+ </button>
+
+ <button text="getAttributeNames" onclick="session.getAttributeNames.invoke()" />
+
+ <button text="removemyattr" onclick="session.removemyattr.invoke()" />
+
+ <button text="removemyother" onclick="session.removemyother.invoke()" />
+
+ </view>
+ </view>
+ </canvas>
+ </example>
+ <b>See Also:</b>
+ <br />
+ <ul>
+ <li>
+ <a href="../reference/rpc.html"><code class="classname">rpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/javarpc.html"><code class="classname">javarpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/webapprpc.html"><code class="classname">webapprpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/remotecall.html"><code class="classname">remotecall</code></a>
+ </li>
+ <li>
+ <a href="../developers/rpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: RPC chapter</a>
+ </li>
+ <li>
+ <a href="../developers/rpc-javarpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: JavaRPC chapter</a>
+ </li>
+ </ul>
+
+ </text>
+</doc>
</class>
</library>
<!-- * 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/branches/devildog/lps/components/rpc/soap.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/rpc/soap.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/rpc/soap.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -3,7 +3,6 @@
<include href="rpc/rpc.lzx" />
<include href="rpc/library/soap.js" />
- <!--- A class to get and use a soap object. -->
<class name="soap" extends="rpc">
<!--- Required attribute that specifies WSDL to read for the SOAP
@@ -81,12 +80,296 @@
}
return ok;
</method>
+ <doc>
+ <tag name="shortdesc"><text>SOAP (Simple Object Access Prototcol)</text></tag>
+ <text>
+ <p>SOAP (Simple Object Access Prototcol) is used to exchange information in a
+ distributed environment. A typical scenarion involves a SOAP client invoking a
+ client-side function stub to invoke a SOAP web service operation. The SOAP web
+ service then returns data to the client, like stock information or the result to
+ a math function. The <a href="http://www.w3.org/TR/soap/" shape="rect">SOAP
+ protocol</a> is a work in progress being drafted by the <a
+ href="http://www.w3.org" shape="rect">W3C</a>. For the latest SOAP
+ information.</p>
+
+ <p>The <soap> element creates a client-side representation of a SOAP
+ service based on a WSDL. The name and wsdl attributes are required.</p>
+ <example>
+ <canvas debug="true" height="530">
+
+ <debug x="15" y="15" width="415" height="500" />
+
+ <soap name="amazon"
+ wsdl="http://soap.amazon.com/schemas3/AmazonWebServices.wsdl">
+
+ <handler name="onload">
+ Debug.write('Amazon soap service loaded');
+ Debug.write('Compare proxy stubs with WSDL SOAP operations.');
+ Debug.write('Amazon WSDL at ' + this.wsdl);
+ Debug.write('proxy:');
+ Debug.inspect(this.proxy);
+ </handler>
+
+ <handler name="onerror" args="error">
+ Debug.write('error:', error);
+ </handler>
+
+ </soap>
+
+ </canvas>
+ </example>
+ <p>Document style operations use XML (i.e. documents) as paramaters. Document
+ style operations return an array of <a href="../reference/lzdataelement.html"><code class="classname">LzDataElement</code></a>s,
+ though often only a single
+ <code class="classname">LzDataElement</code> will exist in the array. The XML string (document) parameter
+ passed into the operation must match the XML schema as defined in the WSDL.</p>
+ <example>
+ <canvas debug="true">
+
+ <debug y="30" x="145" width="350" height="300" />
+
+ <!-- This SOAP service uses document/literal messages for its
+ operations. Each operation is passed a document as a parameter. -->
+ <soap name="maths"
+ wsdl="http://www.dotnetjunkies.com/quickstart/aspplus/samples/services/MathService/VB/MathService.asmx?WSDL">
+
+ <!-- Method to make a document for SOAP message requests -->
+ <method name="makedoc" args="func, av, bv">
+ <![CDATA[
+ if (func == null) return;
+ var s = '<' + func + ' xmlns="' + 'http://tempuri.org/' + '" >' +
+ '<A>' + av + '</A>' +
+ '<B>' + bv + '</B>' +
+ '</' + func + '>';
+ Debug.write(s);
+ return s;
+ ]]>
+ </method>
+
+ <handler name="onload">
+ // make buttons visible once SOAP object is loaded
+ canvas.buttons.setAttribute('visible', true);
+ </handler>
+
+ <handler name="onerror" args="error">
+ Debug.write('error:', error);
+ </handler>
+
+ <handler name="ontimeout" args="error">
+ Debug.write('timeout:', error);
+ </handler>
+
+ <handler name="ondata" args="value">
+ Debug.write(value);
+ result.setText(value);
+ </handler>
+
+ <remotecall funcname="Add">
+ <param value="${ canvas.maths.makedoc(parent.name, a.text, b.text) }" />
+ </remotecall>
+ <remotecall funcname="Subtract">
+ <param value="${ canvas.maths.makedoc(parent.name, a.text, b.text) }" />
+ </remotecall>
+ <remotecall funcname="Multiply">
+ <param value="${ canvas.maths.makedoc(parent.name, a.text, b.text) }" />
+ </remotecall>
+ <remotecall funcname="Divide">
+ <param value="${ canvas.maths.makedoc(parent.name, a.text, b.text) }" />
+ </remotecall>
+ </soap>
+
+ <view name="buttons" x="10" y="10" visible="false" layout="spacing: 10" >
+ <text><b>.NET MathService</b></text>
+
+ <view layout="axis: x" ><text y="3">a:</text><edittext id="a" text="10"/></view>
+ <view layout="axis: x" ><text y="3">b:</text><edittext id="b" text="2" /></view>
+ <view layout="axis: x" ><text>result:</text><text id="result"/></view>
+
+ <button text="add" onclick="canvas.maths.Add.invoke()" />
+ <button text="subtract" onclick="canvas.maths.Subtract.invoke()" />
+ <button text="multiply" onclick="canvas.maths.Multiply.invoke()" />
+ <button text="divide" onclick="canvas.maths.Divide.invoke()" />
+
+ </view>
+
+ </canvas>
+ </example>
+ <p>The XML Schema in the WSDL describes how the XML should be structured for
+ each of the operations. The WSDL below describes how what the schema should look
+ like for the <code>Add</code> operation.</p>
+ <programlisting>
+ <definitions xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
+ xmlns:s0="http://tempuri.org/"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+ targetNamespace="http://tempuri.org/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+ <types>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
+ <s:element name="Add">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="A" type="s:float" />
+ <s:element minOccurs="1" maxOccurs="1" name="B" type="s:float" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <s:element name="AddResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="AddResult" type="s:float" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+
+ <!-- MORE SCHEMA DECLARATION (for Subtract, Multiply, Divide) HERE -->
+
+ </s:schema>
+ </types>
+
+ <message name="AddSoapIn">
+ <part name="parameters" element="s0:Add" />
+ </message>
+ <message name="AddSoapOut">
+ <part name="parameters" element="s0:AddResponse" />
+ </message>
+
+ <!-- OTHER MESSAGES (for Subtract, Multiply, Divide) HERE -->
+
+ <portType name="MathServiceSoap">
+ <operation name="Add">
+ <input message="s0:AddSoapIn" />
+ <output message="s0:AddSoapOut" />
+ </operation>
+ <!-- OTHER PORT TYPE OPERATIONS (for Subtract, Multiply, Divide) HERE -->
+ </portType>
+
+ <binding name="MathServiceSoap" type="s0:MathServiceSoap">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+ <operation name="Add">
+ <soap:operation soapAction="http://tempuri.org/Add" style="document" />
+ <input>
+ <soap:body use="literal" />
+ </input>
+ <output>
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ <!-- OTHER SOAP BINDING OPERATIONS (for Subtract, Multiply, Divide) HERE -->
+ </binding>
+
+ <service name="MathService">
+ <port name="MathServiceSoap" binding="s0:MathServiceSoap">
+ <soap:address location="http://www.dotnetjunkies.com/quickstart/aspplus/samples/services/MathService/VB/MathService.asmx" />
+ </port>
+ </service>
+
+ </definitions>
+ </programlisting>
+ <p>RPC style operations behave just like functions in that, instead of
+ documents, values are passed in as parameters. Parameters can be of simple data
+ type (number, boolean), array, or object. The parameter type for the operation
+ is described in the WSDL's XML schema.</p>
+ <example>
+ <canvas debug="true" height="400" width="530">
+
+ <debug x="10" y="190" width="510" height="200" />
+
+ <dataset name="googleDset" />
+
+ <soap name="google" wsdl="http://api.google.com/GoogleSearch.wsdl">
+ <handler name="onload">
+ Debug.write('google soap service loaded');
+ </handler>
+
+ <handler name="onerror" args="error">
+ Debug.write('error:', error);
+ </handler>
+
+ <!-- See RPC chapter for details on remotecall and how dataobject is
+ used to data bind to RPC operation results. -->
+ <remotecall name="search" funcname="doGoogleSearch"
+ dataobject="googleDset">
+
+ <param value="'2TKUw4ZQFHJ84ByemZK0EXV0Lj+7xGOx'" />
+ <param value="${ s.text }" />
+ <param value="1" />
+ <param value="10" />
+ <param value="true" />
+ <param value="''" />
+ <param value="true" />
+ <param value="''" />
+ <param value="''" />
+ <param value="''" />
+
+ <handler name="ondata" args="value">
+ Debug.write('search result:\n', value);
+ </handler>
+
+ </remotecall>
+ </soap>
+
+ <view x="10" y="10" layout="spacing: 5" >
+ <view layout="axis: x; spacing: 5">
+ <edittext id="s" text="SOAP" />
+ <button text="search"
+ onclick="Debug.write('Invoking search...'); google.search.invoke()" />
+ </view>
+
+ <view width="505" height="140" bgcolor="silver" layout="axis: y" >
+ <view>
+ <datapath xpath="googleDset:/resultElements/item" pooling="true" />
+ <text width="200" datapath="title/text()" clip="true" />
+ <text x="205" width="300" datapath="URL/text()" clip="true" />
+ </view>
+ </view>
+
+ </view>
+
+ </canvas>
+ </example>
+ <p>The example demonstrates how a result value, which is actually a JavaScript
+ object, can be data bound through the dataobject attribute in remotecall. For
+ more details, see the remotecall section in the <a href="../developers/rpc-soap.html" target="laszlo-dguide" shape="rect">RPC chapter</a> of the <a href="../developers/" target="laszlo-dguide" shape="rect">Developer's Guide</a>. To read about passing complex type
+ parameters, read the <a href="../developers/rcp-soap.html" target="laszlo-dguide" shape="rect">SOAP chapter</a>.</p>
+
+
+ <p><b>See Also:</b></p>
+
+ <ul>
+ <li>
+ <a href="../reference/rpc.html"><code class="classname">rpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/javarpc.html"><code class="classname">javarpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/xmlrpc.html"><code class="classname">xmlrpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/remotecall.html"><code class="classname">remotecall</code></a>
+ </li>
+ <li>
+ <a href="../developers/rpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: RPC</a>
+ </li>
+ <li>
+ <a href="../developers/rpc-soap.html" target="laszlo-dguide" shape="rect">Developer's Guide: SOAP</a>
+ </li>
+ </ul>
+
+ </text>
+ </doc>
</class>
</library>
<!-- * 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/branches/devildog/lps/components/rpc/xmlrpc.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/components/rpc/xmlrpc.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/components/rpc/xmlrpc.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -3,7 +3,6 @@
<include href="rpc/rpc.lzx" />
<include href="rpc/library/xmlrpc.js" />
- <!--- A class to call XML-RPC services. -->
<class name="xmlrpc" extends="rpc">
<!--- (Required) XML-RPC service URL. The URL must be http. -->
@@ -61,7 +60,84 @@
}
super.init();
</method>
-
+ <doc>
+ <tag name="shortdesc">
+ <text>XML-RPC implementation</text>
+ </tag>
+ <text>
+ <p>XML-RPC is simple spec that describes how to invoke a remote operation using
+ XML over HTTP. Laszlo XML-RPC is part of <a href="../developers/rpc.html" target="laszlo-dguide" shape="rect">Laszlo
+ RPC</a> and shares many of the same APIs and concept. Laszlo RPC includes <a href="../developers/rpc-soap.html" target="laszlo-dguide" shape="rect">SOAP</a> and <a href="../guide/rpc-javarpc.html" target="laszlo-dguide" shape="rect">JavaRPC</a>. For more information on XML-RPC,
+ go to <a href="http://www.xmlrpc.com/" shape="rect">XML-RPC.com</a>
+ </p>
+
+
+ <p>Most Laszlo RPC objects like JavaRPC and SOAP will set function stubs in the
+ proxy property during load based on methods described by a class (for JavaRPC)
+ or on a service description (using a WSDL in SOAP). Remotecall declarations
+ refer to these function stubs and any remotecalls not pointing to a function
+ stub that doesn't exist will generate an error/warning. In <xmlrpc>,
+ function stubs are create based on remotecall declarations. Note that XML-RPC
+ use dot notation for their operation names. Because that will conflict with the
+ view system's notation, it's suggested that remotecalls are explictly named.</p>
+ <example>
+ <canvas debug="true" height="400">
+
+ <debug x="10" y="40" width="450" height="350" />
+
+ <xmlrpc name="meerkat"
+ service="http://www.oreillynet.com/meerkat/xml-rpc/server.php">
+
+ <handler name="onload">
+ Debug.write('meerkat XML-RPC service loaded');
+ Debug.write('proxy:');
+ Debug.inspect(this.proxy);
+ </handler>
+
+ <handler name="ondata" args="data">
+ Debug.write('got data:', data);
+ </handler>
+
+ <handler name="onerror" args="error">
+ Debug.write('onerror:', error);
+ </handler>
+
+ <remotecall name="gc" funcname="meerkat.getCategories" />
+
+ </xmlrpc>
+
+ <button text="getCategories" x="10" y="10">
+ <handler name="onclick">
+ Debug.write('getting categories...');
+ meerkat.gc.invoke()
+ </handler>
+ </button>
+
+ </canvas>
+ </example>
+ <p><b>See Also:</b></p>
+ <ul>
+ <li>
+ <a href="../reference/rpc.html"><code class="classname">rpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/javarpc.html"><code class="classname">javarpc</code></a>
+ </li>
+ <li>
+ <a href="../reference/soap.html"><code class="classname">soap</code></a>
+ </li>
+ <li>
+ <a href="../reference/remotecall.html"><code class="classname">remotecall</code></a>
+ </li>
+ <li>
+ <a href="../guide/rpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: RPC chapter</a>
+ </li>
+ <li>
+ <a href="../guide/rpc-xmlrpc.html" target="laszlo-dguide" shape="rect">Developer's Guide: XMLRPC chapter</a>
+ </li>
+ </ul>
+ </text>
+ </doc>
</class>
</library>
Modified: openlaszlo/branches/devildog/lps/utils/startup-solo.lzx
===================================================================
--- openlaszlo/branches/devildog/lps/utils/startup-solo.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/lps/utils/startup-solo.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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/branches/devildog/test/leak/view_leaks.lzx
===================================================================
--- openlaszlo/branches/devildog/test/leak/view_leaks.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/test/leak/view_leaks.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -23,9 +23,9 @@
<text name="goo"/>
<!--
<class name="goo" extends="view">
- <method event="onclick">
+ <handler name="onclick">
this.deleteNode()
- </method>
+ </handler>
</class>
<view visible="true" name="1">
@@ -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/branches/devildog/test/lztest/lztest-placement.lzx
===================================================================
--- openlaszlo/branches/devildog/test/lztest/lztest-placement.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/test/lztest/lztest-placement.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -48,6 +48,12 @@
</nc1>
</TestCaseWrapper>
+
+ <TestCaseWrapper name="statePlacement" id="statePlacementWrapper">
+ <nc1 name="nci1">
+ <state name="n1state" placement="n1"/>
+ </nc1>
+ </TestCaseWrapper>
<script><![CDATA[
@@ -59,7 +65,12 @@
LzTestManager.assertEquals(basicPlacementWrapper.nci2.n2, basicPlacementWrapper.nci2.n1.searchImmediateSubnodes("name", "n2"));
}
+suiteNodePlacement.statePlacement = function () {
+ LzTestManager.assertEquals(statePlacementWrapper.nci1.n1state, statePlacementWrapper.nci1.n1.searchImmediateSubnodes("name", "n1state"));
+}
+
suiteNodePlacement.addTest(suiteNodePlacement.basicPlacement);
+suiteNodePlacement.addTest(suiteNodePlacement.statePlacement);
suiteNodePlacement.addTest( function() {
LzTestManager.assertTrue("false", "TODO: port the rest of test/lzunit/lzunit-node-placement.lzx (bshine 4.24.06)");
}
@@ -72,7 +83,7 @@
</canvas>
<!--
/* X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2006 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2006-2008 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ******************************************************/
-->
Modified: openlaszlo/branches/devildog/test/smoke/compiler.lzl
===================================================================
--- openlaszlo/branches/devildog/test/smoke/compiler.lzl 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/test/smoke/compiler.lzl 2008-03-25 23:23:22 UTC (rev 8410)
@@ -13,8 +13,87 @@
<method name="tearDown">
</method>
-
-
+
+ <!-- methods to help test optional and variable arguments -->
+ <method name="restToString" args="arr">
+ var result = new String("");
+ for (var i=0; i<arr.length; i++) {
+ if (result.length != 0) {
+ result += ',';
+ }
+ result += arr[i];
+ }
+ return result;
+ </method>
+ <method name="opt_f0" args="">
+ return 'opt_f0()';
+ </method>
+ <method name="opt_f00" args="...rest">
+ return 'opt_f00(' + this.restToString(rest) + ')';
+ </method>
+ <method name="opt_f000" args="x=null">
+ return 'opt_f000(' + x + ')';
+ </method>
+ <method name="opt_f0000" args="x=null, ...rest">
+ var restcomma = rest.length > 0 ? ',' : '';
+ return 'opt_f0000(' + x + restcomma + this.restToString(rest) + ')';
+ </method>
+ <method name="opt_f1" args="x">
+ return 'opt_f1(' + x + ')';
+ </method>
+ <method name="opt_f11" args="x, ...rest">
+ var r = this.restToString(rest);
+ var restcomma = rest.length > 0 ? ',' : '';
+ return 'opt_f11(' + x + restcomma + r + ')';
+ </method>
+ <method name="opt_f2" args="x=null, y=null">
+ return 'opt_f2(' + x + ',' + y + ')';
+ </method>
+ <method name="opt_f22" args="x, y=null">
+ return 'opt_f22(' + x + ',' + y + ')';
+ </method>
+ <method name="opt_f4" args="w, x, y=null, z=null">
+ return 'opt_f4(' + w + ',' + x + ',' + y + ',' + z + ')';
+ </method>
+ <method name="opt_f5" args="w, x, y=null, z=null, ...rest">
+ var restcomma = rest.length > 0 ? ',' : '';
+ return 'opt_f5(' + w + ',' + x + ',' + y + ',' + z + restcomma + this.restToString(rest) + ')';
+ </method>
+ <method name="opt_f6" args="x=1,y=2">
+ return x+y;
+ </method>
+
+ <method name="testOptionalArguments">
+ assertEquals(opt_f0(), 'opt_f0()', 'optional args test f0')
+ assertEquals(opt_f00(), 'opt_f00()', 'optional args test f00')
+ assertEquals(opt_f00(0), 'opt_f00(0)', 'optional args test f00')
+ assertEquals(opt_f00(2,3,4), 'opt_f00(2,3,4)', 'optional args test f00')
+ assertEquals(opt_f000(), 'opt_f000(null)', 'optional args test f000')
+ assertEquals(opt_f000(3), 'opt_f000(3)', 'optional args test f000')
+ assertEquals(opt_f0000(), 'opt_f0000(null)', 'optional args test f0000')
+ assertEquals(opt_f0000(7), 'opt_f0000(7)', 'optional args test f0000')
+ assertEquals(opt_f0000(7,11), 'opt_f0000(7,11)', 'optional args test f0000')
+ assertEquals(opt_f1(1), 'opt_f1(1)', 'optional args test f1')
+ assertEquals(opt_f11(11), 'opt_f11(11)', 'optional args test f11')
+ assertEquals(opt_f11(11,12), 'opt_f11(11,12)', 'optional args test f11')
+ assertEquals(opt_f2(), 'opt_f2(null,null)', 'optional args test f2')
+ assertEquals(opt_f2(2), 'opt_f2(2,null)', 'optional args test f2')
+ assertEquals(opt_f2(2,3), 'opt_f2(2,3)', 'optional args test f2')
+ assertEquals(opt_f22(2), 'opt_f22(2,null)', 'optional args test f22')
+ assertEquals(opt_f22(2,3), 'opt_f22(2,3)', 'optional args test f22')
+ assertEquals(opt_f4(4,5), 'opt_f4(4,5,null,null)', 'optional args test f4')
+ assertEquals(opt_f4(4,5,6), 'opt_f4(4,5,6,null)', 'optional args test f4')
+ assertEquals(opt_f4(4,5,6,7), 'opt_f4(4,5,6,7)', 'optional args test f4')
+ assertEquals(opt_f5(5,6), 'opt_f5(5,6,null,null)', 'optional args test f5')
+ assertEquals(opt_f5(5,6,7), 'opt_f5(5,6,7,null)', 'optional args test f5')
+ assertEquals(opt_f5(5,6,7,8), 'opt_f5(5,6,7,8)', 'optional args test f5')
+ assertEquals(opt_f5(5,6,7,8,9), 'opt_f5(5,6,7,8,9)', 'optional args test f5')
+ assertEquals(opt_f6(), 3, 'optional args test f6')
+ assertEquals(opt_f6(2), 4, 'optional args test f6')
+ assertEquals(opt_f6(2,3), 5, 'optional args test f6')
+ assertEquals(opt_f6(2,3,4), 5, 'optional args test f6')
+ </method>
+
<method name="testConditionalCompilation">
<![CDATA[
// Verify compile-time conditionals are consistent
Modified: openlaszlo/branches/devildog/test/text/key_events.lzx
===================================================================
--- openlaszlo/branches/devildog/test/text/key_events.lzx 2008-03-25 23:19:11 UTC (rev 8409)
+++ openlaszlo/branches/devildog/test/text/key_events.lzx 2008-03-25 23:23:22 UTC (rev 8410)
@@ -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>
More information about the Laszlo-checkins
mailing list