[Laszlo-checkins] r10896 - in openlaszlo/trunk: WEB-INF/lps/server/bin demos/calendar lps/components/base lps/components/charts/addon lps/components/charts/addon/slider lps/components/charts/barchart lps/components/charts/columnchart lps/components/charts/common lps/components/charts/linechart lps/components/charts/piechart lps/components/debugger lps/components/extensions lps/components/extensions/av lps/components/extensions/views lps/components/incubator lps/components/incubator/lwzCalendar lps/components/incubator/opttree lps/components/incubator/rich-text lps/components/incubator/test lps/components/incubator/tooltip lps/components/incubator/uploader lps/components/incubator/validators lps/components/lz lps/components/queens-charts/shared lps/components/rpc lps/components/utils/diagnostic lps/components/utils/diagnostic/inspector lps/components/utils/replicator lps/components/utils/traits
pbr@openlaszlo.org
pbr at openlaszlo.org
Fri Sep 5 13:58:55 PDT 2008
Author: pbr
Date: 2008-09-05 13:58:16 -0700 (Fri, 05 Sep 2008)
New Revision: 10896
Added:
openlaszlo/trunk/WEB-INF/lps/server/bin/convert_setters.pl
Modified:
openlaszlo/trunk/demos/calendar/basepanel.lzx
openlaszlo/trunk/demos/calendar/cal-button.lzx
openlaszlo/trunk/demos/calendar/calendar.lzx
openlaszlo/trunk/demos/calendar/day.lzx
openlaszlo/trunk/demos/calendar/event.lzx
openlaszlo/trunk/demos/calendar/eventselector.lzx
openlaszlo/trunk/demos/calendar/gridsliderlayout.lzx
openlaszlo/trunk/demos/calendar/infopanel.lzx
openlaszlo/trunk/demos/calendar/selected-daylook.lzx
openlaszlo/trunk/demos/calendar/simpletimelayout.lzx
openlaszlo/trunk/demos/calendar/textbox.lzx
openlaszlo/trunk/demos/calendar/vscrollbar.lzx
openlaszlo/trunk/lps/components/base/basebutton.lzx
openlaszlo/trunk/lps/components/base/basecombobox.lzx
openlaszlo/trunk/lps/components/base/basedatacombobox.lzx
openlaszlo/trunk/lps/components/base/basedatepicker.lzx
openlaszlo/trunk/lps/components/base/basefocusview.lzx
openlaszlo/trunk/lps/components/base/basegrid.lzx
openlaszlo/trunk/lps/components/base/basegridcolumn.lzx
openlaszlo/trunk/lps/components/base/basegridrow.lzx
openlaszlo/trunk/lps/components/base/basescrollbar.lzx
openlaszlo/trunk/lps/components/base/baseslider.lzx
openlaszlo/trunk/lps/components/base/basetabslider.lzx
openlaszlo/trunk/lps/components/base/basetrackgroup.lzx
openlaszlo/trunk/lps/components/base/basewindow.lzx
openlaszlo/trunk/lps/components/base/style.lzx
openlaszlo/trunk/lps/components/charts/addon/slider/slider.lzx
openlaszlo/trunk/lps/components/charts/addon/zoomarea.lzx
openlaszlo/trunk/lps/components/charts/barchart/barchartplotarea.lzx
openlaszlo/trunk/lps/components/charts/columnchart/columnchartplotarea.lzx
openlaszlo/trunk/lps/components/charts/common/databar.lzx
openlaszlo/trunk/lps/components/charts/common/datamarker.lzx
openlaszlo/trunk/lps/components/charts/common/datatip.lzx
openlaszlo/trunk/lps/components/charts/common/horizontalaxis.lzx
openlaszlo/trunk/lps/components/charts/common/label.lzx
openlaszlo/trunk/lps/components/charts/common/legend.lzx
openlaszlo/trunk/lps/components/charts/common/rectangularchart.lzx
openlaszlo/trunk/lps/components/charts/common/tickmarklabel.lzx
openlaszlo/trunk/lps/components/charts/common/valueline.lzx
openlaszlo/trunk/lps/components/charts/common/valuepoints.lzx
openlaszlo/trunk/lps/components/charts/common/valueregion.lzx
openlaszlo/trunk/lps/components/charts/common/verticalaxis.lzx
openlaszlo/trunk/lps/components/charts/linechart/linechartplotarea.lzx
openlaszlo/trunk/lps/components/charts/piechart/piepiece.lzx
openlaszlo/trunk/lps/components/debugger/debugger.lzx
openlaszlo/trunk/lps/components/debugger/newcontent.lzx
openlaszlo/trunk/lps/components/debugger/scrollingtext.lzx
openlaszlo/trunk/lps/components/extensions/av/videoview.lzx
openlaszlo/trunk/lps/components/extensions/drawview.lzx
openlaszlo/trunk/lps/components/extensions/html.lzx
openlaszlo/trunk/lps/components/extensions/views/richinputtext.lzx
openlaszlo/trunk/lps/components/incubator/autocompletecombobox.lzx
openlaszlo/trunk/lps/components/incubator/baseedittext.lzx
openlaszlo/trunk/lps/components/incubator/baseslider.lzx
openlaszlo/trunk/lps/components/incubator/borderinput.lzx
openlaszlo/trunk/lps/components/incubator/colorslider.lzx
openlaszlo/trunk/lps/components/incubator/custombutton.lzx
openlaszlo/trunk/lps/components/incubator/defaultlistitem.lzx
openlaszlo/trunk/lps/components/incubator/draglib.lzx
openlaszlo/trunk/lps/components/incubator/lwzCalendar/lwzEncalendar.lzx
openlaszlo/trunk/lps/components/incubator/lzcombobox_class.lzx
openlaszlo/trunk/lps/components/incubator/lzeditcombobox.lzx
openlaszlo/trunk/lps/components/incubator/newhscrollbar.lzx
openlaszlo/trunk/lps/components/incubator/newvscrollbar.lzx
openlaszlo/trunk/lps/components/incubator/opttree/opttree.lzx
openlaszlo/trunk/lps/components/incubator/rich-text/formatfontcolor.lzx
openlaszlo/trunk/lps/components/incubator/rich-text/linkdialog.lzx
openlaszlo/trunk/lps/components/incubator/roundrectbutton.lzx
openlaszlo/trunk/lps/components/incubator/stepper.lzx
openlaszlo/trunk/lps/components/incubator/stylishbutton.lzx
openlaszlo/trunk/lps/components/incubator/test/libflickr-test.lzx
openlaszlo/trunk/lps/components/incubator/tooltip/tooltip.lzx
openlaszlo/trunk/lps/components/incubator/tooltip/tooltipview.lzx
openlaszlo/trunk/lps/components/incubator/ulink.lzx
openlaszlo/trunk/lps/components/incubator/uploader/fileuploadlist.lzx
openlaszlo/trunk/lps/components/incubator/validators/basevalidator.lzx
openlaszlo/trunk/lps/components/incubator/vslider.lzx
openlaszlo/trunk/lps/components/lz/alert.lzx
openlaszlo/trunk/lps/components/lz/basefloatinglist.lzx
openlaszlo/trunk/lps/components/lz/button.lzx
openlaszlo/trunk/lps/components/lz/combobox.lzx
openlaszlo/trunk/lps/components/lz/datacombobox.lzx
openlaszlo/trunk/lps/components/lz/datepicker.lzx
openlaszlo/trunk/lps/components/lz/edittext.lzx
openlaszlo/trunk/lps/components/lz/floatinglist.lzx
openlaszlo/trunk/lps/components/lz/gridcolumn.lzx
openlaszlo/trunk/lps/components/lz/gridtext.lzx
openlaszlo/trunk/lps/components/lz/hscrollbar.lzx
openlaszlo/trunk/lps/components/lz/list.lzx
openlaszlo/trunk/lps/components/lz/listitem.lzx
openlaszlo/trunk/lps/components/lz/menu.lzx
openlaszlo/trunk/lps/components/lz/scrollbar.lzx
openlaszlo/trunk/lps/components/lz/simpletext.lzx
openlaszlo/trunk/lps/components/lz/slider.lzx
openlaszlo/trunk/lps/components/lz/tabelement.lzx
openlaszlo/trunk/lps/components/lz/vscrollbar.lzx
openlaszlo/trunk/lps/components/lz/windowpanel.lzx
openlaszlo/trunk/lps/components/queens-charts/shared/chartzoomer.lzx
openlaszlo/trunk/lps/components/queens-charts/shared/label.lzx
openlaszlo/trunk/lps/components/queens-charts/shared/legend.lzx
openlaszlo/trunk/lps/components/queens-charts/shared/piepiece.lzx
openlaszlo/trunk/lps/components/queens-charts/shared/wholepie.lzx
openlaszlo/trunk/lps/components/rpc/soap.lzx
openlaszlo/trunk/lps/components/utils/diagnostic/frametimer.lzx
openlaszlo/trunk/lps/components/utils/diagnostic/inittimer.lzx
openlaszlo/trunk/lps/components/utils/diagnostic/inspector/colormenu.lzx
openlaszlo/trunk/lps/components/utils/diagnostic/inspector/inspector.lzx
openlaszlo/trunk/lps/components/utils/replicator/replicator.lzx
openlaszlo/trunk/lps/components/utils/traits/cssable.lzx
Log:
Change 20080905-Philip-4 by Philip at Philip-DC on 2008-09-05 16:39:02 EDT
in /cygdrive/f/laszlo/svn/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Modify components to use setAttribute instead of setX
New Features:
Bugs Fixed: LPP-5644 (partial)
Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
I ran a script I wrote (/WEB-INF/lps/server/bin/convert_setters.pl)
on the components. This modifies a call like,
this.setText(t) ==> this.setAttribute('text', t);
The tool isn't perfect because some classes define a local methods (ie. setText()) that doesn't derive from a view. However, it is >90% correct.
There are still some setters in other non-view files I need to convert.
I only modified the calendar demo app. I will modify the other apps/tests as a separate changeset.
I am checking this code in. The most interesting file to look at is convert_setters.pl. It is based upon convert_required.pl.
Tests:
component examples work again. recursion errors trying to run
calendar are gone. deprecated messages about using setX in the
components are gone.
Files:
A WEB-INF/lps/server/bin/convert_setters.pl
M lps/components/queens-charts/shared/piepiece.lzx
M lps/components/queens-charts/shared/wholepie.lzx
M lps/components/queens-charts/shared/chartzoomer.lzx
M lps/components/queens-charts/shared/legend.lzx
M lps/components/queens-charts/shared/label.lzx
M lps/components/rpc/soap.lzx
M lps/components/debugger/debugger.lzx
M lps/components/debugger/newcontent.lzx
M lps/components/debugger/scrollingtext.lzx
M lps/components/charts/columnchart/columnchartplotarea.lzx
M lps/components/charts/piechart/piepiece.lzx
M lps/components/charts/addon/slider/slider.lzx
M lps/components/charts/addon/zoomarea.lzx
M lps/components/charts/barchart/barchartplotarea.lzx
M lps/components/charts/common/tickmarklabel.lzx
M lps/components/charts/common/valuepoints.lzx
M lps/components/charts/common/datamarker.lzx
M lps/components/charts/common/horizontalaxis.lzx
M lps/components/charts/common/label.lzx
M lps/components/charts/common/valueregion.lzx
M lps/components/charts/common/valueline.lzx
M lps/components/charts/common/datatip.lzx
M lps/components/charts/common/rectangularchart.lzx
M lps/components/charts/common/legend.lzx
M lps/components/charts/common/databar.lzx
M lps/components/charts/common/verticalaxis.lzx
M lps/components/charts/linechart/linechartplotarea.lzx
M lps/components/lz/gridcolumn.lzx
M lps/components/lz/button.lzx
M lps/components/lz/tabelement.lzx
M lps/components/lz/listitem.lzx
M lps/components/lz/basefloatinglist.lzx
M lps/components/lz/hscrollbar.lzx
M lps/components/lz/simpletext.lzx
M lps/components/lz/floatinglist.lzx
M lps/components/lz/menu.lzx
M lps/components/lz/alert.lzx
M lps/components/lz/combobox.lzx
M lps/components/lz/vscrollbar.lzx
M lps/components/lz/list.lzx
M lps/components/lz/datepicker.lzx
M lps/components/lz/slider.lzx
M lps/components/lz/scrollbar.lzx
M lps/components/lz/windowpanel.lzx
M lps/components/lz/edittext.lzx
M lps/components/lz/gridtext.lzx
M lps/components/lz/datacombobox.lzx
M lps/components/incubator/lzcombobox_class.lzx
M lps/components/incubator/custombutton.lzx
M lps/components/incubator/tooltip/tooltipview.lzx
M lps/components/incubator/tooltip/tooltip.lzx
M lps/components/incubator/newvscrollbar.lzx
M lps/components/incubator/lwzCalendar/lwzEncalendar.lzx
M lps/components/incubator/roundrectbutton.lzx
M lps/components/incubator/baseslider.lzx
M lps/components/incubator/ulink.lzx
M lps/components/incubator/baseedittext.lzx
M lps/components/incubator/stylishbutton.lzx
M lps/components/incubator/validators/basevalidator.lzx
M lps/components/incubator/defaultlistitem.lzx
M lps/components/incubator/uploader/fileuploadlist.lzx
M lps/components/incubator/newhscrollbar.lzx
M lps/components/incubator/colorslider.lzx
M lps/components/incubator/autocompletecombobox.lzx
M lps/components/incubator/test/libflickr-test.lzx
M lps/components/incubator/draglib.lzx
M lps/components/incubator/opttree/opttree.lzx
M lps/components/incubator/vslider.lzx
M lps/components/incubator/stepper.lzx
M lps/components/incubator/lzeditcombobox.lzx
M lps/components/incubator/rich-text/linkdialog.lzx
M lps/components/incubator/rich-text/formatfontcolor.lzx
M lps/components/incubator/borderinput.lzx
M lps/components/extensions/html.lzx
M lps/components/extensions/drawview.lzx
M lps/components/extensions/av/videoview.lzx
M lps/components/extensions/views/richinputtext.lzx
M lps/components/utils/performance/library.lzx
M lps/components/utils/diagnostic/inittimer.lzx
M lps/components/utils/diagnostic/inspector/colormenu.lzx
M lps/components/utils/diagnostic/inspector/inspector.lzx
M lps/components/utils/diagnostic/frametimer.lzx
M lps/components/utils/replicator/replicator.lzx
M lps/components/utils/traits/cssable.lzx
M lps/components/base/basebutton.lzx
M lps/components/base/basegridrow.lzx
M lps/components/base/basescrollbar.lzx
M lps/components/base/basewindow.lzx
M lps/components/base/basecombobox.lzx
M lps/components/base/basetabslider.lzx
M lps/components/base/basefocusview.lzx
M lps/components/base/basedatepicker.lzx
M lps/components/base/basetrackgroup.lzx
M lps/components/base/baseslider.lzx
M lps/components/base/basegrid.lzx
M lps/components/base/basedatacombobox.lzx
M lps/components/base/basegridcolumn.lzx
M lps/components/base/style.lzx
M demos/calendar/simpletimelayout.lzx
M demos/calendar/cal-button.lzx
M demos/calendar/calendar.lzx
M demos/calendar/vscrollbar.lzx
M demos/calendar/infopanel.lzx
M demos/calendar/day.lzx
M demos/calendar/event.lzx
M demos/calendar/eventselector.lzx
M demos/calendar/gridsliderlayout.lzx
M demos/calendar/selected-daylook.lzx
M demos/calendar/basepanel.lzx
M demos/calendar/textbox.lzx
Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20080905-Philip-4.tar
Added: openlaszlo/trunk/WEB-INF/lps/server/bin/convert_setters.pl
Property changes on: openlaszlo/trunk/WEB-INF/lps/server/bin/convert_setters.pl
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: openlaszlo/trunk/demos/calendar/basepanel.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/basepanel.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/basepanel.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -53,7 +53,7 @@
</method>
<method name="setWindowTitle" args="s">
- this.title.setText(s);
+ this.title.setAttribute('text', s);
</method>
</class>
Modified: openlaszlo/trunk/demos/calendar/cal-button.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/cal-button.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/cal-button.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -16,27 +16,27 @@
<attribute name="overRsrcNumber" value="2" type="number"/>
<attribute name="downRsrcNumber" value="3" type="number"/>
<attribute name="deselectRsrcNumber" value="4" type="number"/>
- <attribute name="width" setter="this.widthSetter(width);"/>
+
<attribute name="keepinitialwidth" value="false"/>
<attribute name="enabled" value="true" />
<attribute name="mouseisdown" value="false"/>
<event name="onsafeclick"/>
- <method name="widthSetter" args="w">
- this.setWidth(w)
+ <setter name="width" args="w">
+ super.setAttribute('width', w);
this.keepinitialwidth = true;
- </method>
+ </setter>
<method name="setEnabled" args="b">
this.enabled = b;
if (this.enabled) {
- this.bkgnd.lft.setResourceNumber( this.normalRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.normalRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.normalRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.normalRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.normalRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.normalRsrcNumber );
} else {
- this.bkgnd.lft.setResourceNumber( this.deselectRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.deselectRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.deselectRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.deselectRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.deselectRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.deselectRsrcNumber );
}
</method>
@@ -121,21 +121,21 @@
<method name="update" >
if (this.keepinitialwidth) {
- this.title.setX( Math.floor((this.width - this.title.getTextWidth())/2.0));
- this.title_hilite.setX(this.title.x + 0.5);
+ this.title.setAttribute('x', Math.floor((this.width - this.title.getTextWidth())/2.0));
+ this.title_hilite.setAttribute('x', this.title.x + 0.5);
} else {
- this.setWidth(Math.round(this.title.getTextWidth()) + this.bkgnd.lft.leftinset + this.bkgnd.rgt.rightinset);
+ this.setAttribute('width', Math.round(this.title.getTextWidth()) + this.bkgnd.lft.leftinset + this.bkgnd.rgt.rightinset);
}
</method>
<method name="domouseup" >
- this.title_hilite.setY(this.yadjust + 0.7);
- this.title.setY(this.yadjust);
+ this.title_hilite.setAttribute('y', this.yadjust + 0.7);
+ this.title.setAttribute('y', this.yadjust);
</method>
<method name="domousedown" >
- this.title_hilite.setY(this.yadjust + 1.7);
- this.title.setY(this.yadjust + 1);
+ this.title_hilite.setAttribute('y', this.yadjust + 1.7);
+ this.title.setAttribute('y', this.yadjust + 1);
</method>
@@ -150,22 +150,22 @@
<attribute name="defaultY" type="number" value="0"/>
<method name="placeicon">
this.defaultY = Math.floor((this.parent.height - this.height)/2.0);
- this.setY(defaultY);
+ this.setAttribute('y', defaultY);
</method>
</view>
<method name="update" >
- this.iconv.setX( this.bkgnd.lft.leftinset);
- if (!this.keepinitialwidth) this.setWidth(this.iconv.width + this.bkgnd.lft.leftinset + this.bkgnd.rgt.rightinset);
+ this.iconv.setAttribute('x', this.bkgnd.lft.leftinset);
+ if (!this.keepinitialwidth) this.setAttribute('width', this.iconv.width + this.bkgnd.lft.leftinset + this.bkgnd.rgt.rightinset);
</method>
<method name="domouseup" >
- this.iconv.setY(this.iconv.defaultY);
+ this.iconv.setAttribute('y', this.iconv.defaultY);
</method>
<method name="domousedown" >
- this.iconv.setY(this.iconv.defaultY + 1);
+ this.iconv.setAttribute('y', this.iconv.defaultY + 1);
</method>
</state>
@@ -175,32 +175,32 @@
<!-- if applied is TRUE, then button has an icon and text so add support for both-->
<method name="update" >
- this.iconv.setX( this.bkgnd.lft.leftinset);
- this.title_hilite.setX(this.iconv.x + this.iconv.width +
+ this.iconv.setAttribute('x', this.bkgnd.lft.leftinset);
+ this.title_hilite.setAttribute('x', this.iconv.x + this.iconv.width +
this.divider );
- this.title.setX( this.iconv.x + this.iconv.width +
+ this.title.setAttribute('x', this.iconv.x + this.iconv.width +
this.divider );
- if (!this.keepinitialwidth) this.setWidth( this.iconv.width +
+ if (!this.keepinitialwidth) this.setAttribute('width', this.iconv.width +
this.divider + Math.round(this.title.getTextWidth()) +
this.bkgnd.lft.leftinset + this.bkgnd.rgt.rightinset);
</method>
<method name="domousedown" >
- this.iconv.setY(this.iconv.defaultY + 1);
- this.title_hilite.setY(this.yadjust + 1.7);
- this.title.setY(this.yadjust + 1);
+ this.iconv.setAttribute('y', this.iconv.defaultY + 1);
+ this.title_hilite.setAttribute('y', this.yadjust + 1.7);
+ this.title.setAttribute('y', this.yadjust + 1);
</method>
<method name="domouseup" >
- this.iconv.setY(this.iconv.defaultY);
- this.title_hilite.setY(this.yadjust + 0.7);
- this.title.setY(this.yadjust);
+ this.iconv.setAttribute('y', this.iconv.defaultY);
+ this.title_hilite.setAttribute('y', this.yadjust + 0.7);
+ this.title.setAttribute('y', this.yadjust);
</method>
</state>
<handler name="oninit" >
- this.setEnabled(this.enabled);
+ this.setAttribute('enabled', this.enabled);
this.update();
// A Delegate to perform an action on the event 'onsafeclick'
@@ -223,9 +223,9 @@
</method>
<method name="domouseover" >
- this.bkgnd.lft.setResourceNumber( this.overRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.overRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.overRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.overRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.overRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.overRsrcNumber );
</method>
<!-- MOUSE EVENTS -->
@@ -233,9 +233,9 @@
if ( this.enabled) {
this.mouseisdown = true;
this.domousedown();
- this.bkgnd.lft.setResourceNumber( this.downRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.downRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.downRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.downRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.downRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.downRsrcNumber );
}
</handler>
@@ -244,13 +244,13 @@
if (this.enabled) {
this.domouseup();
if (this.mouseisover) {
- this.bkgnd.lft.setResourceNumber( this.overRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.overRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.overRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.overRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.overRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.overRsrcNumber );
} else {
- this.bkgnd.lft.setResourceNumber( this.normalRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.normalRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.normalRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.normalRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.normalRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.normalRsrcNumber );
}
}
</handler>
@@ -260,14 +260,14 @@
this.mouseisover = true;
if (this.mouseisdown) {
this.domousedown();
- this.bkgnd.lft.setResourceNumber( this.downRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.downRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.downRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.downRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.downRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.downRsrcNumber );
} else {
this.domouseup();
- this.bkgnd.lft.setResourceNumber( this.overRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.overRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.overRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.overRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.overRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.overRsrcNumber );
}
}
]]> </handler>
@@ -275,9 +275,9 @@
<handler name="onmouseout" > <![CDATA[
this.mouseisover = false;
this.domouseup();
- this.bkgnd.lft.setResourceNumber( this.normalRsrcNumber );
- this.bkgnd.mid.setResourceNumber( this.normalRsrcNumber );
- this.bkgnd.rgt.setResourceNumber( this.normalRsrcNumber );
+ this.bkgnd.lft.setAttribute('frame', this.normalRsrcNumber );
+ this.bkgnd.mid.setAttribute('frame', this.normalRsrcNumber );
+ this.bkgnd.rgt.setAttribute('frame', this.normalRsrcNumber );
]]> </handler>
<handler name="onclick" >
Modified: openlaszlo/trunk/demos/calendar/calendar.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/calendar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/calendar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -127,10 +127,10 @@
<text name="monthtitle" fontstyle="bold"
fgcolor="#FFFFFF" y="10">
<handler name="ontext">
- this.setX( Math.round( ( this.parent.width -
+ this.setAttribute('x', Math.round( ( this.parent.width -
this.getTextWidth())/2.0) - 2);
- this.setWidth (this.getTextWidth()+2);
- this.parent.monthtitleshdw.setWidth (this.getTextWidth()+2);
+ this.setAttribute('width', this.getTextWidth()+2);
+ this.parent.monthtitleshdw.setAttribute('width', this.getTextWidth()+2);
</handler>
</text>
@@ -155,7 +155,7 @@
<attribute name="viewstyle" type="string" value="month"/>
<animator name="fadeUp" attribute="opacity"
- onstop="dayselectorlook.setOpacity( 1 )"
+ onstop="dayselectorlook.setAttribute('opacity', 1 )"
duration="1000" from="0" to="1"
start="false"/>
@@ -321,7 +321,7 @@
var t = LzTimeKernel.getTimer();
this.setMonthAndYear(nxtmonth,nxtyear);
if (global['mytext'] != null){
- global['mytext'].setText( LzTimeKernel.getTimer() -t );
+ global['mytext'].setAttribute('text', LzTimeKernel.getTimer() -t );
}
cal_interior.viewstyle = "month";
</method>
@@ -378,7 +378,7 @@
gridlayout.showgrid(noanimation);
var t = canvas.calMonths[mth] + " " + yr;
- toppanel.mbar.monthtitle.setText(t);
+ toppanel.mbar.monthtitle.setAttribute('text', t);
this.setDates();
@@ -390,12 +390,12 @@
<!-- These are used by the info panel when it slides in and out -->
<method name="contract" >
gridlayout.doanimation = false;
- this.setWidth(cal_interior.width - 208);
+ this.setAttribute('width', cal_interior.width - 208);
</method>
<method name="expand" >
gridlayout.doanimation = false;
- this.setWidth(cal_interior.width);
+ this.setAttribute('width', cal_interior.width);
</method>
<!-- This method sets the dates for all the days in the grid,
Modified: openlaszlo/trunk/demos/calendar/day.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/day.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/day.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -52,7 +52,7 @@
onapply="parent.setTimeOffset(7.5);
parent.parent.scrollview.scrollState.apply()"
onremove="parent.parent.scrollview.scrollState.remove();
- parent.parent.container.setY(0)">
+ parent.parent.container.setAttribute('y', 0)">
<view name="marks" resource="tgrid" x="-2" pixellock="true"/>
</state>
<method name="setTimeOffset" args="hours">
@@ -76,7 +76,7 @@
if (hours>13) hours=12.5;
var tgrid_zero = 11;
var pixels_per_hour = 22;
- //marks.setY(-(hours * pixels_per_hour + tgrid_zero));
+ //marks.setAttribute('y', -(hours * pixels_per_hour + tgrid_zero));
</method>
</view>
@@ -148,7 +148,7 @@
this.year=this.startdate.getFullYear();
this.month = this.startdate.getMonth();
this.dayOfMonth=d.getDate();
- this.details.dayofmonth.setText(this.dayOfMonth);
+ this.details.dayofmonth.setAttribute('text', this.dayOfMonth);
// *NEW: Assign new datapath
var vDatapath =
@@ -175,7 +175,7 @@
} else {
this.unselectedColor = 0x9BA9B1;
}
- this.details.bgrect.setBGColor(this.unselectedColor);
+ this.details.bgrect.setAttribute('bgcolor', this.unselectedColor);
this.details.dayofmonth.setAttribute('fgcolor',textColor); ]]>
</method>
@@ -207,9 +207,9 @@
<method name="hilite" args="dohilite, dontupdate">
if (dohilite) {
if ( !dontupdate ) eventselector.updateOver( this );
- details.bgrect.setBGColor(0xD3D3D3);
+ details.bgrect.setAttribute('bgcolor', 0xD3D3D3);
} else {
- details.bgrect.setBGColor(this.unselectedColor);
+ details.bgrect.setAttribute('bgcolor', this.unselectedColor);
}
</method>
Modified: openlaszlo/trunk/demos/calendar/event.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/event.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/event.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -74,7 +74,7 @@
visible="$once{!this.classroot.classroot.opened}">
<attribute name="text"
- value="${ classroot.startHour }" type="text" setter="this.mySetText(text)"/>/>
+ value="${ classroot.startHour }" type="text" />/>
<datapath xpath="start[1]">
<!-- Usually data bound views are 'automagically' displayed
@@ -84,15 +84,15 @@
interference from the data binding -->
<attribute name="datacontrolsvisibility" value="false"/>
</datapath>
- <method name="mySetText" args="h">
+ <setter name="text" args="h">
<![CDATA[
h = Number( h );
var ap = h < 12 ? 'a' : 'p';
if ( h > 12) h-=12;
else if ( h==0 ) h='12';
- super.setText( h + ap );
+ super.setAttribute('text', h + ap );
]]>
- </method>
+ </setter>
</text>
<text name="smalltitletext" fgcolor="#4B5D6C"
@@ -103,13 +103,13 @@
<method name="openToggle" args="o">
if ( o ){
this.timeArea.setAttribute('visible', false );
- this.smalltitletext.setX( 10 );
- this.timekgnd.setBGColor(this.bkgndColor);
+ this.smalltitletext.setAttribute('x', 10 );
+ this.timekgnd.setAttribute('bgcolor', this.bkgndColor);
} else {
this.timeArea.setAttribute('visible', true );
- this.smalltitletext.setX( 25 );
- this.setX( 0 );
- this.setHeight(22);
+ this.smalltitletext.setAttribute('x', 25 );
+ this.setAttribute('x', 0 );
+ this.setAttribute('height', 22);
this.parent.closedlayout.doupdate(true);
}
</method>
@@ -134,11 +134,11 @@
<!-- METHODS -->
<handler name="onmouseover">
- this.setBGColor( this.hiColor );
+ this.setAttribute('bgcolor', this.hiColor );
</handler>
<handler name="onmouseout">
- this.setBGColor( this.normalColor );
+ this.setAttribute('bgcolor', this.normalColor );
</handler>
<handler name="onmousedown">
Modified: openlaszlo/trunk/demos/calendar/eventselector.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/eventselector.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/eventselector.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -38,7 +38,7 @@
var ap = h < 12 ? 'a' : 'p';
if ( h > 12) h-=12;
else if ( h==0 ) h='12';
- this.setText( h + ap );
+ this.setAttribute('text', h + ap );
]]>
</handler>
</text>
@@ -296,7 +296,7 @@
<method name="updateOver" args="d">
//called by day (d);
if ( !this.freedragging ) return;
- bar.setWidth( d.eventwidth );
+ bar.setAttribute('width', d.eventwidth );
if ( xoff > bar.width ){
//move it over so that you're still dragging it in a
@@ -335,17 +335,17 @@
this.setAttribute( "freedragging" , false );
//this needs to happen second, after the
//clipping view changes coordinates
- bar.setX( this.origx );
+ bar.setAttribute('x', this.origx );
//need to reset y in new coordinate system
}
if ( ybar <= 0 ){
if (this['followview'].classroot.details.bgrect.scrollview['sb']) this['followview'].classroot.details.bgrect.scrollview.sb.step(-1);
- bar.setY( 0 );
+ bar.setAttribute('y', 0 );
} else if ( ybar > h ){
if (this['followview'].classroot.details.bgrect.scrollview['sb']) this['followview'].classroot.details.bgrect.scrollview.sb.step(1);
- bar.setY( h );
+ bar.setAttribute('y', h );
} else {
- bar.setY( this.getMouse( 'y' ) - yoff );
+ bar.setAttribute('y', this.getMouse( 'y' ) - yoff );
}
var newStartHour = Math.floor (
@@ -359,7 +359,7 @@
if (newStartHour > 12) newStartHour-=12;
if (newStartHour == 0) newStartHour='12';
- bar.timeArea.setText(newStartHour+ap);
+ bar.timeArea.setAttribute('text', newStartHour+ap);
}
}
}
@@ -369,8 +369,8 @@
}
if ( this.freedragging ){
- bar.setX( this.getMouse( 'x' ) - xoff );
- bar.setY( this.getMouse( 'y' ) - yoff );
+ bar.setAttribute('x', this.getMouse( 'x' ) - xoff );
+ bar.setAttribute('y', this.getMouse( 'y' ) - yoff );
}
]]>
</method>
@@ -396,41 +396,41 @@
<!-- MOUSEEVENT METHODS-->
<handler name="onmousedown" >
this.mouseisdown = true;
- this.bkgnd.button.setResourceNumber( this.downRsrcNumber );
- this.i.setX(1);
- this.i.setY(1);
+ this.bkgnd.button.setAttribute('frame', this.downRsrcNumber );
+ this.i.setAttribute('x', 1);
+ this.i.setAttribute('y', 1);
</handler>
<handler name="onmouseup" >
this.mouseisdown = false;
if (this.mouseisover) {
- this.bkgnd.button.setResourceNumber( this.overRsrcNumber );
+ this.bkgnd.button.setAttribute('frame', this.overRsrcNumber );
} else {
- this.bkgnd.button.setResourceNumber( this.normalRsrcNumber );
+ this.bkgnd.button.setAttribute('frame', this.normalRsrcNumber );
}
- this.i.setX(0);
- this.i.setY(0);
+ this.i.setAttribute('x', 0);
+ this.i.setAttribute('y', 0);
</handler>
<handler name="onmouseover" ><![CDATA[
this.mouseisover = true;
if (this.mouseisdown) {
- this.bkgnd.button.setResourceNumber( this.downRsrcNumber );
- this.i.setX(1);
- this.i.setY(1);
+ this.bkgnd.button.setAttribute('frame', this.downRsrcNumber );
+ this.i.setAttribute('x', 1);
+ this.i.setAttribute('y', 1);
} else {
- this.bkgnd.button.setResourceNumber( this.overRsrcNumber );
- this.i.setX(0);
- this.i.setY(0);
+ this.bkgnd.button.setAttribute('frame', this.overRsrcNumber );
+ this.i.setAttribute('x', 0);
+ this.i.setAttribute('y', 0);
}
]]> </handler>
<handler name="onmouseout" > <![CDATA[
this.mouseisover = false;
- this.bkgnd.button.setResourceNumber( this.normalRsrcNumber );
- this.i.setX(0);
- this.i.setY(0);
+ this.bkgnd.button.setAttribute('frame', this.normalRsrcNumber );
+ this.i.setAttribute('x', 0);
+ this.i.setAttribute('y', 0);
]]> </handler>
</class>
Modified: openlaszlo/trunk/demos/calendar/gridsliderlayout.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/gridsliderlayout.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/gridsliderlayout.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -315,10 +315,10 @@
if (vis) {
if (this.doanimation) {
if (!s.visible) {
- if (s.x != x) s.setX(x);
- if (s.y != y) s.setY(y);
- if (s.width != w) s.setWidth(w);
- if (s.height != h) s.setHeight(h);
+ if (s.x != x) s.setAttribute('x', x);
+ if (s.y != y) s.setAttribute('y', y);
+ if (s.width != w) s.setAttribute('width', w);
+ if (s.height != h) s.setAttribute('height', h);
// To speed up the process only the currently visible
// views are animated, while the hidden views are
// given there final dimensions and then popped into view
@@ -330,10 +330,10 @@
didAnimation=true;
}
} else {
- if (s.x != x) s.setX(x);
- if (s.y != y) s.setY(y);
- if (s.width != w) s.setWidth(w);
- if (s.height != h) s.setHeight(h);
+ if (s.x != x) s.setAttribute('x', x);
+ if (s.y != y) s.setAttribute('y', y);
+ if (s.width != w) s.setAttribute('width', w);
+ if (s.height != h) s.setAttribute('height', h);
if (!s.visible) s.setAttribute('visible', true);
}
} else {
@@ -344,8 +344,8 @@
if (this.doanimation) {
s.animateTo(x, s.y, w, s.height);
} else {
- if (s.x != x) s.setX(x);
- if (s.width != w) s.setWidth(w);
+ if (s.x != x) s.setAttribute('x', x);
+ if (s.width != w) s.setAttribute('width', w);
}
}
if (s.visible) s.setAttribute('visible', false);
@@ -396,7 +396,7 @@
for (var i =0; i < this.subviews.length; i++) {
s = this.subviews[i];
if (s['update_vis_later']){
- if (!s.opened && s.details.bgrect.container.dataview) s.details.bgrect.container.dataview.setY(0);
+ if (!s.opened && s.details.bgrect.container.dataview) s.details.bgrect.container.dataview.setAttribute('y', 0);
s.setAttribute('visible', true);
}
Modified: openlaszlo/trunk/demos/calendar/infopanel.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/infopanel.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/infopanel.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -45,16 +45,16 @@
<handler name="onopenstart" >
// tab is about to open
this.interior.setAttribute('visible', true);
- this.top.setBGColor(0xE2E4DF);
- this.top.tline.setBGColor(0xB8B9B5)
- this.top.bline.setBGColor(0xFDFFFF)
+ this.top.setAttribute('bgcolor', 0xE2E4DF);
+ this.top.tline.setAttribute('bgcolor', 0xB8B9B5)
+ this.top.bline.setAttribute('bgcolor', 0xFDFFFF)
</handler>
<handler name="onclosestart" >
//tab is about to close
- this.top.setBGColor(0xEEF0EB);
- this.top.tline.setBGColor(0xFDFFFF)
- this.top.bline.setBGColor(0xC6C7C4)
+ this.top.setAttribute('bgcolor', 0xEEF0EB);
+ this.top.tline.setAttribute('bgcolor', 0xFDFFFF)
+ this.top.bline.setAttribute('bgcolor', 0xC6C7C4)
</handler>
<handler name="onclosestop" >
@@ -98,7 +98,7 @@
attrs.day + ", " +
attrs.year;
}
- this.setText( s );
+ this.setAttribute('text', s );
]]>
</method>
</textbox>
@@ -186,7 +186,7 @@
bgcolor="0xEEF0EB" bordercolor="0x333333"
datapath="start[1]/@*" >
<method name="applyData" args="attrs">
- this.setText( parent.getLongTime( attrs ));
+ this.setAttribute('text', parent.getLongTime( attrs ));
</method>
</textbox>
<basebutton x="$immediately{60-11}" width="14"
@@ -205,7 +205,7 @@
bgcolor="0xEEF0EB" bordercolor="0x333333"
datapath="end[1]/@*" >
<method name="applyData" args="attrs">
- this.setText( parent.getLongTime( attrs ));
+ this.setAttribute('text', parent.getLongTime( attrs ));
</method>
</textbox>
<basebutton x="149" width="14" resource="info_larrow"
@@ -330,7 +330,7 @@
calgrid.contract();
this.setAttribute('visible', true);
- this.setOpacity(1);
+ this.setAttribute('opacity', 1);
this.slideopen1.doStart();
this.slideopen2.doStart();
this.opened = true;
Modified: openlaszlo/trunk/demos/calendar/selected-daylook.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/selected-daylook.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/selected-daylook.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -77,7 +77,7 @@
// update the text field with the day of this dayview
//setDay(dayview.dateNum);
- this.top.day.setText( dayview.dayOfMonth );
+ this.top.day.setAttribute('text', dayview.dayOfMonth );
// Make sure the grow button is set to '+'
//top.bkgnd.r.setStateNum(dayview.opened ? 1:0);
Modified: openlaszlo/trunk/demos/calendar/simpletimelayout.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/simpletimelayout.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/simpletimelayout.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -1,6 +1,6 @@
<library>
<class name="simpletimelayout" extends="layout" >
- <attribute name="enabled" value="true" setter="this.setEnabled(enabled)"/>
+ <attribute name="enabled" value="true" setter="setEnabled(enabled)"/>
<attribute name="viewheight" value="22"/>
<method name="setEnabled" args="e">
@@ -59,7 +59,7 @@
var c = 0;
for(var i=0; i <= l; i++) {
var s = sv[i];
- s.setY( c );
+ s.setAttribute('y', c );
c += s.height;
}
}
Modified: openlaszlo/trunk/demos/calendar/textbox.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/textbox.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/textbox.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -10,7 +10,7 @@
<view x="${parent.width}" y="${parent.height}" bgcolor="white" width="1"/>
<text name="txt" x="2" width="${parent.width-4}"/> <!-- fgcolor="#535353" -->
<method name="setText" args="t">
- txt.setText(t);
+ txt.setAttribute('text', t);
</method>
<method name="changeDataset" args="DP,path">
Modified: openlaszlo/trunk/demos/calendar/vscrollbar.lzx
===================================================================
--- openlaszlo/trunk/demos/calendar/vscrollbar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/demos/calendar/vscrollbar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -146,7 +146,7 @@
if (classroot.targetview) {
var newY = Math.floor((-classroot.targetview.y/classroot.targetview.height)
*parent.height);
- this.setY(newY);
+ this.setAttribute('y', newY);
}
</method>
@@ -154,7 +154,7 @@
if (classroot.targetview) {
var newHeight = Math.floor((classroot.height/classroot.targetview.height)
*parent.height);
- this.setHeight(newHeight);
+ this.setAttribute('height', newHeight);
}
</method>
Modified: openlaszlo/trunk/lps/components/base/basebutton.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basebutton.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basebutton.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -194,7 +194,7 @@
should appear to be down.
@param Boolean sd: unused. -->
<method name="showDown" args="sd=null">
- this.setResourceNumber( this.downResourceNumber );
+ this.setAttribute('frame', this.downResourceNumber );
</method>
<!--- This function is called whenever the button's visible state
@@ -202,9 +202,9 @@
@param Boolean sd: unused. -->
<method name="showUp" args="sd=null"> <![CDATA[
if (!this._enabled && this.disabledResourceNumber) {
- this.setResourceNumber( this.disabledResourceNumber );
+ this.setAttribute('frame', this.disabledResourceNumber );
} else {
- this.setResourceNumber( this.normalResourceNumber );
+ this.setAttribute('frame', this.normalResourceNumber );
}
]]>
</method>
@@ -213,13 +213,13 @@
appear to be highlighted to indicate that it can be clicked.
@param Boolean sd: unused. -->
<method name="showOver" args="sd=null">
- this.setResourceNumber( this.overResourceNumber );
+ this.setAttribute('frame', this.overResourceNumber );
</method>
<!--- @access private -->
<method name="setreference" args="r">
this.reference = r;
- if (r != this) this.setClickable(false)
+ if (r != this) this.setAttribute('clickable', false)
</method>
<!--- @access private -->
Modified: openlaszlo/trunk/lps/components/base/basecombobox.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basecombobox.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basecombobox.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -143,8 +143,8 @@
txt = classroot.defaulttext;
}
}
- if (this.cbtext) this.cbtext.setText( txt );
- if (this._dsblfield) this._dsblfield.setText( txt );
+ if (this.cbtext) this.cbtext.setAttribute('text', txt );
+ if (this._dsblfield) this._dsblfield.setAttribute('text', txt );
parent._applystyle( parent.style );
</method>
@@ -181,7 +181,7 @@
</handler>
<!-- pass up to component level so subclassers can catch -->
<handler name="onblur" args="v">
- classroot.setText( this.getText() );
+ classroot.setAttribute('text', this.getText() );
if ( classroot['onblur'] ) classroot.onblur.sendEvent(v);
</handler>
<!-- pass up to component level so subclassers can catch -->
@@ -558,8 +558,8 @@
@param String t: the text to display. -->
<method name="setText" args="t">
this.text = t;
- this.interior.cbtext.setText( t );
- if (!this._enabled) interior._dsblfield.setText( t );
+ this.interior.cbtext.setAttribute('text', t );
+ if (!this._enabled) interior._dsblfield.setAttribute('text', t );
if ( this.ontext ) this.ontext.sendEvent( t );
</method>
@@ -640,6 +640,7 @@
<method name="_applystyle" args="s">
if (this.style != null) {
if (editable) {
+Debug.warn("textfieldcolor", s.textfieldcolor, s);
interior.editbkgnd.setAttribute("bgcolor", s.textfieldcolor);
interior.cbtext.setAttribute('bgcolor',s.textfieldcolor);
} else {
@@ -662,7 +663,7 @@
} else {
interior._dsblfield.setAttribute('visible', true);
}
- interior._dsblfield.setText(this.getText());
+ interior._dsblfield.setAttribute('text', this.getText());
} else {
if (interior._dsblfield) interior._dsblfield.setAttribute('visible', false);
}
Modified: openlaszlo/trunk/lps/components/base/basedatacombobox.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basedatacombobox.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basedatacombobox.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -106,13 +106,13 @@
<method name="init"><![CDATA[
super.init();
if ( this.value == null && this.defaulttext != null ) {
- this._cbtext.setText(this.defaulttext);
+ this._cbtext.setAttribute('text', this.defaulttext);
} else {
this._updateSelectionOnData();
}
if ( this.statictext != null ) {
- this._cbtext.setText( this.statictext );
+ this._cbtext.setAttribute('text', this.statictext );
}
]]></method>
@@ -220,7 +220,7 @@
t = this.defaulttext;
if ( this._cbtext && (this.statictext == null) ) {
- this._cbtext.setText(t);
+ this._cbtext.setAttribute('text', t);
}
if (this.selected == null || dp['p'] !== this.selected['p']) {
@@ -300,7 +300,7 @@
}
var w = ( this.listwidth != null ? this.listwidth : this.width );
- cblist.setWidth(w);
+ cblist.setAttribute('width', w);
cblist.setAttachTarget(this);
cblist.setAttribute('shownitems', this.shownitems);
@@ -445,7 +445,7 @@
}
}
this.setValue(item.value);
- if ( item && this.statictext == null ) this._cbtext.setText(item.text);
+ if ( item && this.statictext == null ) this._cbtext.setAttribute('text', item.text);
}
this.setAttribute("isopen", false);
@@ -640,16 +640,16 @@
classroot.toggle()
</handler>
<handler name="onmouseout">
- this.setBGColor(0xCCCCCC);
+ this.setAttribute('bgcolor', 0xCCCCCC);
</handler>
<handler name="onmouseup">
- this.setBGColor(0xCCCCCC);
+ this.setAttribute('bgcolor', 0xCCCCCC);
</handler>
<handler name="onmouseover">
- this.setBGColor(0xEEEEEE);
+ this.setAttribute('bgcolor', 0xEEEEEE);
</handler>
<handler name="onmousedown">
- this.setBGColor(0xAAAAAA);
+ this.setAttribute('bgcolor', 0xAAAAAA);
</handler>
</view>
<text name="_text" width="${ parent.width - 19 }" x="7" />
Modified: openlaszlo/trunk/lps/components/base/basedatepicker.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basedatepicker.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basedatepicker.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -632,16 +632,16 @@
super.setMonthToShow(month,year);
this.display.month.datapath.setXPath(
"datepicker_strings_en:/months/month[@index='" + month + "']/@full" );
- this.display.year.setText( year );
+ this.display.year.setAttribute('text', year );
</method>
<handler name="onselecteddate">
if( this.selecteddate != null ) {
- this.selected.year.setText( this.selecteddate.getFullYear() );
+ this.selected.year.setAttribute('text', this.selecteddate.getFullYear() );
this.selected.month.datapath.setXPath(
"datepicker_strings_en:/months/month[@index='" +
this.selecteddate.getMonth() + "']/@full" );
- this.selected.date.setText( this.selecteddate.getDate() );
+ this.selected.date.setAttribute('text', this.selecteddate.getDate() );
}
</handler>
Modified: openlaszlo/trunk/lps/components/base/basefocusview.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basefocusview.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basefocusview.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -34,10 +34,10 @@
<!--- This method called when no view is focused. -->
<method name="reset">
- this.setX(0);
- this.setY(0);
- this.setWidth( canvas.width );
- this.setHeight( canvas.height );
+ this.setAttribute('x', 0);
+ this.setAttribute('y', 0);
+ this.setAttribute('width', canvas.width );
+ this.setAttribute('height', canvas.height );
setTarget( null );
</method>
@@ -63,7 +63,7 @@
if ( this.target ) this.setTarget( null )
// Make sure this focusview is visible if it is active
- this.setVisibility( this.active?'visible':'hidden' );
+ this.setAttribute('visibility', this.active?'visible':'hidden' );
// store the target that the focusview will be constrained to when
// it stops animating.
@@ -96,7 +96,7 @@
// fade in the brackets to balance out the fade out
if (this.capabilities['minimize_opacity_changes']) {
- this.setVisibility( 'visible' );
+ this.setAttribute('visibility', 'visible' );
} else {
this.animate('opacity', 1, 500);
}
@@ -121,10 +121,10 @@
nh = v.getAttributeRelative( 'height', canvas );
}
- this.setX( nx );
- this.setY( ny );
- this.setWidth( nw );
- this.setHeight( nh );
+ this.setAttribute('x', nx );
+ this.setAttribute('y', ny );
+ this.setAttribute('width', nw );
+ this.setAttribute('height', nh );
}
]]> </method>
@@ -154,7 +154,7 @@
<method name="fadeout" args="ignore" >
if (_dofadeout) {
if (this.capabilities['minimize_opacity_changes']) {
- this.setVisibility( 'hidden' );
+ this.setAttribute('visibility', 'hidden' );
} else {
this.animate( 'opacity' ,0 , 500);
}
@@ -209,11 +209,11 @@
var rct = null;
if ( target['getFocusRect'] ) rct = target.getFocusRect();
if ( rct ) {
- this.setX( rct[0] );
- this.setY( rct[1] );
+ this.setAttribute('x', rct[0] );
+ this.setAttribute('y', rct[1] );
} else {
- this.setX( this.target.getAttributeRelative('x', canvas) );
- this.setY( this.target.getAttributeRelative('y', canvas) );
+ this.setAttribute('x', this.target.getAttributeRelative('x', canvas) );
+ this.setAttribute('y', this.target.getAttributeRelative('y', canvas) );
}
</method>
@@ -222,9 +222,9 @@
var rct = null;
if ( target['getFocusRect'] ) rct = target.getFocusRect();
if ( rct ) {
- this.setWidth( rct[2] );
+ this.setAttribute('width', rct[2] );
} else {
- this.setWidth( this.target.width );
+ this.setAttribute('width', this.target.width );
}
</method>
@@ -233,9 +233,9 @@
var rct = null;
if ( target['getFocusRect'] ) rct = target.getFocusRect();
if ( rct ) {
- this.setHeight( rct[3] );
+ this.setAttribute('height', rct[3] );
} else {
- this.setHeight( this.target.height );
+ this.setAttribute('height', this.target.height );
}
</method>
Modified: openlaszlo/trunk/lps/components/base/basegrid.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basegrid.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basegrid.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -370,7 +370,7 @@
this.setDatapath( "." );
this.datapath.setAttribute( "datacontrolsvisibility",
false );
- this.setVisibility( ovisibility );
+ this.setAttribute('visibility', ovisibility );
}
var cells = this.inferColumns();
@@ -434,7 +434,7 @@
if ( noSTH ){
this.setAttribute( "sizetoheader", true );
} else if ( !this.sizetoheader ){
- this.setWidth ( this.header.hcontent.width );
+ this.setAttribute('width', this.header.hcontent.width );
}
}
//now force it to be boolean
@@ -502,7 +502,7 @@
if ( s != -1 ){
var bottompart = this.height -
(this.content.y + this.content.height );
- this.setHeight( bottompart + this.content.y + s * rowheight );
+ this.setAttribute('height', bottompart + this.content.y + s * rowheight );
}
}
Modified: openlaszlo/trunk/lps/components/base/basegridcolumn.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basegridcolumn.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basegridcolumn.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -98,8 +98,8 @@
var fupdCellBounds = function(ignore=null) {
//'this' points to the grid cell
- this.setX( this.ownerColumn.x );
- this.setWidth( this.ownerColumn.colwidth );
+ this.setAttribute('x', this.ownerColumn.x );
+ this.setAttribute('width', this.ownerColumn.colwidth );
};
var contentspkg = this._contentsPackage;
Modified: openlaszlo/trunk/lps/components/base/basegridrow.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basegridrow.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basegridrow.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -38,7 +38,7 @@
<method name="updateBGColor">
var nbg = this.getBGColor();
if ( nbg != this.bgcolor ){
- this.setBGColor( nbg );
+ this.setAttribute('bgcolor', nbg );
}
</method>
Modified: openlaszlo/trunk/lps/components/base/basescrollbar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basescrollbar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basescrollbar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -158,9 +158,9 @@
}
// only auto-align if there developer did not specify a target
if (this.axis == 'y') {
- this.setAlign('right');
+ this.setAttribute('align', 'right');
} else {
- this.setValign('bottom');
+ this.setAttribute('valign', 'bottom');
}
autoalign = true;
}
Modified: openlaszlo/trunk/lps/components/base/baseslider.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/baseslider.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/baseslider.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -304,7 +304,7 @@
<!--- constrain to parents bounds, and adjust slider value when dragged
@keywords private -->
- <method name="setX" args="x,force=null"><![CDATA[
+ <setter name="x" args="x"><![CDATA[
var boundedx = x;
var w = this.width;
@@ -319,7 +319,7 @@
}
}
- super.setX(boundedx);
+ super.setAttribute('x', boundedx);
//update slider value
var slider = this.parent.parent;
@@ -331,7 +331,7 @@
slider.setAttribute("value", thumbVal);
}
}
- ]]></method>
+ ]]></setter>
</class><!-- end basesliderthumb class -->
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
Modified: openlaszlo/trunk/lps/components/base/basetabslider.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basetabslider.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basetabslider.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -103,7 +103,7 @@
<!--- Set the height of the basetabslider. Overrides LzView setter
@param Number h: the height. -->
- <setter name="setHeight" args="h" >
+ <setter name="height" args="h" >
if ( h != height ) {
super.setAttribute('height', h);
this.resetHeight();
@@ -155,7 +155,7 @@
// value before calling calcAvailableHeight
if ( v instanceof lz.basetabelement ) v.setAttribute('minheight', this.mintabheight);
}
- // v.setHeight(v.minheight);
+ // v.setAttribute('height', v.minheight);
this.calcAvailableHeight();
var opentab = this.getSelection();
Modified: openlaszlo/trunk/lps/components/base/basetrackgroup.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basetrackgroup.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basetrackgroup.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -262,13 +262,13 @@
</handler>
<method name="setHilite" args="ishilite">
- if (ishilite ) this.setBGColor(0x00FF00);
- else this.setBGColor(0xFF0000)
+ if (ishilite ) this.setAttribute('bgcolor', 0x00FF00);
+ else this.setAttribute('bgcolor', 0xFF0000)
</method>
<method name="setSelect" args="isSelect">
- if (isSelect) this.setBGColor(0x0000FF);
- else this.setBGColor(0xFF0000)
+ if (isSelect) this.setAttribute('bgcolor', 0x0000FF);
+ else this.setAttribute('bgcolor', 0xFF0000)
</method>
</class>
Modified: openlaszlo/trunk/lps/components/base/basewindow.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/basewindow.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/basewindow.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -363,7 +363,7 @@
</setter>
<!--- @keywords private -->
- <setter name="setWidth" args="w">
+ <setter name="width" args="w">
var nw = Math.round(w);
super.setAttribute('width', nw);
</setter>
Modified: openlaszlo/trunk/lps/components/base/style.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/style.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/base/style.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -88,7 +88,7 @@
if (isdefault) {
lz._componentmanager.service.setDefaultStyle(this);
if (this['canvascolor'] != null) {
- canvas.setBGColor(this.canvascolor);
+ canvas.setAttribute('bgcolor', this.canvascolor);
}
}
if (this.onisdefault) this.onisdefault.sendEvent(this);
@@ -108,7 +108,7 @@
<!--- set canvas bgcolor if not already set
@keywords private -->
<method name="setCanvasColor" args="newcolor"> <![CDATA[
- if (this.isdefault && newcolor != null) { canvas.setBGColor(newcolor); }
+ if (this.isdefault && newcolor != null) { canvas.setAttribute('bgcolor', newcolor); }
this.canvascolor = newcolor;
if (this.onstylechanged) this.onstylechanged.sendEvent(this);
]]> </method>
Modified: openlaszlo/trunk/lps/components/charts/addon/slider/slider.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/addon/slider/slider.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/addon/slider/slider.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -159,22 +159,22 @@
<handler name="onmaxlimit">
Debug.write("*************slider width: " + this.width);
- leftknob.setX(0);
- rightknob.setX(this.width);
+ leftknob.setAttribute('x', 0);
+ rightknob.setAttribute('x', this.width);
</handler>
<method name="setMinValue" args="minvalue">
<![CDATA[
var temp = (minvalue - this.minlimit);
if(temp < 0) temp = 0;
- this.leftknob.setX(temp / this.valueratio);
+ this.leftknob.setAttribute('x', temp / this.valueratio);
]]>
</method>
<method name="setMaxValue" args="maxvalue">
var temp = (maxvalue - this.minlimit);
- this.rightknob.setX(temp / this.valueratio);
+ this.rightknob.setAttribute('x', temp / this.valueratio);
</method>
</class>
Modified: openlaszlo/trunk/lps/components/charts/addon/zoomarea.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/addon/zoomarea.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/addon/zoomarea.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -69,10 +69,10 @@
return;
}
- this.setX(parent.getMouse("x"));
- this.setY(parent.getMouse("y"));
- this.setWidth(0);
- this.setHeight(0);
+ this.setAttribute('x', parent.getMouse("x"));
+ this.setAttribute('y', parent.getMouse("y"));
+ this.setAttribute('width', 0);
+ this.setAttribute('height', 0);
this.setAttribute('visible', true);
if(!this["selectionDel"])
@@ -137,8 +137,8 @@
{
newHeight = 1;
}
- this.setHeight(newHeight);
- this.setWidth(newWidth);
+ this.setAttribute('height', newHeight);
+ this.setAttribute('width', newWidth);
]]>
</method>
Modified: openlaszlo/trunk/lps/components/charts/barchart/barchartplotarea.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/barchart/barchartplotarea.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/barchart/barchartplotarea.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -38,8 +38,8 @@
label.setAttribute('style', style.label);
label.render(labelseries[i]);
- label.setX( lx+label.width>this.width?this.width-label.width:lx );
- label.setY( v.y + v.height);
+ label.setAttribute('x', lx+label.width>this.width?this.width-label.width:lx );
+ label.setAttribute('y', v.y + v.height);
label.bringToFront();
}
}
@@ -59,10 +59,10 @@
var v = _barspool.getView();
v.setAttribute('visible', false);
- v.setX(this._xoffset);
- v.setY(x * this._yscale + this._yoffset);
- v.setWidth(height * this._xscale);
- v.setHeight(width * this._yscale);
+ v.setAttribute('x', this._xoffset);
+ v.setAttribute('y', x * this._yscale + this._yoffset);
+ v.setAttribute('width', height * this._xscale);
+ v.setAttribute('height', width * this._yscale);
v.style = style;
v.render();
v.setAttribute('visible', true);
Modified: openlaszlo/trunk/lps/components/charts/columnchart/columnchartplotarea.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/columnchart/columnchartplotarea.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/columnchart/columnchartplotarea.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -54,8 +54,8 @@
//var lx = v.x - label.width/2 + v.width/2;
var lx = (v.width - label.width)/2 + v.x + 3;
- label.setX( lx+label.width>this.width?this.width-label.width:lx<0?2:lx-5);
- label.setY( ly<this.y?2:ly);
+ label.setAttribute('x', lx+label.width>this.width?this.width-label.width:lx<0?2:lx-5);
+ label.setAttribute('y', ly<this.y?2:ly);
label.setAttribute('visible', v.x>0 && v.x <this.width )
}
}
@@ -79,11 +79,11 @@
v.setAttribute('visible', false);
- v.setX(x * this._xscale + this._xoffset);
- //v.setY(this._yoffset);
- v.setY(this._yoffset-(height*this._yscale*-1));
- v.setWidth(width * this._xscale);
- v.setHeight((height * this._yscale*-1));
+ v.setAttribute('x', x * this._xscale + this._xoffset);
+ //v.setAttribute('y', this._yoffset);
+ v.setAttribute('y', this._yoffset-(height*this._yscale*-1));
+ v.setAttribute('width', width * this._xscale);
+ v.setAttribute('height', (height * this._yscale*-1));
v.style = style;
v.render()
v.setAttribute('visible', true);
Modified: openlaszlo/trunk/lps/components/charts/common/databar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/databar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/databar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -32,7 +32,7 @@
<!--- @keywords private -->
<method name="setText" args="t">
- txt.setText(t);
+ txt.setAttribute('text', t);
</method>
<!--- @keywords private -->
@@ -61,7 +61,7 @@
else if( style.region.image != null ) {
this.setSource( style.region.image );
this.setAttribute( "stretches", style.region.stretches );
- this.setOpacity(style.region.opacity);
+ this.setAttribute('opacity', style.region.opacity);
}
else if( parent.constructor.tagname == "columnchartplotarea" ) {
Modified: openlaszlo/trunk/lps/components/charts/common/datamarker.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/datamarker.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/datamarker.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -26,14 +26,14 @@
<method name="renderValuePoint">
<![CDATA[
//resize this view
- this.pointrepresentation.setWidth(this.style.point.width);
- this.pointrepresentation.setHeight(this.style.point.height);
+ this.pointrepresentation.setAttribute('width', this.style.point.width);
+ this.pointrepresentation.setAttribute('height', this.style.point.height);
//Check if it is a figure or an image
if( this.style.point.image != null ) {
//Must be a resource
this.pointrepresentation.setSource(this.style.point.image);
this.pointrepresentation.setAttribute('stretches', both);
- this.pointrepresentation.setOpacity(this.style.point.opacity);
+ this.pointrepresentation.setAttribute('opacity', this.style.point.opacity);
} else if (this.style.point.shape=='circle' ||
this.style.point.shape=='triangle' ||
this.style.point.shape=='square' ||
@@ -98,8 +98,8 @@
this.pointrepresentation.setAttribute('visible',false);
} else {
- this.pointrepresentation.setOpacity(this.style.point.opacity);
- this.pointrepresentation.setBGColor(this.style.point.color);
+ this.pointrepresentation.setAttribute('opacity', this.style.point.opacity);
+ this.pointrepresentation.setAttribute('bgcolor', this.style.point.color);
this.pointrepresentation.setAttribute('visible',true);
}
]]>
Modified: openlaszlo/trunk/lps/components/charts/common/datatip.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/datatip.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/datatip.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -16,8 +16,8 @@
<method name="show" args="txt">
this.setAttribute('visible', true);
this.bringToFront();
- this.setX(parent.getMouse("x") - 5);
- this.setY(parent.getMouse("y") - 15);
+ this.setAttribute('x', parent.getMouse("x") - 5);
+ this.setAttribute('y', parent.getMouse("y") - 15);
this.render(txt);
Modified: openlaszlo/trunk/lps/components/charts/common/horizontalaxis.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/horizontalaxis.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/horizontalaxis.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -19,7 +19,7 @@
<attribute name="labelLenght" type="number" value="0" />
<!--- Init method-->
<method name="init">
- this.setHeight(objStroke.strokeWidth);
+ this.setAttribute('height', objStroke.strokeWidth);
super.init();
</method>
@@ -41,22 +41,22 @@
if ( this.titleX == null && this.titleY == null ){
switch( this.titleLocation ) {
case "high":
- this.titleView.setX((this.width - this.titleView.width)/2);
- this.titleView.setY(-(this.height + this.style.tickmajor.length)- this.titleGap - this.titleView.height);
+ this.titleView.setAttribute('x', (this.width - this.titleView.width)/2);
+ this.titleView.setAttribute('y', -(this.height + this.style.tickmajor.length)- this.titleGap - this.titleView.height);
break;
case "low":
- this.titleView.setX((this.width - this.titleView.width)/2);
- this.titleView.setY((this.height + this.tickMarksView.height)+ this.titleGap);
+ this.titleView.setAttribute('x', (this.width - this.titleView.width)/2);
+ this.titleView.setAttribute('y', (this.height + this.tickMarksView.height)+ this.titleGap);
if ( this.titleView.embeddedFont(style.label.fontname) ){
if ( style.label.fontangle > 20 && style.label.fontangle < 45)
- this.titleView.setX(this.titleView.x + this.titleView.width/4);
+ this.titleView.setAttribute('x', this.titleView.x + this.titleView.width/4);
else if ( style.label.fontangle > 45 && style.label.fontangle <= 270){
- this.titleView.setX(this.titleView.x + this.titleView.width/2);
+ this.titleView.setAttribute('x', this.titleView.x + this.titleView.width/2);
if ( style.label.fontangle > 90 && style.label.fontangle <= 180)
- this.titleView.setY(this.titleView.y + this.titleView.height);
+ this.titleView.setAttribute('y', this.titleView.y + this.titleView.height);
else if ( style.label.fontangle > 180)
- this.titleView.setY(this.titleView.y + this.titleView.width);
+ this.titleView.setAttribute('y', this.titleView.y + this.titleView.width);
}
if ( style.label.fontangle > 0 )
this.titleView.setAttribute('height', this.titleView.width);
@@ -64,13 +64,13 @@
break;
case "default":
- this.titleView.setX(this.width + this.titleGap);
- this.titleView.setY(-(this.titleView.height/2));
+ this.titleView.setAttribute('x', this.width + this.titleGap);
+ this.titleView.setAttribute('y', -(this.titleView.height/2));
break;
}
} else {
- this.titleView.setX(this.titleX);
- this.titleView.setY(this.titleY);
+ this.titleView.setAttribute('x', this.titleX);
+ this.titleView.setAttribute('y', this.titleY);
}
]]> </method>
@@ -141,7 +141,7 @@
}
//Set label y
- lL.setY(lInitalYMark + (lCL * (labelstyle.label.fontsize+2) ));
+ lL.setAttribute('y', lInitalYMark + (lCL * (labelstyle.label.fontsize+2) ));
}
this.tickMarksView.setAttribute('height', (lLevels * (labelstyle.label.fontsize+3)));
@@ -194,8 +194,8 @@
@keywords private -->
<method name="setLabelPos" args="pLabel,pOffset,pTW,pTH,pPos">
<![CDATA[
- pLabel.setX(pPos-(pTW/2));
- pLabel.setY(this.height+pOffset);
+ pLabel.setAttribute('x', pPos-(pTW/2));
+ pLabel.setAttribute('y', this.height+pOffset);
if ( (pLabel.getTextHeight() + this.style.tickmajor.length) >= this.tickMarksView.height )
this.tickMarksView.setAttribute('height', this.style.tickmajor.length + pLabel.getTextHeight());
Modified: openlaszlo/trunk/lps/components/charts/common/label.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/label.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/label.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -44,26 +44,26 @@
-->
<method name="render" args="txt">
<![CDATA[
- this.textContent.setText(txt);
+ this.textContent.setAttribute('text', txt);
if(style.updateNeeded(this) || !enableCache)
{
this.clear();
if (style.opacity != null) {
- this.setOpacity(style.opacity);
+ this.setAttribute('opacity', style.opacity);
}
//set the font style
this.textContent.setAttribute('fontsize', style.fontsize);
this.textContent.setAttribute('height', style.fontsize+6);
- this.textContent.setColor(style.fontcolor);
+ this.textContent.setAttribute('fgcolor', style.fontcolor);
this.textContent.setAttribute('font', style.fontname);
if (style.fillcolor!=null && style.fillcolor!='null') {
- this.textContent.setBGColor(style.fillcolor);
+ this.textContent.setAttribute('bgcolor', style.fillcolor);
} else {
- this.textContent.setBGColor(null);
+ this.textContent.setAttribute('bgcolor', null);
}
this.setAttribute('lineWidth', style.linesize);
@@ -81,8 +81,8 @@
}
if( style.linesize!=null && style.linesize>0 ) {
- this.textContent.setX(Math.ceil(style.linesize/2));
- this.textContent.setY(0);
+ this.textContent.setAttribute('x', Math.ceil(style.linesize/2));
+ this.textContent.setAttribute('y', 0);
this.setAttribute('height', textContent.height+Math.ceil(style.linesize/2));
this.setAttribute('width', textContent.width+style.linesize);
this.border();
@@ -121,7 +121,7 @@
<!--- @keywords private -->
<method name="applyRotation" args="pAngle, pfontName">
if (this.embeddedFont(pfontName)) {
- this.setRotation(pAngle);
+ this.setAttribute('rotation', pAngle);
}
</method>
<!--- @keywords private -->
Modified: openlaszlo/trunk/lps/components/charts/common/legend.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/legend.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/legend.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -87,7 +87,7 @@
if( parent.parent.legendborder )
parent.parent.border();
else
- parent.parent.setBGColor(parent.parent.fillColor);
+ parent.parent.setAttribute('bgcolor', parent.parent.fillColor);
}
</handler>
@@ -102,7 +102,7 @@
if( parent.parent.legendborder )
parent.parent.border();
else
- parent.parent.setBGColor(parent.parent.fillColor);
+ parent.parent.setAttribute('bgcolor', parent.parent.fillColor);
</method>
</datapath>
</legenditem>
@@ -246,11 +246,11 @@
legendmarkeritem = legenditem.legendmarker;
if ( imagesPath[i] != null ){
legendmarkeritem.setSource(imagesPath[i]);
- legendmarkeritem.setOpacity(ldatastyle.region.opacity);
+ legendmarkeritem.setAttribute('opacity', ldatastyle.region.opacity);
legendmarkeritem.setAttribute( "visible", true );
}
else
- legendmarkeritem.setBGColor(colors[i]);
+ legendmarkeritem.setAttribute('bgcolor', colors[i]);
this.setAttribute('identifier', i);
}
]]>
Modified: openlaszlo/trunk/lps/components/charts/common/rectangularchart.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/rectangularchart.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/rectangularchart.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -218,9 +218,9 @@
vaxis.style = new lz.axisstyle();
}
- vaxis.setX( (this.plotarea[x] != null ? this.plotarea.x : this.x) );
- vaxis.setY( (this.plotarea[y] != null ? this.plotarea.y : this.y) );
- vaxis.setHeight( (this.plotarea[height] != null ? this.plotarea.height : this.height) );
+ vaxis.setAttribute('x', (this.plotarea[x] != null ? this.plotarea.x : this.x) );
+ vaxis.setAttribute('y', (this.plotarea[y] != null ? this.plotarea.y : this.y) );
+ vaxis.setAttribute('height', (this.plotarea[height] != null ? this.plotarea.height : this.height) );
vaxis.render();
@@ -233,10 +233,10 @@
haxis.style = new lz.axisstyle();
}
- haxis.setX( (this.plotarea[x] != null ? this.plotarea.x : this.x) );
- haxis.setY( (this.plotarea[y] != null && this.plotarea[height] != null ?
+ haxis.setAttribute('x', (this.plotarea[x] != null ? this.plotarea.x : this.x) );
+ haxis.setAttribute('y', (this.plotarea[y] != null && this.plotarea[height] != null ?
this.plotarea.y + this.plotarea.height : this.y + this.height) );
- haxis.setWidth( (this.plotarea[width] != null ? this.plotarea.width : this.width) );
+ haxis.setAttribute('width', (this.plotarea[width] != null ? this.plotarea.width : this.width) );
haxis.render();
]]>
@@ -318,12 +318,12 @@
}
this.xoffset = this.width;
- vaxis.setX( this.leftMargin );
- vaxis.setY( this.topMargin );
+ vaxis.setAttribute('x', this.leftMargin );
+ vaxis.setAttribute('y', this.topMargin );
vaxis.render();
- haxis.setX( this.leftMargin );
- haxis.setY( (vaxis.y + vaxis.height) );
+ haxis.setAttribute('x', this.leftMargin );
+ haxis.setAttribute('y', (vaxis.y + vaxis.height) );
haxis.render();
]]>
Modified: openlaszlo/trunk/lps/components/charts/common/tickmarklabel.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/tickmarklabel.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/tickmarklabel.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -13,7 +13,7 @@
<method name="render" args="txt">
//do not set style twice
if(styleSet) {
- this.textContent.setText(txt);
+ this.textContent.setAttribute('text', txt);
} else {
super.render(txt);
styleSet = true;
Modified: openlaszlo/trunk/lps/components/charts/common/valueline.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/valueline.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/valueline.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -83,14 +83,14 @@
if((parent.plotarea.minx <= this.data) && (this.data <= parent.plotarea.maxx)){
var devicex = parent.haxis.getPixelDistance(this.data);
- this.setHeight(parent.plotarea.height);
- this.setWidth(parent.style.valuelinestyle.line.size);
+ this.setAttribute('height', parent.plotarea.height);
+ this.setAttribute('width', parent.style.valuelinestyle.line.size);
this.lineWidth = parent.style.valuelinestyle.line.size;
this.strokeStyle = parent.style.valuelinestyle.line.color;
- this.setX(parent.plotarea.x + devicex);
- this.setY(parent.plotarea.y);
+ this.setAttribute('x', parent.plotarea.x + devicex);
+ this.setAttribute('y', parent.plotarea.y);
this.beginPath();
this.moveTo(0, 0);
@@ -102,13 +102,13 @@
if((parent.plotarea.miny <= this.data) && (this.data <= parent.plotarea.maxy)){
var devicey = parent.vaxis.getPixelDistance(this.data);
- this.setWidth(parent.plotarea.width);
- this.setHeight(parent.style.valuelinestyle.line.size);
+ this.setAttribute('width', parent.plotarea.width);
+ this.setAttribute('height', parent.style.valuelinestyle.line.size);
this.lineWidth = parent.style.valuelinestyle.line.size;
this.strokeStyle = parent.style.valuelinestyle.line.color;
- this.setX(parent.plotarea.x);
- this.setY(parent.plotarea.y + parent.plotarea.height - devicey);
+ this.setAttribute('x', parent.plotarea.x);
+ this.setAttribute('y', parent.plotarea.y + parent.plotarea.height - devicey);
this.beginPath();
this.moveTo(0, 0);
Modified: openlaszlo/trunk/lps/components/charts/common/valuepoints.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/valuepoints.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/valuepoints.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -83,12 +83,12 @@
}
//resize this view
- this.setWidth(parent.style.valuepointstyle.point.width+lExtraTextDistance);
- this.setHeight(parent.style.valuepointstyle.point.height);
+ this.setAttribute('width', parent.style.valuepointstyle.point.width+lExtraTextDistance);
+ this.setAttribute('height', parent.style.valuepointstyle.point.height);
//move to the point and center
- this.setX(parent.plotarea.x + lDistanceX - (parent.style.valuepointstyle.point.width/2));
- this.setY(parent.plotarea.y + (parent.plotarea.height - lDIstanceY) - (parent.style.valuepointstyle.point.height/2));
+ this.setAttribute('x', parent.plotarea.x + lDistanceX - (parent.style.valuepointstyle.point.width/2));
+ this.setAttribute('y', parent.plotarea.y + (parent.plotarea.height - lDIstanceY) - (parent.style.valuepointstyle.point.height/2));
this.marker.clear();
this.marker.style = parent.style.valuepointstyle;
Modified: openlaszlo/trunk/lps/components/charts/common/valueregion.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/valueregion.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/valueregion.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -101,7 +101,7 @@
// adjust label style attributes
//this.txt.setAttribute('font', this.style.label.fontname);
this.txt.setAttribute('fontsize', this.style.label.fontsize);
- this.txt.setColor(this.style.label.fontcolor);
+ this.txt.setAttribute('fgcolor', this.style.label.fontcolor);
// adjust region style attributes
this.fillStyle = this.style.region.color;
@@ -163,8 +163,8 @@
this.objStroke.clear();
if ( this.axis == 'x' ) {
- this.setY(parent.plotarea.y);
- this.setHeight(parent.plotarea.height);
+ this.setAttribute('y', parent.plotarea.y);
+ this.setAttribute('height', parent.plotarea.height);
// Configures the left side of the region
if( (parent.plotarea.minx <= lowValue) && (lowValue <= parent.plotarea.maxx)) {
@@ -189,8 +189,8 @@
parent.plotarea.maxx) );
}
- this.setX(parent.plotarea.x + lowDeviceX);
- this.setWidth( highDeviceX - lowDeviceX + this.objStroke.strokeWidth );
+ this.setAttribute('x', parent.plotarea.x + lowDeviceX);
+ this.setAttribute('width', highDeviceX - lowDeviceX + this.objStroke.strokeWidth );
if( (highDeviceX - lowDeviceX) != 0 )
this.setAttribute('visible', this.regionEnabled);
@@ -198,8 +198,8 @@
this.setAttribute('visible', false );
} else if ( this.axis == 'y' ) {
- this.setX(parent.plotarea.x);
- this.setWidth(parent.plotarea.width);
+ this.setAttribute('x', parent.plotarea.x);
+ this.setAttribute('width', parent.plotarea.width);
// Configures the bottom side of the region
if( (parent.plotarea.miny <= lowValue) && (lowValue <= parent.plotarea.maxy) ) {
@@ -223,8 +223,8 @@
parent.plotarea.maxy) );
}
- this.setY(parent.plotarea.y + parent.plotarea.height - highDeviceY);
- this.setHeight( highDeviceY - lowDeviceY + this.objStroke.strokeWidth );
+ this.setAttribute('y', parent.plotarea.y + parent.plotarea.height - highDeviceY);
+ this.setAttribute('height', highDeviceY - lowDeviceY + this.objStroke.strokeWidth );
if( (highDeviceY - lowDeviceY) != 0 )
this.setAttribute('visible', this.regionEnabled);
Modified: openlaszlo/trunk/lps/components/charts/common/verticalaxis.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/common/verticalaxis.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/common/verticalaxis.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -18,7 +18,7 @@
@keyword private
-->
<method name="init">
- this.setWidth(objStroke.strokeWidth);
+ this.setAttribute('width', objStroke.strokeWidth);
super.init();
</method>
<!--- Render the vertical axis line
@@ -41,31 +41,31 @@
if ( this.titleX == null && this.titleY == null ){
switch( titleLocation ) {
case "high":
- this.titleView.setX((this.width + this.style.tickmajor.length)+titleGap);
- this.titleView.setY((this.height)/2);
+ this.titleView.setAttribute('x', (this.width + this.style.tickmajor.length)+titleGap);
+ this.titleView.setAttribute('y', (this.height)/2);
break;
case "low":
- this.titleView.setX(-(this.width + this.tickMarksView.width)- titleGap - titleView.width);
- this.titleView.setY((this.height)/2);
+ this.titleView.setAttribute('x', -(this.width + this.tickMarksView.width)- titleGap - titleView.width);
+ this.titleView.setAttribute('y', (this.height)/2);
if ( this.titleView.embeddedFont(style.label.fontname) ){
if ( style.label.fontangle > 20 && style.label.fontangle < 45)
- this.titleView.setX(this.titleView.x + this.titleView.width/4);
+ this.titleView.setAttribute('x', this.titleView.x + this.titleView.width/4);
else if ( (style.label.fontangle > 45 && style.label.fontangle < 90) || (style.label.fontangle > 220 && style.label.fontangle <= 270))
- this.titleView.setX(this.titleView.x + this.titleView.width/2);
+ this.titleView.setAttribute('x', this.titleView.x + this.titleView.width/2);
else if ( style.label.fontangle >= 90 && style.label.fontangle < 220)
- this.titleView.setX(this.titleView.x + this.titleView.width);
+ this.titleView.setAttribute('x', this.titleView.x + this.titleView.width);
}
break;
case "default":
- this.titleView.setX(- (this.titleView.width/2));
- this.titleView.setY( - this.titleGap - this.titleView.height);
+ this.titleView.setAttribute('x', - (this.titleView.width/2));
+ this.titleView.setAttribute('y', - this.titleGap - this.titleView.height);
break;
}
} else {
- this.titleView.setX(this.titleX);
- this.titleView.setY(this.titleY);
+ this.titleView.setAttribute('x', this.titleX);
+ this.titleView.setAttribute('y', this.titleY);
}
]]>
</method>
@@ -128,8 +128,8 @@
@keywords private -->
<method name="setLabelPos" args="pLabel,pOffset,pTW,pTH,pPos">
<![CDATA[
- pLabel.setX(-pOffset-pTW);
- pLabel.setY( this.height-pPos-(pTH/2) );
+ pLabel.setAttribute('x', -pOffset-pTW);
+ pLabel.setAttribute('y', this.height-pPos-(pTH/2) );
if ( (pLabel.getTextWidth() + this.style.tickmajor.length) >= this.tickMarksView.width )
this.tickMarksView.setAttribute('width', this.style.tickmajor.length + pLabel.getTextWidth());
Modified: openlaszlo/trunk/lps/components/charts/linechart/linechartplotarea.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/linechart/linechartplotarea.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/linechart/linechartplotarea.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -88,8 +88,8 @@
-->
<method name="renderDataPoint" args="x, y, tooltip, style, point">
- point.setX(x * this._xscale + this._xoffset - (style.point.width/2));
- point.setY(y * this._yscale + this._yoffset - (style.point.height/2));
+ point.setAttribute('x', x * this._xscale + this._xoffset - (style.point.width/2));
+ point.setAttribute('y', y * this._yscale + this._yoffset - (style.point.height/2));
point.tooltip = tooltip;
if((point["style"] == null) || style.updateNeeded(point))
@@ -127,9 +127,9 @@
label.bringToFront();
style.markUpdated(label);
}
- //label.setX( lx+label.width>plotarea.width?plotarea.width-label.width-5:lx );
- label.setX( lx );
- label.setY(devicey - label.height/2);
+ //label.setAttribute('x', lx+label.width>plotarea.width?plotarea.width-label.width-5:lx );
+ label.setAttribute('x', lx );
+ label.setAttribute('y', devicey - label.height/2);
}
var devicex = this.toDeviceX(xseries[i]);
@@ -150,7 +150,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/trunk/lps/components/charts/piechart/piepiece.lzx
===================================================================
--- openlaszlo/trunk/lps/components/charts/piechart/piepiece.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/charts/piechart/piepiece.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -316,15 +316,15 @@
positionY = halfRadius*Math.sin(-halfAngle*Math.PI/180)+y;
if(!_datalabel.labelOut) {
- _datalabel.setX(positionX - _datalabel.width/2);
+ _datalabel.setAttribute('x', positionX - _datalabel.width/2);
} else {
if(halfAngle < 90 || halfAngle > 270) {
- _datalabel.setX(positionX);
+ _datalabel.setAttribute('x', positionX);
} else {
- _datalabel.setX(positionX - _datalabel.width);
+ _datalabel.setAttribute('x', positionX - _datalabel.width);
}
}
- _datalabel.setY(positionY - _datalabel.height/2);
+ _datalabel.setAttribute('y', positionY - _datalabel.height/2);
_datalabel.bringToFront();
]]>
</method>
Modified: openlaszlo/trunk/lps/components/debugger/debugger.lzx
===================================================================
--- openlaszlo/trunk/lps/components/debugger/debugger.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/debugger/debugger.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -317,7 +317,7 @@
<method name="stuffInput" args="str">
var infield = this.bottom.center.input;
lz.Focus.setFocus(infield);
- infield.setText(str);
+ infield.setAttribute('text', str);
lz.Timer.addTimer(this.moveCaretDel, 1);
</method>
@@ -507,7 +507,7 @@
</method>
<method name="stuffObjectId" args="id">
- this.bottom.center.input.setText(this.ObjectForID(id));
+ this.bottom.center.input.setAttribute('text', this.ObjectForID(id));
</method>
<method name="inspectObject" args="obj">
@@ -519,7 +519,7 @@
</method>
<method name="setTitle" args="t" >
- this.top.title.setText( t )
+ this.top.title.setAttribute('text', t )
</method>
@@ -590,8 +590,8 @@
<view name="top" width="${parent.width}" height="24" pixellock="true" clip="true"
oninit="this.controls.bringToFront()">
<view name="background" width="${parent.width}" clip="true"
- onmouseover="grabber.setResourceNumber(2)"
- onmouseout="grabber.setResourceNumber(1)"
+ onmouseover="grabber.setAttribute('frame', 2)"
+ onmouseout="grabber.setAttribute('frame', 1)"
onmousedown="classroot.bringToFront(); parent.parent.drag.setAttribute('applied', true)"
onmouseup="parent.parent.drag.setAttribute('applied', false)"
oninit="this.right.bringToFront()">
@@ -685,7 +685,7 @@
onmousedown="parent.bringToFront()"
pixellock="true">
- <setter name="setHeight" args="h" >
+ <setter name="height" args="h" >
// keep a minimum of two lines of text displayed
var minheight = (classroot.lineheight + 16);
super.setAttribute('height', Math.max( parent.smallInputAreaHeight , Math.min( h , parent.height - (parent.top.height + minheight)) ) );
@@ -794,10 +794,10 @@
<view resource="resizer_rsc" name="resizer" pixellock="true"
y="${parent.height - 11}"
x="${parent.width - 11}"
- onmouseover="this.setResourceNumber(2);"
- onmouseout="this.setResourceNumber(1);"
- onmousedown="this.setResourceNumber(2); classroot.bringToFront(); classroot.resize.setAttribute('applied', true)"
- onmouseup="this.setResourceNumber(1); classroot.resize.setAttribute('applied', false)"
+ onmouseover="this.setAttribute('frame', 2);"
+ onmouseout="this.setAttribute('frame', 1);"
+ onmousedown="this.setAttribute('frame', 2); classroot.bringToFront(); classroot.resize.setAttribute('applied', true)"
+ onmouseup="this.setAttribute('frame', 1); classroot.resize.setAttribute('applied', false)"
/>
</view> <!-- END BOTTOM-RIGHT -->
Modified: openlaszlo/trunk/lps/components/debugger/newcontent.lzx
===================================================================
--- openlaszlo/trunk/lps/components/debugger/newcontent.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/debugger/newcontent.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -144,7 +144,7 @@
var real_scroll_width = (parent.width - (parent.arrowbuttonwidth * 2)) - parent.thumbwidth + 2;
// scroll the text window horizontally
parent.setAttribute('autoscroll', false);
- parent.parent.setXScroll(-(((x - parent.arrowbuttonwidth) / real_scroll_width) * (parent.parent.textpane.width)));
+ parent.parent.setAttribute('xscroll', -(((x - parent.arrowbuttonwidth) / real_scroll_width) * (parent.parent.textpane.width)));
parent.adjustDraggerXpos()
parent.setAttribute('autoscroll',true);
</method>
@@ -241,10 +241,10 @@
y="6" x="4" />
<method name="higlight_dragger" args="n">
- this.stretch.setResourceNumber(n);
- this.top.setResourceNumber(n);
- this.bottom.setResourceNumber(n);
- this.dimples.setResourceNumber(n)
+ this.stretch.setAttribute('frame', n);
+ this.top.setAttribute('frame', n);
+ this.bottom.setAttribute('frame', n);
+ this.dimples.setAttribute('frame', n)
</method>
<setter name="y" args="y" >
@@ -373,7 +373,7 @@
</method>
<method name="setFontSize" args="size">
- textpane.setFontSize(size);
+ textpane.setAttribute('fontsize', size);
</method>
</class>
Modified: openlaszlo/trunk/lps/components/debugger/scrollingtext.lzx
===================================================================
--- openlaszlo/trunk/lps/components/debugger/scrollingtext.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/debugger/scrollingtext.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -125,9 +125,9 @@
resource="scrolldragdimpleshorz_rsc" options="ignorelayout"
x="6" y="4" />
- <method name="setX" args="x, force=null" >
- super.setX( Math.max(parent.arrowbuttonwidth-1 , Math.min( x, parent.width - parent.arrowbuttonwidth)));
- </method>
+ <setter name="x" args="x" >
+ super.setAttribute('x', Math.max(parent.arrowbuttonwidth-1 , Math.min( x, parent.width - parent.arrowbuttonwidth)));
+ </setter>
<!-- this gets called every time the x value changes -->
<handler name="onx" reference="this">
@@ -140,7 +140,7 @@
var real_scroll_width = (parent.width - (parent.arrowbuttonwidth * 2)) - parent.thumbwidth + 2;
// scroll the text window horizontally
parent.setAttribute('autoscroll', false);
- parent.parent.setXScroll(-(((x - parent.arrowbuttonwidth) / real_scroll_width) * (parent.parent.content.textpane.width)));
+ parent.parent.setAttribute('xscroll', -(((x - parent.arrowbuttonwidth) / real_scroll_width) * (parent.parent.content.textpane.width)));
parent.adjustDraggerXpos()
parent.setAttribute('autoscroll',true);
</method>
@@ -149,7 +149,7 @@
<method name="adjustDraggerXpos">
// disable the constraint between ypos of dragger and text window for a moment
this.setAttribute('autoscroll', false);
- this.dragger.setX(this.computeDraggerXPos());
+ this.dragger.setAttribute('x', this.computeDraggerXPos());
this.setAttribute('autoscroll', true);
</method>
@@ -245,15 +245,15 @@
y="6" x="4" />
<method name="higlight_dragger" args="n">
- this.stretch.setResourceNumber(n);
- this.top.setResourceNumber(n);
- this.bottom.setResourceNumber(n);
- this.dimples.setResourceNumber(n)
+ this.stretch.setAttribute('frame', n);
+ this.top.setAttribute('frame', n);
+ this.bottom.setAttribute('frame', n);
+ this.dimples.setAttribute('frame', n)
</method>
- <method name="setY" args="y, force=null" >
- super.setY( Math.max(parent.arrowbuttonheight-1 , Math.min( y , parent.height - (parent.thumbheight + parent.arrowbuttonheight))));
- </method>
+ <setter name="y" args="y" >
+ super.setAttribute('y', Math.max(parent.arrowbuttonheight-1 , Math.min( y , parent.height - (parent.thumbheight + parent.arrowbuttonheight))));
+ </setter>
<!-- this gets called every time the y value changes -->
<handler name="ony" reference="this">
@@ -281,7 +281,7 @@
width="${parent.width - 11}"
bgcolor="#666666" height="13" />
- <setter name="setHeight" args="h" >
+ <setter name="height" args="h" >
super.setAttribute('height', h);
this.updateDisplay();
</setter>
@@ -341,7 +341,7 @@
this.computeVisibleRegion();
// disable the constraint between ypos of dragger and text window for a moment
this.setAttribute('autoscroll', false);
- this.scrollbar.dragger.setY(this.computeDraggerYPos());
+ this.scrollbar.dragger.setAttribute('y', this.computeDraggerYPos());
this.setAttribute('autoscroll', true);
<![CDATA[
@@ -352,7 +352,7 @@
for (i = 0; i < this.visiblelines; i++) {
str += this.textlines[i + l];
}
- this.content.textpane.setText(str);
+ this.content.textpane.setAttribute('text', str);
]]>
</method>
@@ -384,12 +384,12 @@
<!-- incrementally slide the text content area left or right -->
<method name="scrollx" args="nx">
- this.content.textpane.setX(Math.min(0, Math.max(-(this.content.textpane.width), this.content.textpane.x + nx)));
+ this.content.textpane.setAttribute('x', Math.min(0, Math.max(-(this.content.textpane.width), this.content.textpane.x + nx)));
</method>
<!-- set the x offset of the text output content area -->
<method name="setXScroll" args="x">
- this.content.textpane.setX(Math.max (-(this.content.textpane.width), Math.min( 0, x)));
+ this.content.textpane.setAttribute('x', Math.max (-(this.content.textpane.width), Math.min( 0, x)));
</method>
Modified: openlaszlo/trunk/lps/components/extensions/av/videoview.lzx
===================================================================
--- openlaszlo/trunk/lps/components/extensions/av/videoview.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/extensions/av/videoview.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -181,7 +181,7 @@
<!--- Set the videoview width.
@keywords private -->
- <setter name="setWidth" args="w"><![CDATA[
+ <setter name="width" args="w"><![CDATA[
super.setAttribute('width', w);
if (!this._clipinitdone) {
@@ -198,7 +198,7 @@
<!--- Set the videoview height.
@keywords private -->
- <setter name="setHeight" args="h"><![CDATA[
+ <setter name="height" args="h"><![CDATA[
super.setAttribute('height', h);
if (!this._clipinitdone) {
Modified: openlaszlo/trunk/lps/components/extensions/drawview.lzx
===================================================================
--- openlaszlo/trunk/lps/components/extensions/drawview.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/extensions/drawview.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -557,8 +557,8 @@
this.setAttribute('context', this.__LZcanvas.getContext("2d"));
}
}
- function setWidth(w) {
- super.setWidth(w);
+ override function $lzc$set_width(w) {
+ super.$lzc$set_width.apply(this, arguments);
w = Math.floor(w);
var h = Math.floor(this.height);
if (h > 0 && w > 0) {
@@ -572,8 +572,8 @@
this.__LZcanvas.style.visibility = "hidden";
}
}
- function setHeight(h) {
- super.setHeight(h);
+ override function $lzc$set_height(h) {
+ super.$lzc$set_width.apply(this, arguments);
var w = Math.floor(this.width);
h = Math.floor(h);
if (w > 0 && h > 0) {
@@ -1258,22 +1258,22 @@
}
if ($swf8) {
- function setWidth(w, ...internal) {
- if (internal.length == 0) this.__measurewidth = w == null;
- super.setWidth(w);
+ override function $lzc$set_width(w) {
+ this.__measurewidth = w == null;
+ super.setAttribute('width', w);
}
- function setHeight(h, ...internal) {
- if (internal.length == 0) this.__measureheight = h == null;
- super.setHeight(h);
+ override function $lzc$set_height(h) {
+ this.__measureheight = h == null;
+ super.setAttribute('height', h);
}
}
function __updateSize() {
if ($swf8) {
var mc = this.sprite.getContext();
- if (this.__measurewidth) this.setWidth(mc._width, true);
- if (this.__measureheight) this.setHeight(mc._height, true);
+ if (this.__measurewidth) this.setAttribute('width', mc._width, true);
+ if (this.__measureheight) this.setAttribute('height', mc._height, true);
}
}
Modified: openlaszlo/trunk/lps/components/extensions/html.lzx
===================================================================
--- openlaszlo/trunk/lps/components/extensions/html.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/extensions/html.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -77,7 +77,7 @@
if (this['ontarget']) this.ontarget.sendEvent(t);
</method>
- <attribute name="visible" type="expression" value="true" setter="this.setVisible(visible)"/>
+ <attribute name="visible" type="expression" value="true" setter="setVisible(visible)"/>
<method name="setVisible" args="v">
this.visible = v;
if (this['iframeid']) lz.embed.iframemanager.setVisible(this.iframeid, v);
@@ -135,7 +135,7 @@
if (this['srcset']) lz.embed.iframemanager.setSrc(id, this.srcset, this.history);
this.__updatepos(null);
if ($dhtml) {
- this.setClickable(true);
+ this.setAttribute('clickable', true);
}
this.setAttribute('ready', true);
</method>
Modified: openlaszlo/trunk/lps/components/extensions/views/richinputtext.lzx
===================================================================
--- openlaszlo/trunk/lps/components/extensions/views/richinputtext.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/extensions/views/richinputtext.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -87,12 +87,12 @@
if (this.resize && (this.multiline == false)) {
// single line resizable fields adjust their width to match the text
- this.setWidth(this.getTextWidth());
+ this.setAttribute('width', this.getTextWidth());
}
//multiline resizable fields adjust their height
if (this.multiline && this.sizeToHeight) {
- this.setHeight(mc._height);
+ this.setAttribute('height', mc._height);
}
if (this.multiline && this.scroll == 0 ) {
Modified: openlaszlo/trunk/lps/components/incubator/autocompletecombobox.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/autocompletecombobox.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/autocompletecombobox.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -146,7 +146,7 @@
Debug.write("The First Child = ",theFirst);
var firstChildData = theFirst.data;
- this.setText(firstChildData);
+ this.setAttribute('text', firstChildData);
this.setSelection(theInput.length,firstChildData.length);
} else {
classroot.myFloatBox.setAttribute("visible",false);
@@ -186,7 +186,7 @@
</handler>
<handler name="onselect">
Debug.write("onselect ",this.data);
- parent.owner.theeditor.actual.setText(this.data);
+ parent.owner.theeditor.actual.setAttribute('text', this.data);
var actualTyped = parent.owner.theeditor.actual.actuallyTyped;
parent.owner.theeditor.actual.setSelection(actualTyped.length,this.data.length);
</handler>
Modified: openlaszlo/trunk/lps/components/incubator/baseedittext.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/baseedittext.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/baseedittext.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -111,7 +111,7 @@
<attribute name="pattern" value="$once{null}" type="string" />
<!--- The height of the edit text box, default: 20. -->
- <attribute name="height" value="20" setter="this.setHeight(height)"/>
+ <attribute name="height" value="20" setter="this.setAttribute('height', height)"/>
<!--- The width of the edit text box, default: 106. -->
<attribute name="width" value="106"/>
@@ -150,7 +150,7 @@
internalinputfield using _placeTextY().
@keywords private -->
<method name="setHeight" args="h">
- super.setHeight(h);
+ super.setAttribute('height', h);
this._initialtexty = (!this._initcomplete);
if (this._initcomplete) this._placeTextY()
</method>
@@ -172,10 +172,9 @@
<method name="_placeTextY">
if (this._field) {
if (this.multiline) {
- this._field.setY(2);
+ this._field.setAttribute('y', 2);
} else {
- this._field.setY(
- (this.height - this._field.fontsize) / 2 - 3
+ this._field.setAttribute('y', (this.height - this._field.fontsize) / 2 - 3
);
}
}
@@ -206,10 +205,10 @@
this._field.setMultiline(this.multiline);
}
if (this.maxlength != null) {
- this._field.setMaxLength(this.maxlength);
+ this._field.setAttribute('maxlength', this.maxlength);
}
if (this.pattern != null) {
- this._field.setPattern(this.pattern);
+ this._field.setAttribute('pattern', this.pattern);
}
}
]]>
@@ -240,7 +239,7 @@
if (! _ignorecalldown) {
if (this._field) {
// Have to set internal inputtext's nocallback attr. It
- // can't be passed into _field.setText() since it's not an
+ // can't be passed into _field.setAttribute('text', ) since it's not an
// laszlo method. Nocallback means that setValue called
// internal inputtext and inputtext should not call setValue
// back.
@@ -248,7 +247,7 @@
// _internalinputtext's ontext will trigger an ontext and
// onvalue event so we don't send those events here.
- this._field.setText(value);
+ this._field.setAttribute('text', value);
}
}
@@ -311,7 +310,7 @@
<!-- Set the characters which can be entered into a text field. -->
<method name="setPattern" args="r">
this.setAttribute('pattern', r);
- this._field.setPattern(r);
+ this._field.setAttribute('pattern', r);
</method>
<!--- Returns string displayed in this component. Also see getText().
@@ -337,7 +336,7 @@
<!--- @keywords private -->
<method name="_showEnabled">
- this._field.setEnabled(this._enabled);
+ this._field.setAttribute('enabled', this._enabled);
</method>
<!--- @keywords private -->
Modified: openlaszlo/trunk/lps/components/incubator/baseslider.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/baseslider.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/baseslider.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -112,16 +112,16 @@
<method name="_adjustThumb">
var perc = getPercentage();
var x = Math.round( (this.width-track.thumb.width)*perc );
- track.thumb.setX(x);
+ track.thumb.setAttribute('x', x);
</method>
<!--- @keywords private -->
<handler name="onkeydown" args="k">
//left arrow
- if (k==37) this.track.thumb.setX(this.track.thumb.x-keystep);
+ if (k==37) this.track.thumb.setAttribute('x', this.track.thumb.x-keystep);
else
//right arrow
- if (k==39) this.track.thumb.setX(this.track.thumb.x+keystep);
+ if (k==39) this.track.thumb.setAttribute('x', this.track.thumb.x+keystep);
</handler>
<!--- @keywords private -->
@@ -176,7 +176,7 @@
if (parent.x > x) {
boundedx = parent.x;
}
- super.setX(boundedx);
+ super.setAttribute('x', boundedx);
//update slider value
var perc = ( (x) / (parent.parent.width-width) );
Modified: openlaszlo/trunk/lps/components/incubator/borderinput.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/borderinput.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/borderinput.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -5,12 +5,12 @@
<library >
<class name="borderinput">
<attribute name="changed" value="${this.txt.changed}" />
- <attribute name="text" setter="this.setText(text)" />
+ <attribute name="text" setter="this.setAttribute('text', text)" />
<attribute name="labelwidth" type="number" value="80"/>
<!-- label -->
<attribute name="label" type="string"
- when="once" setter="label_text.setText(label)"/>
+ when="once" setter="label_text.setAttribute('text', label)"/>
<!--- should be an object of type "textstyle" -->
<attribute name="labelstyle" value="null" when="once" />
@@ -45,8 +45,8 @@
<setter name="width" args="w">
super.setAttribute('width', w);
if (this.isinited ) {
- this.border.setWidth(w - this.labelwidth);
- this.txt.setWidth(w - this.labelwidth - 2);
+ this.border.setAttribute('width', w - this.labelwidth);
+ this.txt.setAttribute('width', w - this.labelwidth - 2);
}
</setter>
@@ -75,11 +75,11 @@
<!--- @keywords private -->
<method name="init" >
super.init();
- this.setWidth(width);
- this.border.setHeight( this.txt.height + 2 );
- this.label_text.setX(this.labelwidth - 6 - this.label_text.width);
- this.border.setX(this.labelwidth);
- this.txt.setX(this.labelwidth + 1);
+ this.setAttribute('width', width);
+ this.border.setAttribute('height', this.txt.height + 2 );
+ this.label_text.setAttribute('x', this.labelwidth - 6 - this.label_text.width);
+ this.border.setAttribute('x', this.labelwidth);
+ this.txt.setAttribute('x', this.labelwidth + 1);
if (this.labelstyle != null)
this._applystyle(this.labelstyle);
</method>
@@ -90,7 +90,7 @@
this.label_text.setAttribute("fgcolor", s.textcolor);
this.label_text.setAttribute("font", s.font);
this.label_text.setAttribute("fontsize", s.fontsize);
- this.label_text.setX(this.labelwidth - 6 - this.label_text.width);
+ this.label_text.setAttribute('x', this.labelwidth - 6 - this.label_text.width);
}
</method>
Modified: openlaszlo/trunk/lps/components/incubator/colorslider.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/colorslider.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/colorslider.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -4,7 +4,7 @@
<class name="myslider" extends="slider" minvalue="0" maxvalue="255" value="0" showfill="1" width="90" thumbheight="8" >
<handler name="oninit">
- this.track.background.setBGColor("0xFFFFFF");
+ this.track.background.setAttribute('bgcolor', "0xFFFFFF");
</handler>
<handler name="onvalue">
classroot.gotColor();
@@ -59,17 +59,17 @@
}
if(typeof this.colorlayout.colorchooser.mycolor.red.track != 'undefined'){
- this.colorlayout.colorchooser.mycolor.red.track.filled.setBGColor("0x"+r+""+"0000");
+ this.colorlayout.colorchooser.mycolor.red.track.filled.setAttribute('bgcolor', "0x"+r+""+"0000");
}
if(typeof this.colorlayout.colorchooser.mycolor.green.track != 'undefined'){
- this.colorlayout.colorchooser.mycolor.green.track.filled.setBGColor("0x00"+g+"00");
+ this.colorlayout.colorchooser.mycolor.green.track.filled.setAttribute('bgcolor', "0x00"+g+"00");
}
if(typeof this.colorlayout.colorchooser.mycolor.blue.track != 'undefined'){
- this.colorlayout.colorchooser.mycolor.blue.track.filled.setBGColor("0x0000"+b);
+ this.colorlayout.colorchooser.mycolor.blue.track.filled.setAttribute('bgcolor', "0x0000"+b);
}
clr = "0x"+r+""+g+""+b;
- this.colorlayout.colorchooser.clist.cinfo.colortext.setText(clr);
+ this.colorlayout.colorchooser.clist.cinfo.colortext.setAttribute('text', clr);
]]>
</method>
<method name="toHex" args="d">
Modified: openlaszlo/trunk/lps/components/incubator/custombutton.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/custombutton.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/custombutton.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -98,7 +98,7 @@
this.setAttribute("stretches", classroot.iconstretches);
// scale the resource proportionally to the view height
- this.setWidth( Math.round(this.resourcewidth*height*1.0/this.resourceheight) );
+ this.setAttribute('width', Math.round(this.resourcewidth*height*1.0/this.resourceheight) );
}
// FIXME: [gse 2006-02-06] for some reason play="false" causes a hard loop on startup
Modified: openlaszlo/trunk/lps/components/incubator/defaultlistitem.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/defaultlistitem.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/defaultlistitem.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -19,8 +19,8 @@
</handler>
<method name="adjustDefault">
- if (this.isdefault) this._title.setWidth(this.default_x);
- else this._title.setWidth(this.width);
+ if (this.isdefault) this._title.setAttribute('width', this.default_x);
+ else this._title.setAttribute('width', this.width);
</method>
Modified: openlaszlo/trunk/lps/components/incubator/draglib.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/draglib.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/draglib.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -117,8 +117,8 @@
<method name="startdrag" args="src, xoffset, yoffset">
this.startx = src.getAttributeRelative('x', canvas);
this.starty = src.getAttributeRelative('y', canvas);
- this.setX(this.startx);
- this.setY(this.starty);
+ this.setAttribute('x', this.startx);
+ this.setAttribute('y', this.starty);
this.bringToFront();
this.setAttribute('visible', true);
this.source = src;
Modified: openlaszlo/trunk/lps/components/incubator/lwzCalendar/lwzEncalendar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/lwzCalendar/lwzEncalendar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/lwzCalendar/lwzEncalendar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -65,23 +65,23 @@
super.setMonthToShow(month,year);
this.display.month.datapath.setXPath(
"datepicker_strings_en:/months/month[@index='" + month + "']/@full" );
- this.disyear.year.setText( year);
+ this.disyear.year.setAttribute('text', year);
</method>
<handler name="onselecteddate">
if( this.selecteddate != null ) {
- this.selected.year.setText( this.selecteddate.getFullYear() );
+ this.selected.year.setAttribute('text', this.selecteddate.getFullYear() );
this.selected.month.datapath.setXPath(
"datepicker_strings_en:/months/month[@index='" +
this.selecteddate.getMonth() + "']/@full" );
- this.selected.mydate.setText( this.selecteddate.getDate() );
+ this.selected.mydate.setAttribute('text', this.selecteddate.getDate() );
var selectedtime = this.selected.month.text;
var getmonvalue = month2value(selectedtime);
- this.selected.datavalue.setText(this.selected.year.text+"-"+getmonvalue+"-"+judgeday(selected.mydate.text));
+ this.selected.datavalue.setAttribute('text', this.selected.year.text+"-"+getmonvalue+"-"+judgeday(selected.mydate.text));
Debug.write(this.selected.datavalue.text);
}
</handler>
Modified: openlaszlo/trunk/lps/components/incubator/lzcombobox_class.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/lzcombobox_class.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/lzcombobox_class.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -47,12 +47,12 @@
<method name="_applystyle">
if (selected) {
this.hilite.setAttribute("visible", true);
- this.hilite.setResourceNumber(2);
+ this.hilite.setAttribute('frame', 2);
this.setTint(this.hilite, this.style.selectedcolor);
}
else if ( hilited ) {
this.hilite.setAttribute("visible", true);
- this.hilite.setResourceNumber(1);
+ this.hilite.setAttribute('frame', 1);
this.setTint(this.hilite, this.style.hilitecolor);
}
else {
Modified: openlaszlo/trunk/lps/components/incubator/lzeditcombobox.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/lzeditcombobox.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/lzeditcombobox.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -35,7 +35,7 @@
super.setValue(v);
if (this.isinited) {
- this.editbkgnd.textfield.setText(v);
+ this.editbkgnd.textfield.setAttribute('text', v);
// lz.Focus.setFocus(this.editbkgnd.textfield);
var index = this.editbkgnd.textfield.text.length;
this.editbkgnd.textfield.setSelection(index,index);
Modified: openlaszlo/trunk/lps/components/incubator/newhscrollbar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/newhscrollbar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/newhscrollbar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -98,9 +98,9 @@
if ( ! enabled ) {
this._obgcolor = this.bgcolor;
}
- this.setOpacity( enabled ? 1 : 0.6 );
- this.setBGColor( enabled ? this._obgcolor : parent.bgcolor );
- this.thumb.setClickable( enabled );
+ this.setAttribute('opacity', enabled ? 1 : 0.6 );
+ this.setAttribute('bgcolor', enabled ? this._obgcolor : parent.bgcolor );
+ this.thumb.setAttribute('clickable', enabled );
this.thumb.setAttribute('visible', true);
</method>
Modified: openlaszlo/trunk/lps/components/incubator/newvscrollbar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/newvscrollbar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/newvscrollbar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -81,9 +81,9 @@
if ( ! enabled ) {
this._obgcolor = this.bgcolor;
}
- this.setOpacity( enabled ? 1 : 0.6 );
- this.setBGColor( enabled ? this._obgcolor : parent.bgcolor );
- this.thumb.setClickable( enabled );
+ this.setAttribute('opacity', enabled ? 1 : 0.6 );
+ this.setAttribute('bgcolor', enabled ? this._obgcolor : parent.bgcolor );
+ this.thumb.setAttribute('clickable', enabled );
this.thumb.setAttribute('visible', true);
</method>
</class>
Modified: openlaszlo/trunk/lps/components/incubator/opttree/opttree.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/opttree/opttree.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/opttree/opttree.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -211,7 +211,7 @@
var itheight = cls[ 0 ].height;
var adj = itheight * -dir;
var ny = y + adj;
- this.setY( Math.min( 0 , Math.max( mask.height - height, ny ) ) );
+ this.setAttribute('y', Math.min( 0 , Math.max( mask.height - height, ny ) ) );
</method>
@@ -273,7 +273,7 @@
if ( dragisover ){
parent.select( parent.nodeinst.clones[ cpos ] );
} else {
- this.setY( cy + cpos * h );
+ this.setAttribute('y', cy + cpos * h );
parent.select( null );
}
@@ -318,7 +318,7 @@
<!--- @access private -->
<method name="_updateDragged">
- dragged.setY( this.getMouse( 'y' ) - _ydragoff );
+ dragged.setAttribute('y', this.getMouse( 'y' ) - _ydragoff );
</method>
<method name="endDrag" args="who">
Modified: openlaszlo/trunk/lps/components/incubator/rich-text/formatfontcolor.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/rich-text/formatfontcolor.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/rich-text/formatfontcolor.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -54,7 +54,7 @@
[bshine 08.09.2007] -->
<handler name="oneditor" args="e">
this.setValue(this.editor.defaultfontcolor, true);
- this.csq.setColor(this.editor.defaultfontcolor);
+ this.csq.setAttribute('fgcolor', this.editor.defaultfontcolor);
</handler>
<!--- @keywords private
@@ -68,7 +68,7 @@
<handler name="onselect"><![CDATA[
var color = this.value;
- this.csq.setColor(color);
+ this.csq.setAttribute('fgcolor', color);
//------------------------------------------------------------
// make sure that we call into editor if this combobox has
Modified: openlaszlo/trunk/lps/components/incubator/rich-text/linkdialog.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/rich-text/linkdialog.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/rich-text/linkdialog.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -43,7 +43,7 @@
<method name="show">
this.ssel = this.editor._ssel;
this.esel = this.editor._esel;
- this.urlfield.setText("http://");
+ this.urlfield.setAttribute('text', "http://");
var ntextlength = this.urlfield.getText().length;
this.urlfield.setSelection(ntextlength,ntextlength);
this._animShow.doStart();
Modified: openlaszlo/trunk/lps/components/incubator/roundrectbutton.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/roundrectbutton.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/roundrectbutton.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -96,14 +96,14 @@
<handler name="onwidth">
if (!this['_rr']) return; // ignore these events if the roundrect
// itself hasn't been built yet
- _rr.setWidth(this.width);
+ _rr.setAttribute('width', this.width);
_rr.drawStructure();
</handler>
<handler name="onheight">
if (!this['_rr']) return; // ignore these events if the roundrect
// itself hasn't been built yet
- _rr.setHeight(this.height);
+ _rr.setAttribute('height', this.height);
_rr.drawStructure();
</handler>
Modified: openlaszlo/trunk/lps/components/incubator/stepper.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/stepper.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/stepper.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -79,7 +79,7 @@
(typeof(classroot.maximum) != 'undefined' && classroot.maximum >= n)) {
- this.setText(n);
+ this.setAttribute('text', n);
}
@@ -97,7 +97,7 @@
(typeof(classroot.minimum) != 'undefined' && classroot.minimum <= n)) {
- this.setText(n);
+ this.setAttribute('text', n);
}
Modified: openlaszlo/trunk/lps/components/incubator/stylishbutton.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/stylishbutton.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/stylishbutton.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -75,7 +75,7 @@
<method name="updatePositions">
- if (this["txt"]) txt.setText(this.text);
+ if (this["txt"]) txt.setAttribute('text', this.text);
var lw = (this["left"] ? left.width : 0) + (this["showleftborder"] ? 1 : 0);
var rw = (this["right"] ? right.width : 0) + (this["showrightborder"] ? 1 : 0);
@@ -90,13 +90,13 @@
var extraWidth = Math.max(0, Math.round( (width - needsWidth) / 2));
if (this["leftborder"]) {
- leftborder.setX(curX);
+ leftborder.setAttribute('x', curX);
curX += 1;
}
// show the left resource
if (this["left"]) {
- left.setX(curX);
+ left.setAttribute('x', curX);
curX += left.width;
// add to offset left
nside+=1;
@@ -110,42 +110,42 @@
// position the middle view.
// it goes behind the icon and text
- middle.setX(curX);
+ middle.setAttribute('x', curX);
curX += extraWidth;
// position the icon
if (this["icon"]) {
- icon.setX(Math.round(curX-(.25*iw*(nside))));
+ icon.setAttribute('x', Math.round(curX-(.25*iw*(nside))));
curX += icon.width;
// Center icon vertically unless icony has been set explicitly
- icon.setY( (icony != 0) ? icony : Math.round(height-icon.height )/2);
+ icon.setAttribute('y', (icony != 0) ? icony : Math.round(height-icon.height )/2);
}
if (this["txt"]) {
// position the text
- txt.setX(curX);
- txt.setText(this.text);
+ txt.setAttribute('x', curX);
+ txt.setAttribute('text', this.text);
// Center text vertically unless texty was set explicitly
- txt.setY( (texty != 0) ? texty : (height-txt.height )/2);
+ txt.setAttribute('y', (texty != 0) ? texty : (height-txt.height )/2);
curX += txt.width;
curX += spacing;
}
curX += extraWidth;
- middle.setWidth(curX - middle.x);
+ middle.setAttribute('width', curX - middle.x);
// position the right thingy
if (this["right"]) {
- right.setX(curX);
+ right.setAttribute('x', curX);
curX += right.width;
}
if (this["rightborder"]) {
- rightborder.setX(curX - 1);
+ rightborder.setAttribute('x', curX - 1);
}
- this.setWidth(curX);
+ this.setAttribute('width', curX);
</method>
<method name="init"><![CDATA[
Modified: openlaszlo/trunk/lps/components/incubator/test/libflickr-test.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/test/libflickr-test.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/test/libflickr-test.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -31,8 +31,8 @@
<handler name="onmouseover">
gFloater.animate("x", this.x + 10, 500);
gFloater.animate("y", this.y + parent.y + this.height - 10, 500);
- gFloater.titlelabel.setText( "t: " + this.datapath.xpathQuery('@title'));
- gFloater.ownerlabel.setText( "o: " + this.datapath.xpathQuery('@ownername'));
+ gFloater.titlelabel.setAttribute('text', "t: " + this.datapath.xpathQuery('@title'));
+ gFloater.ownerlabel.setAttribute('text', "o: " + this.datapath.xpathQuery('@ownername'));
</handler>
</photo>
Modified: openlaszlo/trunk/lps/components/incubator/tooltip/tooltip.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/tooltip/tooltip.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/tooltip/tooltip.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -89,7 +89,7 @@
<!--- @keywords private -->
<method name="showTip"> <![CDATA[
- canvas.tooltipview.setText(this.text);
+ canvas.tooltipview.setAttribute('text', this.text);
var py = parent.getAttributeRelative( 'y', canvas )
var tipx = canvas.width;
@@ -123,8 +123,8 @@
}
- canvas.tooltipview.setX( tipx );
- canvas.tooltipview.setY( tipy );
+ canvas.tooltipview.setAttribute('x', tipx );
+ canvas.tooltipview.setAttribute('y', tipy );
canvas.tooltipview.setPointerX( this._lastmousex, pointerontop );
canvas.tooltipview.bringToFront( this.text );
canvas.tooltipview.setAttribute('visible', true );
Modified: openlaszlo/trunk/lps/components/incubator/tooltip/tooltipview.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/tooltip/tooltipview.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/tooltip/tooltipview.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -15,7 +15,7 @@
bgcolor="0x252525"
width="${t.width + 6}" height="17"
visible="false">
- <attribute name="text" value="" type="html" setter="this.setText(text)" />
+ <attribute name="text" value="" type="html" setter="this.setAttribute('text', text)" />
<!-- shadow left -->
<view bgcolor="black" opacity=".3"
@@ -41,19 +41,19 @@
<!--- sets the text of the tooltip -->
<method name="setText" args="new_text">
if ( !isinited ) return;
- this.t.setText(new_text);
+ this.t.setAttribute('text', new_text);
</method>
<method name="setPointerX" args="mx, isontop ">
var nx = Math.min( mx - x, width - 12)
- this.pointer.setX( nx );
+ this.pointer.setAttribute('x', nx );
if ( isontop ) {
this.pointer.setAttribute( 'frame', 1 );
- this.pointer.setY( 1 - this.pointer.height);
+ this.pointer.setAttribute('y', 1 - this.pointer.height);
} else {
this.pointer.setAttribute( 'frame', 2 );
- this.pointer.setY( height - 1);
+ this.pointer.setAttribute('y', height - 1);
}
</method>
@@ -61,7 +61,7 @@
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2006-2007 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/trunk/lps/components/incubator/ulink.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/ulink.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/ulink.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -37,12 +37,12 @@
<handler name="onmouseover">
label.setAttribute('fgcolor', this.hoverColor);
- label.setText(makeTags(this.hoverTags)+this.text);
+ label.setAttribute('text', makeTags(this.hoverTags)+this.text);
</handler>
<handler name="onmouseout">
label.setAttribute('fgcolor', this.color);
- label.setText(this.text);
+ label.setAttribute('text', this.text);
</handler>
<handler name="onclick">
Modified: openlaszlo/trunk/lps/components/incubator/uploader/fileuploadlist.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/uploader/fileuploadlist.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/uploader/fileuploadlist.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -35,7 +35,7 @@
<method name="onComplete" args="fr"><![CDATA[
super.onComplete();
parent.progressBar.setValue(100);
- parent.txtFile.setText(this.msg);
+ parent.txtFile.setAttribute('text', this.msg);
parent.setAttribute('erroroccured', false);
parent.oncomplete.sendEvent('File: '+ this.fileref.name + ' uploading completed!');
]]>
@@ -43,12 +43,12 @@
<method name="onProgress" args="fr, bytesLoaded, bytesTotal"><![CDATA[
parent.progressBar.setValue(bytesLoaded * 100 / bytesTotal);
- parent.txtFile.setText(this.msg);
+ parent.txtFile.setAttribute('text', this.msg);
]]>
</method>
<method name="onSelect" args="fr"><![CDATA[
- parent.txtFile.setText(getName());
+ parent.txtFile.setAttribute('text', getName());
parent.progressBar.setValue(0);
parent.onselect.sendEvent('File: '+ this.fileref.name + ' has been selected!');
]]>
@@ -62,21 +62,21 @@
<method name="onSecurityError">
super.onSecurityError();
- parent.txtFile.setText(this.msg);
+ parent.txtFile.setAttribute('text', this.msg);
parent.setAttribute('erroroccured', true);
parent.onerror.sendEvent('Security Error occured while uploading '+ this.fileref.name + ' !');
</method>
<method name="onIOError">
super.onIOError();
- parent.txtFile.setText(this.msg);
+ parent.txtFile.setAttribute('text', this.msg);
parent.setAttribute('erroroccured', true);
parent.onerror.sendEvent('IO Error occured while uploading '+ this.fileref.name + ' !');
</method>
<method name="onHTTPError">
super.onHTTPError();
- parent.txtFile.setText(this.msg);
+ parent.txtFile.setAttribute('text', this.msg);
parent.setAttribute('erroroccured', true);
parent.onerror.sendEvent('HTTP Error occured while uploading '+ this.fileref.name + ' !');
</method>
@@ -105,7 +105,7 @@
<handler name="onclick"><![CDATA[
parent.myFileUpload.setAttribute('uploadenable',false);
this.setAttribute('enabled',false);
- parent.txtFile.setText('');
+ parent.txtFile.setAttribute('text', '');
parent.progressBar.initValue();
parent.setAttribute('erroroccured', false);
parent.setAttribute('selected', false);
@@ -122,12 +122,12 @@
<method name="setValue" args="value"><![CDATA[
status.setAttribute('width', value * 98 / 100);
- percent.setText(Math.round(value) + '%');
+ percent.setAttribute('text', Math.round(value) + '%');
]]>
</method>
<method name="initValue"><![CDATA[
status.setAttribute('width',0);
- percent.setText('');
+ percent.setAttribute('text', '');
]]>
</method>
</view>
Modified: openlaszlo/trunk/lps/components/incubator/validators/basevalidator.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/validators/basevalidator.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/validators/basevalidator.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -41,7 +41,7 @@
var valtext = this.innercompornent.getText();
if(trim && val == null){
valtext = this.dotrim(valtext);
- this.innercompornent.setText(valtext);
+ this.innercompornent.setAttribute('text', valtext);
}
return valtext;
@@ -74,11 +74,11 @@
<method name="setErrorMessage" >
if(this.errorstring == ""){
- messagetext.setText("");
+ messagetext.setAttribute('text', "");
icon.setok();
this.setAttribute("iserror", false);
}else{
- messagetext.setText(this.errorstring);
+ messagetext.setAttribute('text', this.errorstring);
icon.seterror();
this.setAttribute("iserror", true);
}
@@ -86,7 +86,7 @@
</method>
<method name="cleanErrors">
- messagetext.setText("");
+ messagetext.setAttribute('text', "");
icon.clear();
</method>
Modified: openlaszlo/trunk/lps/components/incubator/vslider.lzx
===================================================================
--- openlaszlo/trunk/lps/components/incubator/vslider.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/incubator/vslider.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -28,7 +28,7 @@
<attribute name="drag_max" value="0" type="number" />
<handler name="oninit">
//Setting the initVal
- this.setY(getPosFromValue(this.parent.initvalue));
+ this.setAttribute('y', getPosFromValue(this.parent.initvalue));
</handler>
<method name="getValueFromPos">
@@ -47,7 +47,7 @@
</method>
<method name="setY" args="v">
- super.setY(v);
+ super.setAttribute('y', v);
var thumbVal = getValueFromPos();
if (thumbVal != parent.value) {
this.parent.setValue(thumbVal);
Modified: openlaszlo/trunk/lps/components/lz/alert.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/alert.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/alert.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -46,7 +46,7 @@
<setter name="text" args="t">
super.setAttribute('text', t);
if (!parent._usecontentwidth) {
- this.setWidth(parent.width
+ this.setAttribute('width', parent.width
- parent.inset_left - parent.inset_right
- parent.content_inset_left - parent.content_inset_right );
} else {
@@ -56,7 +56,7 @@
// since there is always extra space on the right
twidth = parent.maxtextwidth;
}
- this.setWidth(twidth);
+ this.setAttribute('width', twidth);
}
</setter>
</text>
Modified: openlaszlo/trunk/lps/components/lz/basefloatinglist.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/basefloatinglist.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/basefloatinglist.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -330,8 +330,8 @@
if (v) {
updateAttachLocation();
} else {
- this.setX(-1000);
- this.setY(-1000);
+ this.setAttribute('x', -1000);
+ this.setAttribute('y', -1000);
}
</handler>
Modified: openlaszlo/trunk/lps/components/lz/button.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/button.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/button.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -81,12 +81,12 @@
<!--- @keywords private -->
<method name="showDown" args="sd=null">
if (this.hasdefault) {
- this._outerbezel.setResourceNumber( 5 );
+ this._outerbezel.setAttribute('frame', 5 );
} else {
- this._outerbezel.setResourceNumber( this.downResourceNumber );
+ this._outerbezel.setAttribute('frame', this.downResourceNumber );
}
- this._face.setResourceNumber( this.downResourceNumber );
- this._innerbezel.setResourceNumber( this.downResourceNumber );
+ this._face.setAttribute('frame', this.downResourceNumber );
+ this._innerbezel.setAttribute('frame', this.downResourceNumber );
setAttribute('buttonstate', 2);
</method>
@@ -95,18 +95,18 @@
<method name="showUp" args="sd=null">
if (_enabled) {
if (this.hasdefault) {
- this._outerbezel.setResourceNumber( 5 );
+ this._outerbezel.setAttribute('frame', 5 );
} else {
- this._outerbezel.setResourceNumber( this.normalResourceNumber );
+ this._outerbezel.setAttribute('frame', this.normalResourceNumber );
}
- this._face.setResourceNumber( this.normalResourceNumber );
- this._innerbezel.setResourceNumber( this.normalResourceNumber );
+ this._face.setAttribute('frame', this.normalResourceNumber );
+ this._innerbezel.setAttribute('frame', this.normalResourceNumber );
if (this.style) this._title.setAttribute("fgcolor", this.style.textcolor);
} else {
if (this.style) this. _title.setAttribute("fgcolor", this.style.textdisabledcolor);
- this._face.setResourceNumber( this.disabledResourceNumber );
- this._outerbezel.setResourceNumber( this.disabledResourceNumber );
- this._innerbezel.setResourceNumber( this.disabledResourceNumber );
+ this._face.setAttribute('frame', this.disabledResourceNumber );
+ this._outerbezel.setAttribute('frame', this.disabledResourceNumber );
+ this._innerbezel.setAttribute('frame', this.disabledResourceNumber );
}
setAttribute('buttonstate', 1);
@@ -115,12 +115,12 @@
<!--- @keywords private -->
<method name="showOver" args="sd=null">
if (this.hasdefault) {
- this._outerbezel.setResourceNumber( 5 );
+ this._outerbezel.setAttribute('frame', 5 );
} else {
- this._outerbezel.setResourceNumber( this.overResourceNumber );
+ this._outerbezel.setAttribute('frame', this.overResourceNumber );
}
- this._face.setResourceNumber( this.overResourceNumber );
- this._innerbezel.setResourceNumber( this.overResourceNumber );
+ this._face.setAttribute('frame', this.overResourceNumber );
+ this._innerbezel.setAttribute('frame', this.overResourceNumber );
setAttribute('buttonstate', 1);
</method>
Modified: openlaszlo/trunk/lps/components/lz/combobox.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/combobox.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/combobox.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -38,19 +38,19 @@
super._showEnabled();
if (_enabled) {
if (!editable) {
- this.bkgnd.lft.setResourceNumber( 2 );
- this.bkgnd.mid.setResourceNumber( 2 );
+ this.bkgnd.lft.setAttribute('frame', 2 );
+ this.bkgnd.mid.setAttribute('frame', 2 );
} else {
- this.bkgnd.lft.setResourceNumber( 1 );
- this.bkgnd.mid.setResourceNumber( 1 );
+ this.bkgnd.lft.setAttribute('frame', 1 );
+ this.bkgnd.mid.setAttribute('frame', 1 );
}
} else {
if (!editable) {
- this.bkgnd.lft.setResourceNumber( 4 );
- this.bkgnd.mid.setResourceNumber( 4 );
+ this.bkgnd.lft.setAttribute('frame', 4 );
+ this.bkgnd.mid.setAttribute('frame', 4 );
} else {
- this.bkgnd.lft.setResourceNumber( 3 );
- this.bkgnd.mid.setResourceNumber( 3 );
+ this.bkgnd.lft.setAttribute('frame', 3 );
+ this.bkgnd.mid.setAttribute('frame', 3 );
}
}
</method>
Modified: openlaszlo/trunk/lps/components/lz/datacombobox.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/datacombobox.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/datacombobox.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -41,11 +41,11 @@
<method name="_showEnabled">
super._showEnabled();
if (_enabled) {
- this.bkgnd.left.setResourceNumber( 1 );
- this.bkgnd.mid.setResourceNumber( 1 );
+ this.bkgnd.left.setAttribute('frame', 1 );
+ this.bkgnd.mid.setAttribute('frame', 1 );
} else {
- this.bkgnd.left.setResourceNumber( 2 );
- this.bkgnd.mid.setResourceNumber( 2 );
+ this.bkgnd.left.setAttribute('frame', 2 );
+ this.bkgnd.mid.setAttribute('frame', 2 );
}
</method>
<view name="bkgnd" width="100%" height="20" focusable="false" bgcolor="#CCCCCC">
Modified: openlaszlo/trunk/lps/components/lz/datepicker.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/datepicker.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/datepicker.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -85,9 +85,9 @@
<handler name="onenabled">
if( this.enabled ) {
- this.icon.setOpacity( 1 );
+ this.icon.setAttribute('opacity', 1 );
} else {
- this.icon.setOpacity( .5 );
+ this.icon.setAttribute('opacity', .5 );
}
</handler>
</class>
@@ -522,11 +522,11 @@
selecteddate="new Date()">
<handler name="onselecteddate">
if( this.selecteddate != null ) {
- display.year.setText( this.selecteddate.getFullYear() );
+ display.year.setAttribute('text', this.selecteddate.getFullYear() );
display.month.datapath.setXPath(
"datepicker_strings_en:/months/month[@index='" +
this.selecteddate.getMonth() + "']/@full" );
- display.date.setText( this.selecteddate.getDate() );
+ display.date.setAttribute('text', this.selecteddate.getDate() );
}
</handler>
</datepicker>
Modified: openlaszlo/trunk/lps/components/lz/edittext.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/edittext.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/edittext.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -79,8 +79,8 @@
this.setText( this._initialtext );
}
- field.setMaxLength(this.maxlength);
- field.setPattern(this.pattern);
+ field.setAttribute('maxlength', this.maxlength);
+ field.setAttribute('pattern', this.pattern);
]]>
</method>
@@ -90,7 +90,7 @@
this.text = t;
if (this._initcomplete) {
this.setValue(t, true);
- this.field.setText(this.value);
+ this.field.setAttribute('text', this.value);
if (this['ontext']) this.ontext.sendEvent();
} else {
this._initialtext = t;
@@ -105,14 +105,14 @@
<!-- Sets the maxmimum number of characters which can be entered. -->
<method name="setMaxlength" args="n">
this.setAttribute('maxlength', n);
- this.field.setMaxLength(n);
+ this.field.setAttribute('maxlength', n);
</method>
<!-- Set the characters which can be entered into a text field. -->
<method name="setPattern" args="r">
this.setAttribute('pattern', r);
- field.setPattern(r);
+ field.setAttribute('pattern', r);
</method>
<method name="setSelection" args="start,end=null">
@@ -225,16 +225,16 @@
this.field.setAttribute('enabled', true);
this.field.setAttribute('fgcolor', this.style != null ? this.style.textcolor : null);
this._face.setAttribute( 'opacity', 1 );
- this._outerbezel.setResourceNumber( 1 );
- this._innerbezel.setResourceNumber( 1 );
+ this._outerbezel.setAttribute('frame', 1 );
+ this._innerbezel.setAttribute('frame', 1 );
} else {
this.field.setAttribute('enabled', false);
this.field.setAttribute('width', this.width - 6);
this.field.setAttribute('height', this.height - 6);
this.field.setAttribute('fgcolor', this.style != null ? this.style.textdisabledcolor : null);
this._face.setAttribute( 'opacity', .65 );
- this._outerbezel.setResourceNumber( 2 );
- this._innerbezel.setResourceNumber( 2 );
+ this._outerbezel.setAttribute('frame', 2 );
+ this._innerbezel.setAttribute('frame', 2 );
}
</method>
Modified: openlaszlo/trunk/lps/components/lz/floatinglist.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/floatinglist.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/floatinglist.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -77,7 +77,7 @@
this.cornerresourcenumber = 2;
}
if ( !isinited ) return;
- this.right.top.setResourceNumber( this.cornerresourcenumber );
+ this.right.top.setAttribute('frame', this.cornerresourcenumber );
if ( oncornerresourcenumber ) this.oncornerresourcenumber.sendEvent();
</method>
</class>
@@ -118,7 +118,7 @@
<view name="menucap" y="${parent._currentattachy == 'top'? -height + 1:parent.height }"
width="${classroot.width}"
ignoreplacement="true"
- oninit="this.setResourceNumber(1)">
+ oninit="this.setAttribute('frame', 1)">
<view resource="menucap_lft"/>
<view resource="menucap_mid" stretches="width"/>
<view resource="menucap_rt"/>
@@ -129,14 +129,14 @@
this.subviews[i].setAttribute('frame', r);
}
]]> </setter>
- <method name="setY" args="y, force=null"> <![CDATA[
- super.setY(y);
+ <setter name="y" args="y"> <![CDATA[
+ super.setAttribute('y', y);
if ( y < 0 ) {
- this.setResourceNumber(1);
+ this.setAttribute('frame', 1);
} else {
- this.setResourceNumber(2);
+ this.setAttribute('frame', 2);
}
- ]]> </method>
+ ]]> </setter>
</view>
<!--- @keywords private -->
Modified: openlaszlo/trunk/lps/components/lz/gridcolumn.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/gridcolumn.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/gridcolumn.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -27,9 +27,9 @@
<method name="init">
if ( ! this.hassetwidth ){
if ( this.showheader ){
- this.setWidth( mybutton.measureWidth() );
+ this.setAttribute('width', mybutton.measureWidth() );
} else {
- this.setWidth( this.minwidth );
+ this.setAttribute('width', this.minwidth );
}
}
if ( this.showheader ){
Modified: openlaszlo/trunk/lps/components/lz/gridtext.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/gridtext.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/gridtext.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -115,7 +115,7 @@
//componentdoes, the data for this thing can sometimes
//get set before it's ready for it
if ( !this._initcomplete ) {
- this.setText( d );
+ this.setAttribute('text', d );
} else {
super.applyData(d);
}
Modified: openlaszlo/trunk/lps/components/lz/hscrollbar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/hscrollbar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/hscrollbar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -34,9 +34,9 @@
newbgcolor = p.bgcolor;
if (newbgcolor == null) newbgcolor = 0xffffff;
}
- this.setBGColor(newbgcolor);
+ this.setAttribute('bgcolor', newbgcolor);
} else {
- this.setBGColor(0x595959);
+ this.setAttribute('bgcolor', 0x595959);
}
super._showEnabled();
]]>
Modified: openlaszlo/trunk/lps/components/lz/list.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/list.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/list.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -241,7 +241,7 @@
}
super.setAttribute('height', h);
if ( this._initcomplete ) {
- interior.setHeight( h - border_top - border_bottom );
+ interior.setAttribute('height', h - border_top - border_bottom );
checkscrollbar();
}
]]>
@@ -267,7 +267,7 @@
} else {
var hgt = this.calcMyHeight();
this._heightinternal = true;
- this.setHeight( hgt + border_top + border_bottom);
+ this.setAttribute('height', hgt + border_top + border_bottom);
this._heightinternal = false;
}
]]></method>
Modified: openlaszlo/trunk/lps/components/lz/listitem.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/listitem.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/listitem.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -68,13 +68,13 @@
if (this.style != null) {
if (_enabled) {
if (selected)
- this.setBGColor(style.selectedcolor)
+ this.setAttribute('bgcolor', style.selectedcolor)
else if ( hilited )
- this.setBGColor(style.hilitecolor);
+ this.setAttribute('bgcolor', style.hilitecolor);
else
- this.setBGColor(style.textfieldcolor);
+ this.setAttribute('bgcolor', style.textfieldcolor);
} else {
- this.setBGColor(style.textfieldcolor);
+ this.setAttribute('bgcolor', style.textfieldcolor);
}
}
</method>
Modified: openlaszlo/trunk/lps/components/lz/menu.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/menu.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/menu.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -259,7 +259,7 @@
<method name="_applystyle" args="s">
if (this.style != null) {
//parent.setAttribute('bgcolor',s.menuitembgcolor);
- this.setBGColor(s.textfieldcolor);
+ this.setAttribute('bgcolor', s.textfieldcolor);
}
</method>
@@ -446,7 +446,7 @@
// because order of execution demands it.
this.commandstate.apply( true );
var t = command.keysToString();
- this.cmdkeys.setText(t);
+ this.cmdkeys.setAttribute('text', t);
}
</method>
Modified: openlaszlo/trunk/lps/components/lz/scrollbar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/scrollbar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/scrollbar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -34,9 +34,9 @@
newbgcolor = p.bgcolor;
if (newbgcolor == null) newbgcolor = 0xffffff;
}
- this.setBGColor(newbgcolor);
+ this.setAttribute('bgcolor', newbgcolor);
} else {
- this.setBGColor(0x595959);
+ this.setAttribute('bgcolor', 0x595959);
}
super._showEnabled();
]]>
Modified: openlaszlo/trunk/lps/components/lz/simpletext.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/simpletext.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/simpletext.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -54,7 +54,7 @@
<!--- Set the text.
@param String t: text value for input. -->
<method name="setText" args="t">
- this.input.setText(t);
+ this.input.setAttribute('text', t);
</method>
<!--- Get the text.
@@ -85,7 +85,7 @@
<!--- @keywords private -->
<method name="applyData" args="d">
- this.input.setText( d );
+ this.input.setAttribute('text', d );
</method>
<!--- @keywords private -->
Modified: openlaszlo/trunk/lps/components/lz/slider.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/slider.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/slider.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -18,9 +18,9 @@
<!--- @keywords private -->
<method name="_applystyle" args="s">
- track.setBGColor(s.bordercolor);
- track.background.setBGColor(s.basecolor);
- track.filled.setBGColor(s.selectedcolor);
+ track.setAttribute('bgcolor', s.bordercolor);
+ track.background.setAttribute('bgcolor', s.basecolor);
+ track.filled.setAttribute('bgcolor', s.selectedcolor);
</method>
<doc>
<tag name="shortdesc"><text>
Modified: openlaszlo/trunk/lps/components/lz/tabelement.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/tabelement.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/tabelement.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -68,11 +68,11 @@
<handler name="onmousedown">
classroot.container.shdw.setAttribute('visible', false);
- parent.header.setY(classroot._mdoffset);
+ parent.header.setAttribute('y', classroot._mdoffset);
</handler>
<handler name="onmouseup">
classroot.container.shdw.setAttribute('visible', classroot.shadowvisible);
- parent.header.setY(0);
+ parent.header.setAttribute('y', 0);
</handler>
<handler name="onclick">
classroot.parent.select(classroot);
Modified: openlaszlo/trunk/lps/components/lz/vscrollbar.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/vscrollbar.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/vscrollbar.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -32,9 +32,9 @@
newbgcolor = p.bgcolor;
if (newbgcolor == null) newbgcolor = 0xffffff;
}
- this.setBGColor(newbgcolor);
+ this.setAttribute('bgcolor', newbgcolor);
} else {
- this.setBGColor(0x595959);
+ this.setAttribute('bgcolor', 0x595959);
}
super._showEnabled();
]]>
Modified: openlaszlo/trunk/lps/components/lz/windowpanel.lzx
===================================================================
--- openlaszlo/trunk/lps/components/lz/windowpanel.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/lz/windowpanel.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -157,7 +157,7 @@
Debug.write( "requested width smaller than minwidth," +
" ignored: "+ this);
}
- this.setWidth(this.minwidth);
+ this.setAttribute('width', this.minwidth);
setAttribute('_usecontentwidth', false );
}
if (this.height < this.minheight && !this._usecontentheight ) {
@@ -165,7 +165,7 @@
Debug.write( "requested height smaller than minheight," +
" ignored: "+ this );
}
- this.setHeight(this.minheight);
+ this.setAttribute('height', this.minheight);
setAttribute('_usecontentheight', false );
}
]]> </method>
@@ -209,35 +209,35 @@
var iconwidth = (parent.icon.width > 0) ? parent.icon.width + padding : parent.icon.width;
var twidth=0;
if (parent.title.getText() == "") {
- parent.gripper_left.setWidth(parent.width - parent.controls.x);
- parent.gripper_right.setWidth(0);
+ parent.gripper_left.setAttribute('width', parent.width - parent.controls.x);
+ parent.gripper_right.setAttribute('width', 0);
return;
} else {
- parent.gripper_left.setWidth(gripper_left);
+ parent.gripper_left.setAttribute('width', gripper_left);
twidth = parent.title.getTextWidth();
twidth = Math.ceil(twidth);
}
var next_x = gripper_left + padding;
- parent.icon.setX(next_x);
+ parent.icon.setAttribute('x', next_x);
next_x += iconwidth;
- parent.title.setX(next_x);
+ parent.title.setAttribute('x', next_x);
- parent.controls.setX(parent.width - parent.controls.width);
+ parent.controls.setAttribute('x', parent.width - parent.controls.width);
var availspace = parent.width - iconwidth - parent.controls.width
- gripper_left - gripper_right - padding*2;
if (twidth > availspace) {
twidth = availspace;
}
- parent.title.setWidth(twidth);
+ parent.title.setAttribute('width', twidth);
//var gripper_padding = 0;
//if (twidth > 0) gripper_padding = 4;
next_x += twidth + padding;
- parent.gripper_right.setX(next_x);
- parent.gripper_right.setWidth(parent.controls.x - next_x);
+ parent.gripper_right.setAttribute('x', next_x);
+ parent.gripper_right.setAttribute('width', parent.controls.x - next_x);
]]>
</method>
</layout>
Modified: openlaszlo/trunk/lps/components/queens-charts/shared/chartzoomer.lzx
===================================================================
--- openlaszlo/trunk/lps/components/queens-charts/shared/chartzoomer.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/queens-charts/shared/chartzoomer.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -41,12 +41,12 @@
<handler name="onmousedown">
<![CDATA[
- this.setWidth(0);
- this.setHeight(0);
+ this.setAttribute('width', 0);
+ this.setAttribute('height', 0);
this.setAttribute('cornerx', parent.getMouse('x'));
this.setAttribute('cornery', parent.getMouse('y'));
- this.setX(this.cornerx);
- this.setY(this.cornery);
+ this.setAttribute('x', this.cornerx);
+ this.setAttribute('y', this.cornery);
this.rs.setAttribute('applied', true);
this.setAttribute('bgcolor', this.zoomcolor);
]]>
@@ -77,10 +77,10 @@
parent.setAttribute('scaledmax', parent.scaledmax * newhratio);
parent.setAttribute('scaler', parent.scaler * newhratio);
}
- this.setWidth(parent.plotwidth);
- this.setHeight(parent.plotheight);
- this.setX(parent.plotx);
- this.setY(parent.ploty);
+ this.setAttribute('width', parent.plotwidth);
+ this.setAttribute('height', parent.plotheight);
+ this.setAttribute('x', parent.plotx);
+ this.setAttribute('y', parent.ploty);
this.rs.setAttribute('applied', false);
this.setAttribute('bgcolor', null);
parent.setAttribute('zooming', false);
Modified: openlaszlo/trunk/lps/components/queens-charts/shared/label.lzx
===================================================================
--- openlaszlo/trunk/lps/components/queens-charts/shared/label.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/queens-charts/shared/label.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -99,8 +99,8 @@
var dd = [parent.classroot, "scaler"];
this.applyConstraint("y", ff, dd);
} else if(this.charttype == "pie"){
- this.setX(this.x - this.width / 2);
- this.setY(this.y - this.height / 2);
+ this.setAttribute('x', this.x - this.width / 2);
+ this.setAttribute('y', this.y - this.height / 2);
}
]]>
</method>
@@ -125,7 +125,7 @@
<handler name="ontext">
<![CDATA[
if(this.sprite.width != 0 && this.sprite.width != 4){
- parent.setWidth(this.sprite.width + 4);
+ parent.setAttribute('width', this.sprite.width + 4);
if(parent.context){
parent.renderBorder();
}
@@ -199,7 +199,7 @@
}
var d = [barlink, "x"];
this.applyConstraint("x", f, d);
- this.setY(this.y + this.ticklength + this.loffset);
+ this.setAttribute('y', this.y + this.ticklength + this.loffset);
} else {
// Really only needed to compensate for this little issue with the
// barchart directional switch.
@@ -230,9 +230,9 @@
}
var d = [barlink, "y"];
this.applyConstraint("y", f, d);
- this.setX(this.x - this.width - this.ticklength - this.loffset);
+ this.setAttribute('x', this.x - this.width - this.ticklength - this.loffset);
} else {
- this.setX(parent.width - this.width - this.ticklength - 4);
+ this.setAttribute('x', parent.width - this.width - this.ticklength - 4);
var f = function(){
this.setAttribute("y", parent.height - ((parent.height / this.numlabels) *
this.labelnumber) - ((parent.classroot.parent.minimum %
@@ -254,7 +254,7 @@
<handler name="ontext">
<![CDATA[
if(this.sprite.width != 0 && this.sprite.width != 4){
- parent.setWidth(this.sprite.width);
+ parent.setAttribute('width', this.sprite.width);
}
]]>
</handler>
Modified: openlaszlo/trunk/lps/components/queens-charts/shared/legend.lzx
===================================================================
--- openlaszlo/trunk/lps/components/queens-charts/shared/legend.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/queens-charts/shared/legend.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -135,14 +135,14 @@
new lz.legendtitle(this, {name:'legendtitle', ltitle:this.ltitle, tposit:this.titleposition,
ttsize:(parent.expanded ? this.titletextsize : 10), tcolor:this.titlecolor});
}
- this.setWidth(litemwidth * numcols);
- this.setHeight(litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
- this.setX((parent.width - this.width) / 2);
+ this.setAttribute('width', litemwidth * numcols);
+ this.setAttribute('height', litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
+ this.setAttribute('x', (parent.width - this.width) / 2);
if(this.posit == 'bottom'){
- this.setY((this.centery + this.pieradius) +
+ this.setAttribute('y', (this.centery + this.pieradius) +
(parent.height - this.centery - this.pieradius - this.height) / 2);
} else {
- this.setY((this.centery - this.pieradius - this.height) / 2);
+ this.setAttribute('y', (this.centery - this.pieradius - this.height) / 2);
}
} else if(this.posit == 'left' || this.posit == 'right') {
var numcols = Math.floor(Math.sqrt(this.itemnums));
@@ -156,21 +156,21 @@
new lz.legendtitle(this, {name:'legendtitle', ltitle:this.ltitle, tposit:this.titleposition,
ttsize:(parent.expanded ? this.titletextsize : 10), tcolor:this.titlecolor});
}
- this.setWidth(litemwidth * numcols);
- this.setHeight(litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
+ this.setAttribute('width', litemwidth * numcols);
+ this.setAttribute('height', litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
if(this.posit == 'left'){
- this.setX((this.centerx - this.pieradius - this.width) / 2);
- this.setY((parent.height - this.height) / 2);
+ this.setAttribute('x', (this.centerx - this.pieradius - this.width) / 2);
+ this.setAttribute('y', (parent.height - this.height) / 2);
} else {
- this.setX((this.centerx + this.pieradius) +
+ this.setAttribute('x', (this.centerx + this.pieradius) +
(parent.width - this.centerx - this.pieradius - this.width) / 2);
- this.setY((parent.height - this.height) / 2);
+ this.setAttribute('y', (parent.height - this.height) / 2);
}
} else {
- this.setWidth(this.legendwidth);
- this.setHeight(this.legendheight);
- this.setX(this.legendx);
- this.setY(this.legendy);
+ this.setAttribute('width', this.legendwidth);
+ this.setAttribute('height', this.legendheight);
+ this.setAttribute('x', this.legendx);
+ this.setAttribute('y', this.legendy);
if(this.width / 4 > this.height){
var numrows = Math.floor(Math.sqrt(this.itemnums));
if(numrows > 1){
@@ -305,8 +305,8 @@
new lz.legendtitle(this, {name:'legendtitle', ltitle:this.ltitle, tposit:this.titleposition,
ttsize:this.titletextsize, tcolor:this.titlecolor});
}
- this.setWidth(litemwidth * numcols);
- this.setHeight(litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
+ this.setAttribute('width', litemwidth * numcols);
+ this.setAttribute('height', litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
// Create legend items.
for(var i = 0; i < dnum; i++){
@@ -353,8 +353,8 @@
new lz.legendtitle(this, {name:'legendtitle', ltitle:this.ltitle, tposit:this.titleposition,
ttsize:this.titletextsize, tcolor:this.titlecolor});
}
- this.setWidth(litemwidth * numcols);
- this.setHeight(litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
+ this.setAttribute('width', litemwidth * numcols);
+ this.setAttribute('height', litemheight * numrows + (this.ltitle != null ? this.legendtitle.height : 0));
// Create legend items.
for(var i = 0; i < dnum; i++){
@@ -450,9 +450,9 @@
<attribute name="lpiece" value="$once{null}"/>
<handler name="oninit">
if(this.itemlabel != null){
- this.ltext.setText(itemlabel);
+ this.ltext.setAttribute('text', itemlabel);
} else {
- this.ltext.setText(itemvalue);
+ this.ltext.setAttribute('text', itemvalue);
}
</handler>
<handler name="onmouseover">
Modified: openlaszlo/trunk/lps/components/queens-charts/shared/piepiece.lzx
===================================================================
--- openlaszlo/trunk/lps/components/queens-charts/shared/piepiece.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/queens-charts/shared/piepiece.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -120,15 +120,15 @@
var ratx = this.centerx - sx;
var raty = this.centery - sy;
- this.setX(this.x - (.08 * (ratx)));
- this.setY(this.y - (.08 * (raty)));
+ this.setAttribute('x', this.x - (.08 * (ratx)));
+ this.setAttribute('y', this.y - (.08 * (raty)));
]]>
</method>
<!--- De-explodes this piece. -->
<method name="collapseThis">
<![CDATA[
- this.setX(this.collapsex);
- this.setY(this.collapsey);
+ this.setAttribute('x', this.collapsex);
+ this.setAttribute('y', this.collapsey);
]]>
</method>
Modified: openlaszlo/trunk/lps/components/queens-charts/shared/wholepie.lzx
===================================================================
--- openlaszlo/trunk/lps/components/queens-charts/shared/wholepie.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/queens-charts/shared/wholepie.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -143,19 +143,19 @@
} else {
if(!this.expanded){
this.setAttribute('expanded', true);
- this.setWidth(parent.width);
- this.setHeight(parent.height);
- this.setX(0);
- this.setY(0);
+ this.setAttribute('width', parent.width);
+ this.setAttribute('height', parent.height);
+ this.setAttribute('x', 0);
+ this.setAttribute('y', 0);
this.eatPie();
this.buildPie();
parent.setAttribute('selectedpie', this);
} else {
this.setAttribute('expanded', false);
- this.setWidth(this.origwidth);
- this.setHeight(this.origheight);
- this.setX(this.origx);
- this.setY(this.origy);
+ this.setAttribute('width', this.origwidth);
+ this.setAttribute('height', this.origheight);
+ this.setAttribute('x', this.origx);
+ this.setAttribute('y', this.origy);
this.eatPie();
this.buildPie();
parent.setAttribute('selectedpie', null);
Modified: openlaszlo/trunk/lps/components/rpc/soap.lzx
===================================================================
--- openlaszlo/trunk/lps/components/rpc/soap.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/rpc/soap.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -162,7 +162,7 @@
<handler name="ondata" args="value">
Debug.write(value);
- result.setText(value);
+ result.setAttribute('text', value);
</handler>
<remotecall funcname="Add">
Modified: openlaszlo/trunk/lps/components/utils/diagnostic/frametimer.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/diagnostic/frametimer.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/utils/diagnostic/frametimer.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -25,9 +25,9 @@
if (this.starttime = 0) this.starttime = t;
var duration = (t - this.starttime) / 1000;; // in secs
this.fps = this.numframes / duration;
- fps_text.setText( 'fps: '+ this.fps );
+ fps_text.setAttribute('text', 'fps: '+ this.fps );
var delta = t - this.lasttime;
- if (!this.mouseisdown) time_text.setText( 'ms/frame: '+ delta );
+ if (!this.mouseisdown) time_text.setAttribute('text', 'ms/frame: '+ delta );
this.lasttime = t;
</method>
Modified: openlaszlo/trunk/lps/components/utils/diagnostic/inittimer.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/diagnostic/inittimer.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/utils/diagnostic/inittimer.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -9,7 +9,7 @@
</handler>
<text id="mytext" resize="true">
<method name="tellTime" args="t">
- this.setText( "Time taken: " + t );
+ this.setAttribute('text', "Time taken: " + t );
</method>
</text>
</class>
Modified: openlaszlo/trunk/lps/components/utils/diagnostic/inspector/colormenu.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/diagnostic/inspector/colormenu.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/utils/diagnostic/inspector/colormenu.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -39,8 +39,8 @@
if (newx + width > canvas.width) {
newx -= width;
}
- this.setX(newx - 5);
- this.setY(newy - 5);
+ this.setAttribute('x', newx - 5);
+ this.setAttribute('y', newy - 5);
this.bringToFront();
this.setAttribute('visible', true);
lz.Track.activate('mymenu');
Modified: openlaszlo/trunk/lps/components/utils/diagnostic/inspector/inspector.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/diagnostic/inspector/inspector.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/utils/diagnostic/inspector/inspector.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -25,7 +25,7 @@
</method>
<method name="setnewcolor" args="c">
- this.obj.setBGColor(c);
+ this.obj.setAttribute('bgcolor', c);
// updatecolor was getting white when color == null ???
setAttribute('color', c);
</method>
@@ -48,7 +48,7 @@
text="${parent.text}"/>
<state applied="${parent.editing}" pooling="true"
- onapplied="parent.editbox.setText(parent.text)"
+ onapplied="parent.editbox.setAttribute('text', parent.text)"
onremove="parent.setAttribute('text', parent.editbox.getText())">
<edittext name="editbox" width="${parent.t.width + 10}">
<method name="init">
@@ -104,8 +104,8 @@
<text text="${classroot.reference.name == null ?
classroot.reference.constructor.tagname : classroot.reference.name}"
onclick="classroot.toggle()"
- onmouseover="parent.setBGColor(0xddddff)"
- onmouseout="parent.setBGColor(null)"/>
+ onmouseover="parent.setAttribute('bgcolor', 0xddddff)"
+ onmouseout="parent.setAttribute('bgcolor', null)"/>
<state applied="${classroot.reference instanceof lz.view}">
<colorbox y="1" obj="classroot.reference"/>
<propedit text="${classroot.reference.x}" obj="classroot.reference" prop="x"/>
Modified: openlaszlo/trunk/lps/components/utils/replicator/replicator.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/replicator/replicator.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/utils/replicator/replicator.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -290,7 +290,7 @@
ny = this.mask.height - pos - this.replicatedsize;
} else if (pos < -y) ny = -pos;
- if (y != ny) this.container.setY(ny);
+ if (y != ny) this.container.setAttribute('y', ny);
]]>
</method>
</class>
Modified: openlaszlo/trunk/lps/components/utils/traits/cssable.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/traits/cssable.lzx 2008-09-05 20:49:47 UTC (rev 10895)
+++ openlaszlo/trunk/lps/components/utils/traits/cssable.lzx 2008-09-05 20:58:16 UTC (rev 10896)
@@ -38,7 +38,7 @@
//
if (this instanceof lz.text) {
var n = Number(v);
- this.setColor(n); // must be a color
+ this.setAttribute('fgcolor', n); // must be a color
}
}
More information about the Laszlo-checkins
mailing list