[Laszlo-checkins] r7213 - in openlaszlo/branches/paperpie: . WEB-INF/lps/lfc/compiler WEB-INF/lps/lfc/data WEB-INF/lps/lfc/kernel/swf WEB-INF/lps/lfc/kernel/swf9 WEB-INF/lps/lfc/views WEB-INF/lps/misc WEB-INF/lps/schema WEB-INF/lps/server/src/org/openlaszlo/compiler WEB-INF/lps/templates docs/src/developers docs/src/developers/programs docs/src/developers/programs/lib docs/src/developers/programs/shareddata docs/src/developers/programs/sharedresources docs/src/developers/programs/sharedresources/headshots docs/src/developers/tutorials/programs docs/src/developers/tutorials/programs/resources laszlo-explorer/coverpages/welcome lps/components/base lps/components/extensions lps/components/utils/replicator lps/components/utils/traits lps/includes test/compiler_errors
ben@openlaszlo.org
ben at openlaszlo.org
Sun Nov 11 22:23:06 PST 2007
Author: ben
Date: 2007-11-11 22:22:45 -0800 (Sun, 11 Nov 2007)
New Revision: 7213
Added:
openlaszlo/branches/paperpie/docs/src/developers/building-data-driven-apps.dbk
openlaszlo/branches/paperpie/docs/src/developers/data-overview.dbk
openlaszlo/branches/paperpie/docs/src/developers/data-patterns-and-best-practices.dbk
openlaszlo/branches/paperpie/docs/src/developers/data-replication.dbk
openlaszlo/branches/paperpie/docs/src/developers/dataprovider.dbk
openlaszlo/branches/paperpie/docs/src/developers/dynamic-databinding.dbk
openlaszlo/branches/paperpie/docs/src/developers/patterns-and-best-practices.dbk
openlaszlo/branches/paperpie/docs/src/developers/programs/currenttime.jsp
openlaszlo/branches/paperpie/docs/src/developers/programs/data-accessing-lzdataelement.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/data-attributepathbinding.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/data-buffer_dataset.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/data-concatenatingattributes.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/data-prettyprinter.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/data-setattribute_p.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/data-xpathstring.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/data_polling.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/datapointer-basics.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/datapointer-creating-node.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/datapointermove.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/incremental_loading.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/lib/
openlaszlo/branches/paperpie/docs/src/developers/programs/lib/contact.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/
openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/README.html
openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_full.xml
openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_large.xml
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/README.html
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_alfred.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_beck.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_calder.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_carey.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_dan.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_daniele.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_gretchen.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_karen.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_laura.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_lisa.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_mark.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_nicole.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_peter.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_todd.jpg
openlaszlo/branches/paperpie/docs/src/developers/static-databinding.dbk
openlaszlo/branches/paperpie/docs/src/developers/two-way-databinding.dbk
openlaszlo/branches/paperpie/test/compiler_errors/override-builtin.lzx
openlaszlo/branches/paperpie/test/compiler_errors/override-state-apply.lzx
Removed:
openlaszlo/branches/paperpie/docs/src/developers/programs/lib/contact.lzx
openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/README.html
openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_full.xml
openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_large.xml
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/README.html
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_alfred.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_beck.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_calder.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_carey.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_dan.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_daniele.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_gretchen.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_karen.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_laura.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_lisa.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_mark.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_nicole.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_peter.jpg
openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_todd.jpg
Modified:
openlaszlo/branches/paperpie/
openlaszlo/branches/paperpie/WEB-INF/lps/lfc/compiler/Class.lzs
openlaszlo/branches/paperpie/WEB-INF/lps/lfc/data/LzDatapointer.lzs
openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzContextMenu.lzs
openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzLoader.lzs
openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzMediaLoader.lzs
openlaszlo/branches/paperpie/WEB-INF/lps/lfc/views/LaszloView.lzs
openlaszlo/branches/paperpie/WEB-INF/lps/misc/lzx-autoincludes.properties
openlaszlo/branches/paperpie/WEB-INF/lps/schema/lfc.lzx
openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java
openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewSchema.java
openlaszlo/branches/paperpie/WEB-INF/lps/templates/app-console.xslt
openlaszlo/branches/paperpie/build.xml
openlaszlo/branches/paperpie/docs/src/developers/data-structures.dbk
openlaszlo/branches/paperpie/docs/src/developers/index.dbk
openlaszlo/branches/paperpie/docs/src/developers/proxied.dbk
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/art_assets-$8.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$10.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$11.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$7.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$9.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_button.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_display.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/classes-tutorial-$5.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$5.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$6.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$8.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$9.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/resources/phonebook.xml
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$14.lzx
openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$6.lzx
openlaszlo/branches/paperpie/laszlo-explorer/coverpages/welcome/index.html
openlaszlo/branches/paperpie/lps/components/base/basedatacombobox.lzx
openlaszlo/branches/paperpie/lps/components/base/basegridrow.lzx
openlaszlo/branches/paperpie/lps/components/extensions/drawview.lzx
openlaszlo/branches/paperpie/lps/components/utils/replicator/replicator.lzx
openlaszlo/branches/paperpie/lps/components/utils/traits/cssable.lzx
openlaszlo/branches/paperpie/lps/includes/console.css
Log:
Merged revisions 7043,7045-7046,7048,7050-7052,7054,7056,7058,7060-7065,7068-7074,7078-7079,7081-7084,7086-7090,7092,7094,7097-7103,7108-7109,7111-7126,7134-7146,7148-7212 from trunk via svnmerge
Property changes on: openlaszlo/branches/paperpie
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497 /openlaszlo/trunk:1-7041,7043-7136
+ /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497 /openlaszlo/trunk:1-7041,7043-7212
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/lfc/compiler/Class.lzs
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/lfc/compiler/Class.lzs 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/lfc/compiler/Class.lzs 2007-11-12 06:22:45 UTC (rev 7213)
@@ -334,16 +334,16 @@
}
// Create any trait interstitials, following the pattern above
if (traitsAndSuperclass instanceof Array) {
- while (traitsAndSuperclass.length) {
- var t = traitsAndSuperclass.pop();
- prototype = t.makeInterstitial(prototype, traitsAndSuperclass.length > 0);
+ for (var i = traitsAndSuperclass.length - 1; i >= 0; i--) {
+ var t = traitsAndSuperclass[i];
+ prototype = t.makeInterstitial(prototype, i > 0);
}
}
// Install the staticProperties
if (staticProperties) {
- while (staticProperties.length > 0) {
- var value = staticProperties.pop();
- var name = staticProperties.pop();
+ for (var i = staticProperties.length - 1; i >= 1; i -= 2) {
+ var value = staticProperties[i];
+ var name = staticProperties[i - 1];
nc.addStaticProperty(name, value);
}
}
@@ -357,9 +357,9 @@
}
// Class.initialize: Install initial values
if (instanceProperties) {
- while (instanceProperties.length > 0) {
- var value = instanceProperties.pop();
- var name = instanceProperties.pop();
+ for (var i = instanceProperties.length - 1; i >= 1; i -= 2) {
+ var value = instanceProperties[i];
+ var name = instanceProperties[i - 1];
nc.addProperty(name, value);
}
}
@@ -397,8 +397,7 @@
// Add to prototype
this.prototype[name] = value;
// Save for future implementations
- this.instanceProperties.push(name);
- this.instanceProperties.push(value);
+ this.instanceProperties.push(name, value);
// Add it to existing implementations
var impls = this.implementations;
for (var mash in impls) {
@@ -439,16 +438,15 @@
}
// Add the properties to the prototype (superclassInstance)
var ip = this.instanceProperties;
- var ipl = ip.length;
- for (var i = 0; i < ipl; i += 2) {
+ for (var i = ip.length - 1; i >= 1; i -= 2) {
+ var value = ip[i];
+ var name = ip[i - 1];
// if ($debug) {
// if (name in superclassInstance) {
// Debug.debug("%s.%s overrides %s.%s", this.classname, name,
// superclassInstance.constructor.classname, name);
// }
// }
- var name = ip[i];
- var value = ip[i+1];
superclassInstance.addProperty.call(superclassInstance, name, value);
}
// Make the interstitial
@@ -491,17 +489,17 @@
nt.addStaticProperty('makeInterstitial', this.makeInterstitial);
// Install the staticProperties
if (staticProperties) {
- while (staticProperties.length > 0) {
- var value = staticProperties.pop();
- var name = staticProperties.pop();
+ for (var i = staticProperties.length - 1; i >= 1; i -= 2) {
+ var value = staticProperties[i];
+ var name = staticProperties[i - 1];
nt.addStaticProperty(name, value);
}
}
// Trait.initialize: install initial values
if (instanceProperties) {
- while (instanceProperties.length > 0) {
- var value = instanceProperties.pop();
- var name = instanceProperties.pop();
+ for (var i = instanceProperties.length - 1; i >= 1; i -= 2) {
+ var value = instanceProperties[i];
+ var name = instanceProperties[i - 1];
nt.addProperty(name, value);
}
}
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/lfc/data/LzDatapointer.lzs
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/lfc/data/LzDatapointer.lzs 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/lfc/data/LzDatapointer.lzs 2007-11-12 06:22:45 UTC (rev 7213)
@@ -909,8 +909,10 @@
}
return;
}
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
this.p.setNodeName( name );
}
+}
/**
* Returns the attributes of the node pointed to by the datapointer in an
@@ -941,8 +943,10 @@
}
return;
}
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
return this.p.attributes[ name ];
}
+}
/**
* Set the <param>name</param> attribute of the current node to the
@@ -957,8 +961,10 @@
}
return;
}
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
this.p.setAttr( name, val );
}
+}
/**
* Removes the <param>name</param> attribute from the current node.
@@ -971,8 +977,10 @@
}
return;
}
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
this.p.removeAttr( name );
}
+}
/**
* Returns a string that represents a concatenation of the text nodes
@@ -988,8 +996,10 @@
}
return;
}
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
return this.p.__LZgetText();
}
+}
/**
* Returns a string that represents a concatenation of the text nodes
@@ -1035,6 +1045,7 @@
return;
}
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
// set the first text node you find; otherwise add one
var foundit = false;
for (var i = 0; i < this.p.childNodes.length; i++) {
@@ -1049,6 +1060,7 @@
this.p.appendChild( new LzDataText( val ) );
}
}
+}
/**
* Counts the number of element nodes that are children of the node that the
@@ -1056,7 +1068,7 @@
* @return Integer: The number of child nodes for the current node
*/
function getNodeCount (){
- if (! this.p) return 0;
+ if (! this.p || this.p.nodeType == LzDataNode.TEXT_NODE) return 0;
return this.p.childNodes.length || 0;
}
@@ -1083,7 +1095,10 @@
nn.appendChild( new LzDataText( text ) );
}
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
this.p.appendChild( nn );
+ }
+
return nn;
}
@@ -1158,7 +1173,11 @@
}
var n = dp.p.cloneNode( true );
+
+ if (this.p.nodeType != LzDataNode.TEXT_NODE) {
this.p.appendChild( n );
+ }
+
return new LzDatapointer( null , { pointer : n } );
}
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf/LzLoader.lzs 2007-11-12 06:22:45 UTC (rev 7213)
@@ -180,15 +180,10 @@
if ( ! loadobj.valid ) {
- this.doTimeOut(loadobj);
return;
}
- // [2005-08-25 ptw] So, we don't want to mark the clip as loaded
- // if this is a persistent connection? Not sure what that means.
- if ( ! this.doPersist ) {
- LzLoadQueue.loadFinished( loadobj );
- }
+ LzLoadQueue.loadFinished( loadobj );
this.lastloadtime = getTimer() - loadobj.loadtime;
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzContextMenu.lzs
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzContextMenu.lzs 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzContextMenu.lzs 2007-11-12 06:22:45 UTC (rev 7213)
@@ -27,8 +27,8 @@
this.setDelegate(del);
}
-DeclareEvent(prototype, 'onmenuopen' );
-DeclareEvent(prototype, 'onselect' );
+var onmenuopen = LzDeclaredEvent;
+var onselect = LzDeclaredEvent;
/**
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzLoader.lzs
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzLoader.lzs 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzLoader.lzs 2007-11-12 06:22:45 UTC (rev 7213)
@@ -75,10 +75,10 @@
}
-DeclareEvent(prototype, 'onerror' );
-DeclareEvent(prototype, 'ondata' );
-DeclareEvent(prototype, 'onrequest' );
-DeclareEvent(prototype, 'ontimeout' );
+var onerror = LzDeclaredEvent;
+var ondata = LzDeclaredEvent;
+var onrequest = LzDeclaredEvent;
+var ontimeout = LzDeclaredEvent;
var requestheaders = {};
var timeout = 30000;
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzMediaLoader.lzs
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzMediaLoader.lzs 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/lfc/kernel/swf9/LzMediaLoader.lzs 2007-11-12 06:22:45 UTC (rev 7213)
@@ -38,8 +38,8 @@
}
}
-DeclareEvent(prototype, 'onstreamstart' );
-DeclareEvent(prototype, 'onloaddone' );
+var onstreamstart = LzDeclaredEvent;
+var onloaddone = LzDeclaredEvent;
var LOADERDEPTH = 9;
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/lfc/views/LaszloView.lzs
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/lfc/views/LaszloView.lzs 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/lfc/views/LaszloView.lzs 2007-11-12 06:22:45 UTC (rev 7213)
@@ -32,27 +32,12 @@
* <p><classname>LzView</classname> extends <classname>LzNode</classname>,
* which is the fundamental abstract class of LZX.</p>
*
- * <p>For more a gentle introduction to views please see the <a
+ * <p>For an introduction to views see the <a
* href="${tutorials}">Laszlo tutorials</a>, particularly <a
- * href="${tutorials}laszlo_basics.html">Laszlo Basics</a> and <a
- * href="${tutorials}views.html">Understanding Views</a>. For a more
- * rigorous explanation of views see the<a href="${dguide}">Developer's Guide</a>, particularly the <a
- * href="${dguide}views-tutorial.html">views</a> chapter.</p>
- *
- * In addition to any events documented in the section below, these events are also available:
- *
- * <event>onmouseupoutside</event>: Sent when the mouse button comes up outside a
- * view This event is only sent by views which are clickable
- * after it went down over the view. This event is only sent by views which
- * are clickable
-
- * <event>onmousedragin</event>: Sent when the mouse button went down over the view
- * and the button is still down when mouse rolls back inside the view.
- * This event is only sent by views which are clickable
-
- * <event>onmousedragout</event>: Sent when the mouse button went down over the view
- * and the button is still down when mouse rolls outside the view.
- * This event is only sent by views which are clickable
+ * href="${tutorials}laszlo_basics.html">OpenLaszlo Basics</a> and <a
+ * href="${tutorials}views-tutorial.html">Introduction to Views</a>. For a more
+ * rigorous explanation of views see the <a href="${dguide}">Application Developer's Guide</a>, particularly the <a
+ * href="${dguide}views.html">Views</a> chapter.</p>
*
* @shortdesc The most basic viewable element.
* @lzxname view
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/misc/lzx-autoincludes.properties
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/misc/lzx-autoincludes.properties 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/misc/lzx-autoincludes.properties 2007-11-12 06:22:45 UTC (rev 7213)
@@ -6,125 +6,125 @@
# * Use is subject to license terms. *
# * P_LZ_COPYRIGHT_END ********************************************************
-basebutton: base/basebutton.lzx
-multistatebutton: base/multistatebutton.lzx
-basecomponent: base/basecomponent.lzx
-statictext: base/basecomponent.lzx
-basevaluecomponent: base/basevaluecomponent.lzx
-baseform: base/baseform.lzx
-submit: base/submit.lzx
-baseformitem: base/baseformitem.lzx
-baselist: base/baselist.lzx
-baselistitem: base/baselistitem.lzx
-basescrollbar: base/basescrollbar.lzx
-baseslider: base/baseslider.lzx
-basesliderthumb: base/baseslider.lzx
-baseslidertrack: base/baseslider.lzx
-basetabs: base/basetabs.lzx
-basetabslider: base/basetabslider.lzx
-basetabelement: base/basetabelement.lzx
-basetrackgroup: base/basetrackgroup.lzx
-basetree: base/basetree.lzx
-basewindow: base/basewindow.lzx
-basecombobox: base/basecombobox.lzx
-basedatacombobox: base/basedatacombobox.lzx
-resizeview_x: base/resizeview.lzx
-resizeview_y: base/resizeview.lzx
-style: base/style.lzx
-swatchview: base/swatchview.lzx
-basegrid: base/basegrid.lzx
-basedatepicker: base/basedatepicker.lzx
-basedatepickerday: base/basedatepickerday.lzx
-basedatepickerweek: base/basedatepickerweek.lzx
+basebutton: /base/basebutton.lzx
+multistatebutton: /base/multistatebutton.lzx
+basecomponent: /base/basecomponent.lzx
+statictext: /base/basecomponent.lzx
+basevaluecomponent: /base/basevaluecomponent.lzx
+baseform: /base/baseform.lzx
+submit: /base/submit.lzx
+baseformitem: /base/baseformitem.lzx
+baselist: /base/baselist.lzx
+baselistitem: /base/baselistitem.lzx
+basescrollbar: /base/basescrollbar.lzx
+baseslider: /base/baseslider.lzx
+basesliderthumb: /base/baseslider.lzx
+baseslidertrack: /base/baseslider.lzx
+basetabs: /base/basetabs.lzx
+basetabslider: /base/basetabslider.lzx
+basetabelement: /base/basetabelement.lzx
+basetrackgroup: /base/basetrackgroup.lzx
+basetree: /base/basetree.lzx
+basewindow: /base/basewindow.lzx
+basecombobox: /base/basecombobox.lzx
+basedatacombobox: /base/basedatacombobox.lzx
+resizeview_x: /base/resizeview.lzx
+resizeview_y: /base/resizeview.lzx
+style: /base/style.lzx
+swatchview: /base/swatchview.lzx
+basegrid: /base/basegrid.lzx
+basedatepicker: /base/basedatepicker.lzx
+basedatepickerday: /base/basedatepickerday.lzx
+basedatepickerweek: /base/basedatepickerweek.lzx
-constantlayout: utils/layouts/constantlayout.lzx
-resizelayout: utils/layouts/resizelayout.lzx
-simplelayout: utils/layouts/simplelayout.lzx
-stableborderlayout: utils/layouts/stableborderlayout.lzx
-wrappinglayout: utils/layouts/wrappinglayout.lzx
-reverselayout: utils/layouts/reverselayout.lzx
-dragstate: utils/states/dragstate.lzx
-resizestate: utils/states/resizestate.lzx
+constantlayout: /utils/layouts/constantlayout.lzx
+resizelayout: /utils/layouts/resizelayout.lzx
+simplelayout: /utils/layouts/simplelayout.lzx
+stableborderlayout: /utils/layouts/stableborderlayout.lzx
+wrappinglayout: /utils/layouts/wrappinglayout.lzx
+reverselayout: /utils/layouts/reverselayout.lzx
+dragstate: /utils/states/dragstate.lzx
+resizestate: /utils/states/resizestate.lzx
-inittimer: utils/diagnostic/inittimer.lzx
-frametimer: utils/diagnostic/frametimer.lzx
-versioninfo: utils/diagnostic/versioninfo.lzx
-inspector: utils/diagnostic/inspector/inspector.lzx
+inittimer: /utils/diagnostic/inittimer.lzx
+frametimer: /utils/diagnostic/frametimer.lzx
+versioninfo: /utils/diagnostic/versioninfo.lzx
+inspector: /utils/diagnostic/inspector/inspector.lzx
-checkbox: lz/checkbox.lzx
-button: lz/button.lzx
-combobox: lz/combobox.lzx
-datacombobox: lz/datacombobox.lzx
-menu: lz/menu.lzx
-menubar: lz/menu.lzx
-menuitem: lz/menu.lzx
-menuseparator: lz/menu.lzx
-radiogroup: lz/radio.lzx
-radiobutton: lz/radio.lzx
-slider: lz/slider.lzx
-slidertrack: lz/slider.lzx
-sliderthumb: lz/slider.lzx
-scrollbar: lz/scrollbar.lzx
-hscrollbar: lz/hscrollbar.lzx
-vscrollbar: lz/vscrollbar.lzx
-window: lz/window.lzx
-modaldialog: lz/window.lzx
-alert: lz/window.lzx
-edittext: lz/edittext.lzx
-simpleinputtext: lz/simpletext.lzx
-form: lz/form.lzx
-tabs: lz/tabs.lzx
-tabpane: lz/tabs.lzx
-tabbar: lz/tabs.lzx
-list: lz/list.lzx
-listitem: lz/listitem.lzx
-textlistitem: lz/textlistitem.lzx
-basefloatinglist: lz/basefloatinglist.lzx
-floatinglist: lz/floatinglist.lzx
-plainfloatinglist: lz/plainfloatinglist.lzx
-windowpanel: lz/windowpanel.lzx
-tabslider: lz/tabslider.lzx
-tabelement: lz/tabelement.lzx
-tree: lz/tree.lzx
-grid: lz/grid.lzx
-datepicker: lz/datepicker.lzx
+checkbox: /lz/checkbox.lzx
+button: /lz/button.lzx
+combobox: /lz/combobox.lzx
+datacombobox: /lz/datacombobox.lzx
+menu: /lz/menu.lzx
+menubar: /lz/menu.lzx
+menuitem: /lz/menu.lzx
+menuseparator: /lz/menu.lzx
+radiogroup: /lz/radio.lzx
+radiobutton: /lz/radio.lzx
+slider: /lz/slider.lzx
+slidertrack: /lz/slider.lzx
+sliderthumb: /lz/slider.lzx
+scrollbar: /lz/scrollbar.lzx
+hscrollbar: /lz/hscrollbar.lzx
+vscrollbar: /lz/vscrollbar.lzx
+window: /lz/window.lzx
+modaldialog: /lz/window.lzx
+alert: /lz/window.lzx
+edittext: /lz/edittext.lzx
+simpleinputtext: /lz/simpletext.lzx
+form: /lz/form.lzx
+tabs: /lz/tabs.lzx
+tabpane: /lz/tabs.lzx
+tabbar: /lz/tabs.lzx
+list: /lz/list.lzx
+listitem: /lz/listitem.lzx
+textlistitem: /lz/textlistitem.lzx
+basefloatinglist: /lz/basefloatinglist.lzx
+floatinglist: /lz/floatinglist.lzx
+plainfloatinglist: /lz/plainfloatinglist.lzx
+windowpanel: /lz/windowpanel.lzx
+tabslider: /lz/tabslider.lzx
+tabelement: /lz/tabelement.lzx
+tree: /lz/tree.lzx
+grid: /lz/grid.lzx
+datepicker: /lz/datepicker.lzx
-whitestyle: base/defaultstyles.lzx
-silverstyle: base/defaultstyles.lzx
-bluestyle: base/defaultstyles.lzx
-greenstyle: base/defaultstyles.lzx
-goldstyle: base/defaultstyles.lzx
-purplestyle: base/defaultstyles.lzx
+whitestyle: /base/defaultstyles.lzx
+silverstyle: /base/defaultstyles.lzx
+bluestyle: /base/defaultstyles.lzx
+greenstyle: /base/defaultstyles.lzx
+goldstyle: /base/defaultstyles.lzx
+purplestyle: /base/defaultstyles.lzx
-javarpc: rpc/javarpc.lzx
-sessionrpc: rpc/sessionrpc.lzx
-webapprpc: rpc/webapprpc.lzx
-soap: rpc/soap.lzx
-xmlrpc: rpc/xmlrpc.lzx
+javarpc: /rpc/javarpc.lzx
+sessionrpc: /rpc/sessionrpc.lzx
+webapprpc: /rpc/webapprpc.lzx
+soap: /rpc/soap.lzx
+xmlrpc: /rpc/xmlrpc.lzx
-richinputtext: extensions/views/richinputtext.lzx
+richinputtext: /extensions/views/richinputtext.lzx
-html: extensions/html.lzx
-drawview: extensions/drawview.lzx
+html: /extensions/html.lzx
+drawview: /extensions/drawview.lzx
-rtmpconnection: extensions/av/rtmpconnection.lzx
-mediastream: extensions/av/mediastream.lzx
-mediadevice: extensions/av/mediadevice.lzx
-camera: extensions/av/camera.lzx
-microphone: extensions/av/microphone.lzx
-videoview: extensions/av/videoview.lzx
+rtmpconnection: /extensions/av/rtmpconnection.lzx
+mediastream: /extensions/av/mediastream.lzx
+mediadevice: /extensions/av/mediadevice.lzx
+camera: /extensions/av/camera.lzx
+microphone: /extensions/av/microphone.lzx
+videoview: /extensions/av/videoview.lzx
-rtmpstatus: av/rtmpstatus.lzx
+rtmpstatus: /av/rtmpstatus.lzx
-hbox: base/hbox.lzx
-vbox: base/vbox.lzx
-image: base/image.lzx
+hbox: /base/hbox.lzx
+vbox: /base/vbox.lzx
+image: /base/image.lzx
-barchart: charts/barchart/barchart.lzx
-columnchart: charts/columnchart/columnchart.lzx
-linechart: charts/linechart/linechart.lzx
-piechart: charts/piechart/piechart.lzx
+barchart: /charts/barchart/barchart.lzx
+columnchart: /charts/columnchart/columnchart.lzx
+linechart: /charts/linechart/linechart.lzx
+piechart: /charts/piechart/piechart.lzx
-lazyreplicator: utils/replicator/lazyreplicator.lzx
-replicator: utils/replicator/replicator.lzx
+lazyreplicator: /utils/replicator/lazyreplicator.lzx
+replicator: /utils/replicator/replicator.lzx
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/schema/lfc.lzx
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/schema/lfc.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/schema/lfc.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -25,12 +25,7 @@
<method name="isPrototypeOf" override="false"/>
<method name="toLocaleString" override="false"/>
<method name="prototype" override="false"/>
- <!--
- 'apply' is ambiguous because <state> is
- using it for both a method and an attribute. Just omit it from
- the declarations for now.
<method name="apply" override="false"/>
- -->
<method name="call" override="false"/>
</interface>
@@ -244,13 +239,13 @@
</containsElements>
</interface>
-<interface name="class" extends="view">
+<interface name="class" extends="node">
<attribute name="extends" type="token" value="view"/>
<!-- The comma-separated list of mixins, applied in order -->
<attribute name="with" type="string"/>
</interface>
-<interface name="interface" extends="view">
+<interface name="interface" extends="node">
<attribute name="extends" type="token" value="view"/>
<!-- The comma-separated list of mixins, applied in order -->
<attribute name="with" type="string"/>
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/FileResolver.java 2007-11-12 06:22:45 UTC (rev 7213)
@@ -148,6 +148,7 @@
if (pathname.startsWith("/")) {
// Try absolute
v.add("");
+ v.add(LPS.getComponentsDirectory());
}
v.add(base);
if (SWFtoPNG) {
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java 2007-11-12 06:22:45 UTC (rev 7213)
@@ -911,13 +911,16 @@
for (Iterator iter = element.getChildren().iterator(); iter.hasNext(); ) {
ElementWithLocationInfo child = (ElementWithLocationInfo) iter.next();
if (!schema.canContainElement(element.getName(), child.getName())) {
- env.warn(
- // TODO [2007-09-26 hqm] i18n this
- "The tag '" + child.getName() +
- "' cannot be used as a child of " + element.getName(),
- element);
+ // If this element is allowed to contain HTML content, then
+ // we don't want to warn about encountering an HTML child element.
+ if (!( schema.hasTextContent(element) && schema.isHTMLElement(child))) {
+ env.warn(
+ // TODO [2007-09-26 hqm] i18n this
+ "The tag '" + child.getName() +
+ "' cannot be used as a child of " + element.getName(),
+ element);
+ }
}
-
try {
if (child.getName().equals("data")) {
checkChildNameConflict(element.getName(), child, env);
@@ -1524,6 +1527,9 @@
Schema.Type type = null;
Schema.Type parenttype = null;
+ AttributeSpec parentAttrSpec = schema.getAttributeSpec(parent.getName(), name);
+ boolean forceOverride = parentAttrSpec != null && "true".equals(parentAttrSpec.override);
+
try {
if (parent.getName().equals("class")) {
parenttype = getAttributeTypeInfoFromSuperclass(parent, name);
@@ -1559,9 +1565,10 @@
NodeModel.class.getName(),"051018-1211", new Object[] {typestr})
, element);
}
+
// If we are trying to declare the attribute with a
// conflicting type to the parent, throw an error
- if (parenttype != null && type != parenttype) {
+ if (!forceOverride && parenttype != null && type != parenttype) {
env.warn(
new CompilationError(
element,
@@ -1578,11 +1585,14 @@
}
}
+
+
// Warn if we are overidding a method, handler, or other function
- if (parenttype == schema.METHOD_TYPE ||
- parenttype == schema.EVENT_HANDLER_TYPE ||
- parenttype == schema.SETTER_TYPE ||
- parenttype == schema.REFERENCE_TYPE) {
+ if (!forceOverride &&
+ (parenttype == schema.METHOD_TYPE ||
+ parenttype == schema.EVENT_HANDLER_TYPE ||
+ parenttype == schema.SETTER_TYPE ||
+ parenttype == schema.REFERENCE_TYPE)) {
env.warn( "In element '" + parent.getName()
+ "' attribute '" + name
+ "' is overriding parent class attribute which has the same name but type: "
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewSchema.java
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewSchema.java 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/server/src/org/openlaszlo/compiler/ViewSchema.java 2007-11-12 06:22:45 UTC (rev 7213)
@@ -396,7 +396,14 @@
// Check that the overriding type is the same as the superclass' type
parentType = getAttributeType(classname, attr.name);
- if (parentType != attr.type) {
+ // Does the parent attribute definition assert override=true?
+ // If so, we're not going to warn if the types mismatch.
+ AttributeSpec parentAttrSpec = getAttributeSpec(classname, attr.name);
+ boolean forceOverride = parentAttrSpec != null && "true".equals(parentAttrSpec.override);
+
+ if (!forceOverride && (parentType != attr.type)) {
+ // get the parent attribute, so we can see if it says override is allowed
+
env.warn(/* (non-Javadoc)
* @i18n.test
* @org-mes="In class '" + p[0] + "' attribute '" + p[1] + "' with type '" + p[2] + "' is overriding superclass attribute with same name but different type: " + p[3]
@@ -503,7 +510,30 @@
}
+
/**
+ * Finds the AttributeSpec definition of an attribute, on a class
+ * or by searching up it's parent class chain.
+ *
+ * @param elt an Element name
+ * @param attrName an attribute name
+ * @return the AttributeSpec or null
+ */
+ public AttributeSpec getAttributeSpec(String elt, String attrName)
+ {
+ String elementName = elt.intern();
+
+ // Look up attribute in type map for this element
+ ClassModel classModel = getClassModel(elementName);
+
+ if (classModel != null) {
+ return classModel.getAttribute(attrName);
+ } else {
+ return null;
+ }
+ }
+
+ /**
* checks whether a method with a given method is allowed to be overridden
* @param elt an Element name
* @param methodName a method name
Modified: openlaszlo/branches/paperpie/WEB-INF/lps/templates/app-console.xslt
===================================================================
--- openlaszlo/branches/paperpie/WEB-INF/lps/templates/app-console.xslt 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/WEB-INF/lps/templates/app-console.xslt 2007-11-12 06:22:45 UTC (rev 7213)
@@ -149,6 +149,7 @@
<input id="LaszloDebuggerInput" type="text" />
<input type="button" value="eval" onclick="$modules.lz.Debug.doEval(document.getElementById('LaszloDebuggerInput').value); return false"/>
<input type="button" value="clear" onclick="$modules.lz.Debug.clear(); return false"/>
+ <input type="button" value="bug report" onclick="$modules.lz.Debug.bugReport(); return false"/>
</div>
</form>
</div>
Modified: openlaszlo/branches/paperpie/build.xml
===================================================================
--- openlaszlo/branches/paperpie/build.xml 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/build.xml 2007-11-12 06:22:45 UTC (rev 7213)
@@ -530,6 +530,7 @@
<copy todir="tools" file="${webapp-lps-home}/schema/lzx.rng" />
<copy todir="tools" file="${webapp-lps-home}/schema/lzx.xsd" />
+ <echo message="benbenben: yo! in main build file target is build, gonna call server/ target build." />
<ant dir="${webapp-lps-home}/server" target="build" />
<copy todir="${LPS_HOME}/WEB-INF/lib" file="${webapp-lps-home}/server/lib/${lps.jar}" />
<ant target="build-classes" />
@@ -592,11 +593,11 @@
<!--================ Target [doc] ==============-->
<target name="doc"
description="Build documentation"
- depends="init" unless="skip.doc">
+ depends="init" unless="doc.build.done">
<!-- Build the docs -->
<ant dir="docs/src" />
-
+ <property name="doc.build.done" value="true" />
</target>
<!--================ Target [test] ==============-->
Copied: openlaszlo/branches/paperpie/docs/src/developers/building-data-driven-apps.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/building-data-driven-apps.dbk)
Copied: openlaszlo/branches/paperpie/docs/src/developers/data-overview.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/data-overview.dbk)
Copied: openlaszlo/branches/paperpie/docs/src/developers/data-patterns-and-best-practices.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/data-patterns-and-best-practices.dbk)
Copied: openlaszlo/branches/paperpie/docs/src/developers/data-replication.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/data-replication.dbk)
Modified: openlaszlo/branches/paperpie/docs/src/developers/data-structures.dbk
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/data-structures.dbk 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/data-structures.dbk 2007-11-12 06:22:45 UTC (rev 7213)
@@ -3,7 +3,88 @@
<title>Data, XML, and XPath</title>
<!-- change link for language-preliminaries per LPP-4923, IORIO 17 oct 2007 -->
+<title>Introduction to Data and Data-Driven Applications</title>
<para>
+Summary: In this chapter we introduce key concepts at a high level. There is little code, but a fair amount of diagramware to illustrate databinding and replication.
+</para>
+<para>
+ Databinding marries the content of an XML datastructure with the OpenLaszlo objects (such as nodes, or views).
+
+ Allows separation of content from presentation
+ Datapaths are objects that connect views to data.
+ Attribute values update automatically when the data changes.
+</para>
+<para>
+We give a conceptual overview of the logical differences between the DOM-based and datapointer/datapath-based ways of manipulating data, with a preview of how these approaches will be reconciled in later chapters.
+</para>
+<para>
+Datareplication is introduced, and the difference between implicit and explicit replication.
+</para>
+<para>
+We then explain some useful design patterns involving datasets, both locally on the client, and between client and server.
+</para>
+<para>
+Finally, we introduce the abstract concept of the dataprovider.
+</para>
+<para>
+Outline:
+
+Data
+-- XML
+<ul>
+ <li>Definition and specification</li>
+ <li>White space</li>
+ <li>Character sets</li>
+ <li>Namespaces</li>
+</ul>
+
+-- Xpath
+------Notation
+------Supported subset in LZX
+Databinding -- conceptual overview
+-- Datasets - in-memory representation of XML data
+----- The LzDataNode type
+----- The LzDataElement type
+----- The LzDataText type
+-- Updating views by data (data determines behaviour of LZX object)
+-- Updating data by object (object updates dataset)
+Databinding APIs
+-- Datapointer (tag) APIs
+-- DOM (prodedural) APIs
+Replication
+-- Explicit Replication with <replicator> tag
+---Implicit replication without <replicator> tag
+Client-Server Data patterns
+--- REST and HTTP
+----- Query types
+----- Request and response headers
+----- Query Paremeters
+--- Ajax and the HttpRequest() object
+----- This is "syntactic sugar"; same functionality as with datasets
+--- Master-Detail
+-- Reconciling Server and Client data models (updating databases on server)
+The dataprovider object
+</para>
+<para>
+ Any subclass of LzNode can be data-bound.
+ All data-bound objects have a datapath.
+ The XPath may be absolute or relative.
+ <view datapath="ds:/path/to/data/text()" />
+ Individual attributes of nodes can be data-bound.
+ Attributes must be settable.
+ The object must have a datapath.
+ You must use relative XPaths for the attribute bindings.
+ Multiple attributes of the same object can be databound to different locations.
+ <view datapath="ds:/path/to/data"
+ x="$path{'@xposition'}" />
+ Datapaths cascade through the view hierarchy
+<view datapath="ds:/path/to/data">
+ <view name="unboundView">
+ <text datapath="text()" />
+ </view>
+</view>
+</para>
+<para>
The term <indexterm significance="preferred"><primary>data</primary></indexterm><glossterm>data</glossterm> refers to numbers, characters, or text
in a form that can be displayed or manipulated by
a Laszlo application. The specific form that data takes in a Laszlo application
@@ -263,4 +344,4 @@
-<para/></section></section></chapter>
\ No newline at end of file
+<para/></section></section></chapter>
Copied: openlaszlo/branches/paperpie/docs/src/developers/dataprovider.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/dataprovider.dbk)
Copied: openlaszlo/branches/paperpie/docs/src/developers/dynamic-databinding.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/dynamic-databinding.dbk)
Modified: openlaszlo/branches/paperpie/docs/src/developers/index.dbk
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/index.dbk 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/index.dbk 2007-11-12 06:22:45 UTC (rev 7213)
@@ -76,6 +76,12 @@
<xi:include href="data-structures.dbk"/>
<xi:include href="databinding.dbk"/>
<xi:include href="tutorials/data_app.dbk"/>
+ <xi:include href="static-databinding.dbk"/>
+ <xi:include href="dynamic-databinding.dbk"/>
+ <xi:include href="two-way-databinding.dbk"/>
+ <xi:include href="data-replication.dbk"/>
+ <xi:include href="data-patterns-and-best-practices.dbk"/>
+ <xi:include href="dataprovider.dbk"/>
</part>
<part id="developers.media">
Copied: openlaszlo/branches/paperpie/docs/src/developers/patterns-and-best-practices.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/patterns-and-best-practices.dbk)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/currenttime.jsp (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/currenttime.jsp)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data-accessing-lzdataelement.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data-accessing-lzdataelement.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data-attributepathbinding.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data-attributepathbinding.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data-buffer_dataset.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data-buffer_dataset.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data-concatenatingattributes.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data-concatenatingattributes.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data-prettyprinter.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data-prettyprinter.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data-setattribute_p.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data-setattribute_p.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data-xpathstring.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data-xpathstring.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/data_polling.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/data_polling.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/datapointer-basics.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/datapointer-basics.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/datapointer-creating-node.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/datapointer-creating-node.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/datapointermove.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/datapointermove.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/incremental_loading.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/incremental_loading.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/lib (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/lib)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/lib/contact.lzx
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/lib/contact.lzx (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/lib/contact.lzx)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/shareddata)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/README.html
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/README.html (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/shareddata/README.html)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_full.xml
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_full.xml (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/shareddata/contacts_full.xml)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_large.xml
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/shareddata/contacts_large.xml (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/shareddata/contacts_large.xml)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/README.html
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/README.html (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/README.html)
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_alfred.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_alfred.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_alfred.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_beck.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_beck.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_beck.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_calder.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_calder.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_calder.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_carey.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_carey.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_carey.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_dan.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_dan.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_dan.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_daniele.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_daniele.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_daniele.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_gretchen.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_gretchen.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_gretchen.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_karen.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_karen.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_karen.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_laura.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_laura.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_laura.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_lisa.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_lisa.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_lisa.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_mark.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_mark.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_mark.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_nicole.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_nicole.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_nicole.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_peter.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_peter.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_peter.jpg)
Deleted: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_todd.jpg
Copied: openlaszlo/branches/paperpie/docs/src/developers/programs/sharedresources/headshots/pic_todd.jpg (from rev 7210, openlaszlo/trunk/docs/src/developers/programs/sharedresources/headshots/pic_todd.jpg)
Modified: openlaszlo/branches/paperpie/docs/src/developers/proxied.dbk
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/proxied.dbk 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/proxied.dbk 2007-11-12 06:22:45 UTC (rev 7213)
@@ -471,86 +471,86 @@
<para/></section></section></section><section><title>Examples</title>
<para>Here are examples of applications that do not require the OpenLaszlo server at run time:</para>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<canvas proxied="false">
<datasource name="ds" src="http:data.xml" request="true"/>
<text datapath="ds:/root/text()"/>
</canvas>
-</programlisting></example>
+</programlisting>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<canvas proxied="false">
<include href="lib-ds-unproxied.lzx"/>
</canvas>
-</programlisting></example>
+</programlisting>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<canvas proxied="false">
<include href="lib-ds-default.lzx"/>
</canvas>
-</programlisting></example>
+</programlisting>
<para>
with these support files:
</para>
<programlisting>
lib-ds-proxied.lzx:
</programlisting>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<library proxied="true">
<datasource name="ds" src="http:data.xml" request="true"/>
<text datapath="ds:/root/text()"/>
</library>
-</programlisting></example>
+</programlisting>
<programlisting>
lib-ds-unproxied.lzx:
</programlisting>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<library proxied="false">
<datasource name="ds" src="http:data.xml" request="true"/>
<text datapath="ds:/root/text()"/>
</library>
-</programlisting></example>
+</programlisting>
<programlisting>
lib-ds-default.lzx:
</programlisting>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<library proxied="default">
<datasource name="ds" src="http:data.xml" request="true"/>
<text datapath="ds:/root/text()"/>
</library>
-</programlisting></example>
+</programlisting>
<para/><section><title>Examples of Proxied applications</title>
<para>
These programs create applications that use the OpenLaszlo Server to proxy the dataset request:
</para>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<canvas proxied="true">
<datasource name="ds" src="http:data.xml" request="true"/>
<text datapath="ds:/root/text()"/>
</canvas>
-</programlisting></example>
-<example role="live-example"><title/><programlisting>
+</programlisting>
+<programlisting>
<canvas proxied="true">
<include href="lib-ds-proxied.lzx"/>
</canvas>
-</programlisting></example>
-<example role="live-example"><title/><programlisting>
+</programlisting>
+<programlisting>
<canvas proxied="true">
<include href="lib-ds-default.lzx"/>
</canvas>
-</programlisting></example>
+</programlisting>
<para>
Compiler errors are returned for these cases:
</para>
<para>
A proxied canvas that includes an unproxied library:
</para>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<canvas proxied="true">
<!--Error:proxied canvas that includes an unproxied library:-->
<include href="lib-ds-unproxied.lzx"/>
</canvas>
-</programlisting></example>
+</programlisting>
<para>
A unproxied canvas that includes a proxied library:
</para>
@@ -567,16 +567,16 @@
<para>
These programs make media requests through the server:
</para>
-<example role="live-example"><title/><programlisting>
+<programlisting>
<canvas proxied="true">
<view src="http:logo.jpg"/>
</canvas>
-</programlisting></example>
-<example role="live-example"><title/><programlisting>
+</programlisting>
+<programlisting>
<canvas proxied="inherit">
<view src="http:logo.jpg"/>
</canvas>
-</programlisting></example>
+</programlisting>
<para>This example shows a data request that is mediated by the OpenLaszlo Server:</para>
<example role="live-example"><title>Proxied</title><programlisting>
<canvas>
Copied: openlaszlo/branches/paperpie/docs/src/developers/static-databinding.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/static-databinding.dbk)
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/art_assets-$8.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/art_assets-$8.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/art_assets-$8.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -4,9 +4,8 @@
<frame src="resources/sourface.png"/>
<frame src="resources/smiley.gif"/>
</resource>
-
<view x="150" y="50" resource="face"
- onclick="this.setResourceNumber(2);"/>
+ onclick="this.setAttribute('frame', 2);"/>
</canvas>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
* Copyright 2007 Laszlo Systems, Inc. All Rights Reserved. *
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$10.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$10.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$10.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -22,7 +22,7 @@
<method name="initButton">
this.buttonText.setAttribute('x',
this.getAttribute('labelX'));
- this.buttonText.setText(this.getAttribute('buttLabel'));
+ this.buttonText.setAttribute('text', this.getAttribute('buttLabel'));
</method>
<text name="buttonText" font="obliqueText" fontsize="25"
@@ -65,7 +65,7 @@
this.oldValue = false;
this.allOperators = new Array('+', '-', '/', '*');
this.operator = '+';
- this.screen.setText(this.valueX.toString());
+ this.screen.setAttribute('text', this.valueX.toString());
</method>
<method name="clear">
@@ -106,12 +106,12 @@
if ((this.lastInput == 'none')
|| (this.lastInput == 'operator')) {
// clear display and rewrite
- this.screen.setText(val);
+ this.screen.setAttribute('text', val);
} else if (this.lastInput == 'digit') {
- this.screen.setText(displ + val);
+ this.screen.setAttribute('text', displ + val);
} else if (this.lastInput == 'equals') {
this.clear();
- this.screen.setText(val);
+ this.screen.setAttribute('text', val);
}
this.lastInput = 'digit';
]]>
@@ -152,7 +152,7 @@
val = this.valueX / valFromDisp;
}
valFromDisp = val;
- this.screen.setText(valFromDisp.toString());
+ this.screen.setAttribute('text', valFromDisp.toString());
this.valueX = this.screen.getText();
</method>
@@ -173,17 +173,17 @@
if ((this.lastInput == 'none')
|| (this.lastInput == 'operator')) {
if (!this.isThereDecimal()) {
- this.screen.setText("0.");
+ this.screen.setAttribute('text', "0.");
}
} else if (this.lastInput == 'digit') {
if (!this.isThereDecimal()) {
var newText = this.screen.getText();
newText += ".";
- this.screen.setText(newText);
+ this.screen.setAttribute('text', newText);
}
} else if (this.lastInput == 'equals') {
this.clear();
- this.screen.setText('0.');
+ this.screen.setAttribute('text', '0.');
}
this.lastInput = 'digit';
</method>
@@ -192,7 +192,7 @@
if ((this.lastInput == 'digit') ||
(this.lastInput == 'equals')) {
var newDisp = (this.screen.getText() - 0) * -1;
- this.screen.setText(newDisp.toString());
+ this.screen.setAttribute('text', newDisp.toString());
} else {
clear();
}
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$11.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$11.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$11.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -36,7 +36,7 @@
<method name="initButton">
this.buttonText.setAttribute('x',
this.getAttribute('labelX'));
- this.buttonText.setText(this.getAttribute('buttLabel'));
+ this.buttonText.setAttribute('text', this.getAttribute('buttLabel'));
</method>
<text name="buttonText" font="obliqueText" fontsize="25"
@@ -81,7 +81,7 @@
this.oldValue = false;
this.allOperators = new Array('+', '-', '/', '*');
this.operator = '+';
- this.screen.setText(this.valueX.toString());
+ this.screen.setAttribute('text', this.valueX.toString());
</method>
<method name="clear">
@@ -120,12 +120,12 @@
if ((this.lastInput == 'none')
|| (this.lastInput == 'operator')) {
// clear display and rewrite
- this.screen.setText(val);
+ this.screen.setAttribute('text', val);
} else if (this.lastInput == 'digit') {
- this.screen.setText(displ + val);
+ this.screen.setAttribute('text', displ + val);
} else if (this.lastInput == 'equals') {
this.clear();
- this.screen.setText(val);
+ this.screen.setAttribute('text', val);
}
this.lastInput = 'digit';
]]>
@@ -163,7 +163,7 @@
val = this.valueX / valFromDisp;
}
valFromDisp = val;
- this.screen.setText(valFromDisp.toString());
+ this.screen.setAttribute('text', valFromDisp.toString());
this.valueX = this.screen.getText();
</method>
<method name="isThereDecimal">
@@ -182,17 +182,17 @@
if ((this.lastInput == 'none')
|| (this.lastInput == 'operator')) {
if (!this.isThereDecimal()) {
- this.screen.setText("0.");
+ this.screen.setAttribute('text', "0.");
}
} else if (this.lastInput == 'digit') {
if (!this.isThereDecimal()) {
var newText = this.screen.getText();
newText += ".";
- this.screen.setText(newText);
+ this.screen.setAttribute('text', newText);
}
} else if (this.lastInput == 'equals') {
this.clear();
- this.screen.setText('0.');
+ this.screen.setAttribute('text', '0.');
}
this.lastInput = 'digit';
</method>
@@ -200,7 +200,7 @@
if ((this.lastInput == 'digit') ||
(this.lastInput == 'equals')) {
var newDisp = (this.screen.getText() - 0) * -1;
- this.screen.setText(newDisp.toString());
+ this.screen.setAttribute('text', newDisp.toString());
} else {
clear();
}
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$7.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$7.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$7.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -45,7 +45,7 @@
this.oldValue = false;
this.allOperators = new Array( '+', '-', '/', '*' );
this.operator = '+';
- this.screen.setText( this.valueX.toString() );
+ this.screen.setAttribute('text', this.valueX.toString() );
</method>
<method name="clear">
@@ -80,12 +80,12 @@
if ( ( this.lastInput == 'none' )
|| ( this.lastInput == 'operator' ) ) {
// clear display and rewrite
- this.screen.setText( val );
+ this.screen.setAttribute('text', val );
} else if ( this.lastInput == 'digit' ) {
- this.screen.setText( displ + val );
+ this.screen.setAttribute('text', displ + val );
} else if ( this.lastInput == 'equals' ) {
this.clear();
- this.screen.setText( val );
+ this.screen.setAttribute('text', val );
}
this.lastInput = 'digit';
]]>
@@ -122,7 +122,7 @@
val = this.valueX / valFromDisp;
}
valFromDisp = val;
- this.screen.setText( valFromDisp.toString() );
+ this.screen.setAttribute('text', valFromDisp.toString() );
this.valueX = this.screen.getText();
</method>
<method name="isThereDecimal">
@@ -142,17 +142,17 @@
if ( ( this.lastInput == 'none' )
|| ( this.lastInput == 'operator' ) ) {
if ( !this.isThereDecimal() ) {
- this.screen.setText( "0." );
+ this.screen.setAttribute('text', "0." );
}
} else if ( this.lastInput == 'digit' ) {
if ( !this.isThereDecimal() ) {
var newText = this.screen.getText();
newText += ".";
- this.screen.setText( newText );
+ this.screen.setAttribute('text', newText );
}
} else if ( this.lastInput == 'equals' ) {
this.clear();
- this.screen.setText( '0.' );
+ this.screen.setAttribute('text', '0.' );
}
this.lastInput = 'digit';
</method>
@@ -161,7 +161,7 @@
if ( ( this.lastInput == 'digit' ) ||
( this.lastInput == 'equals' ) ) {
var newDisp = ( this.screen.getText() - 0 ) * -1;
- this.screen.setText( newDisp.toString() );
+ this.screen.setAttribute('text', newDisp.toString() );
} else {
clear();
}
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$9.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$9.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator-$9.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -18,7 +18,7 @@
<method name="initButton">
this.buttonText.setAttribute('x',
this.getAttribute('labelX'));
- this.buttonText.setText(this.getAttribute('buttLabel'));
+ this.buttonText.setAttribute('text', this.getAttribute('buttLabel'));
</method>
<text name="buttonText" font="obliqueText" fontsize="25"
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_button.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_button.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_button.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -25,7 +25,7 @@
<method name="initButton">
this.buttonText.setAttribute( 'x',
this.getAttribute( 'labelX' ) );
- this.buttonText.setText( this.getAttribute( 'buttLabel' ) );
+ this.buttonText.setAttribute('text', this.getAttribute( 'buttLabel' ) );
</method>
<text name="buttonText" font="obliqueText" fontsize="25"
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_display.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_display.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/calculator_display.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -17,7 +17,7 @@
this.oldValue = false;
this.allOperators = new array( '+', '-', '/', '*' );
this.operator = '+';
- this.screen.setText( this.valueX.toString() );
+ this.screen.setAttribute('text', this.valueX.toString() );
</method>
<method name="clear">
@@ -56,12 +56,12 @@
if ( ( this.lastInput == 'none' )
|| ( this.lastInput == 'operator' ) ) {
// clear display and rewrite
- this.screen.setText( val );
+ this.screen.setAttribute('text', val );
} else if ( this.lastInput == 'digit' ) {
- this.screen.setText( displ + val );
+ this.screen.setAttribute('text', displ + val );
} else if ( this.lastInput == 'equals' ) {
this.clear();
- this.screen.setText( val );
+ this.screen.setAttribute('text', val );
}
this.lastInput = 'digit';
]]>
@@ -102,7 +102,7 @@
val = this.valueX / valFromDisp;
}
valFromDisp = val;
- this.screen.setText( valFromDisp.toString() );
+ this.screen.setAttribute('text', valFromDisp.toString() );
this.valueX = this.screen.getText();
</method>
@@ -123,17 +123,17 @@
if ( ( this.lastInput == 'none' )
|| ( this.lastInput == 'operator' ) ) {
if ( !this.isThereDecimal() ) {
- this.screen.setText( "0." );
+ this.screen.setAttribute('text', "0." );
}
} else if ( this.lastInput == 'digit' ) {
if ( !this.isThereDecimal() ) {
var newText = this.screen.getText();
newText += ".";
- this.screen.setText( newText );
+ this.screen.setAttribute('text', newText );
}
} else if ( this.lastInput == 'equals' ) {
this.clear();
- this.screen.setText( '0.' );
+ this.screen.setAttribute('text', '0.' );
}
this.lastInput = 'digit';
</method>
@@ -143,7 +143,7 @@
if ( ( this.lastInput == 'digit' ) ||
( this.lastInput == 'equals' ) ) {
var newDisp = ( this.screen.getText() - 0 ) * -1;
- this.screen.setText( newDisp.toString() );
+ this.screen.setAttribute('text', newDisp.toString() );
} else {
clear();
}
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/classes-tutorial-$5.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/classes-tutorial-$5.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/classes-tutorial-$5.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -17,10 +17,10 @@
Debug.write('Dog');
</method>
<method name="doOver">
- this.setResourceNumber(2);
+ this.setAttribute('frame', 2);
</method>
<method name="doOut">
- this.setResourceNumber(1);
+ this.setAttribute('frame', 1);
</method>
</class>
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$5.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$5.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$5.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -6,7 +6,7 @@
<simplelayout axis="y"/>
<!-- 1 -->
<view name="list"
- onclick="parent.updateContact.setVisible(!parent.updateContact.visible);">
+ onclick="parent.updateContact.setAttribute('visible', !parent.updateContact.visible);">
<simplelayout axis="x"/>
<text datapath="@firstName"/>
<text datapath="@lastName"/>
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$6.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$6.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$6.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -5,7 +5,7 @@
<view>
<simplelayout axis="y"/>
<!-- 1 -->
- <text onclick="parent.newContact.setVisible(!parent.newContact.visible);">New Entry...</text>
+ <text onclick="parent.newContact.setAttribute('visible', !parent.newContact.visible);">New Entry...</text>
<!-- 2 -->
<view name="newContact" datapath="new:/contact"
visible="false" x="20" height="120">
@@ -28,7 +28,7 @@
<view datapath="dset:/phonebook/contact">
<simplelayout axis="y"/>
<view name="list"
- onclick="parent.updateContact.setVisible(!parent.updateContact.visible);">
+ onclick="parent.updateContact.setAttribute('visible', !parent.updateContact.visible);">
<simplelayout axis="x"/>
<text datapath="@firstName"/>
<text datapath="@lastName"/>
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$8.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$8.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$8.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -5,7 +5,7 @@
<view>
<simplelayout axis="y"/>
<!-- 1 -->
- <text onclick="parent.newContact.setVisible(!parent.newContact.visible);">New Entry...</text>
+ <text onclick="parent.newContact.setAttribute('visible', !parent.newContact.visible);">New Entry...</text>
<!-- 2 -->
<view name="newContact" datapath="new:/contact"
visible="false" x="20" height="120">
@@ -23,7 +23,7 @@
var dp=canvas.datasets.dset.getPointer();
dp.selectChild();
dp.addNodeFromPointer(parent.datapath);
- parent.setDatapath("new:/contact");
+ parent.setAttribute('datapath', "new:/contact");
</handler>
</button>
</view>
@@ -32,7 +32,7 @@
<view datapath="dset:/phonebook/contact">
<simplelayout axis="y"/>
<view name="list"
- onclick="parent.updateContact.setVisible(!parent.updateContact.visible);">
+ onclick="parent.updateContact.setAttribute('visible', !parent.updateContact.visible);">
<simplelayout axis="x"/>
<text datapath="@firstName"/>
<text datapath="@lastName"/>
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$9.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$9.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/data_app-$9.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -14,7 +14,7 @@
<simplelayout axis="y"/>
<view>
<simplelayout axis="y"/>
- <text onclick="parent.newContact.setVisible(!parent.newContact.visible);">New Entry...</text>
+ <text onclick="parent.newContact.setAttribute('visible', !parent.newContact.visible);">New Entry...</text>
<contactview name="newContact" datapath="new:/contact">
<button width="80" x="200" y="10">Add
<handler name="onclick">
@@ -22,15 +22,15 @@
var dp=canvas.datasets.dset.getPointer();
dp.selectChild();
dp.addNodeFromPointer( parent.datapath );
- parent.setVisible(false);
- parent.setDatapath("new:/contact");
+ parent.setAttribute('visible', false);
+ parent.setAttribute('datapath', "new:/contact");
</handler>
</button>
</contactview>
</view>
<view datapath="dset:/phonebook/contact">
<simplelayout axis="y"/>
- <view name="list" onclick="parent.updateContact.setVisible(!parent.updateContact.visible);">
+ <view name="list" onclick="parent.updateContact.setAttribute('visible', !parent.updateContact.visible);">
<simplelayout axis="x"/>
<text datapath="@firstName"/>
<text datapath="@lastName"/>
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/resources/phonebook.xml
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/resources/phonebook.xml 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/resources/phonebook.xml 2007-11-12 06:22:45 UTC (rev 7213)
@@ -2,9 +2,9 @@
* Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
-<contacts>
+<phonebook>
<contact firstName="John" lastName="Smith" phone="617-555-7855" email="jsmith at mail.com"/>
<contact firstName="Karl" lastName="Oberschnautzer" phone="111-555-9713" email="kobe at mail.com"/>
<contact firstName="Lisa" lastName="Jones" phone="415-555-8743" email="ljones at mail.com"/>
<contact firstName="Mary" lastName="Brown" phone="212-555-5211" email="mbrown at mail.com"/>
-</contacts>
+</phonebook>
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$14.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$14.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$14.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -7,7 +7,7 @@
</button>
<button x="100" y="15"
- onclick="canvas.theField.setText('Hello, Laszlo!');">
+ onclick="canvas.theField.setAttribute('text', 'Hello, Laszlo!');">
Set Text
</button>
@@ -20,7 +20,7 @@
function addText() {
var origText = canvas.theField.getText();
var newText = origText + " And on.";
- canvas.theField.setText(newText);
+ canvas.theField.setAttribute('text', newText);
}
</script>
Modified: openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$6.lzx
===================================================================
--- openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$6.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/docs/src/developers/tutorials/programs/text-tutorial-$6.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -3,7 +3,7 @@
<include href="extensions/html.lzx"/>
<class name="browser" extends="window" resizable="true" bgcolor="silver">
<edittext name="txt" text="http://openlaszlo.org/" width="300"/>
- <button x="310" onclick="parent.htmlview.setSrc(parent.txt.getText()); parent.htmlview.setAttribute(visible, true)">
+ <button x="310" onclick="parent.htmlview.setSrc(parent.txt.getText()); parent.htmlview.setAttribute('visible', true)">
Load
</button>
<html name="htmlview"
Copied: openlaszlo/branches/paperpie/docs/src/developers/two-way-databinding.dbk (from rev 7210, openlaszlo/trunk/docs/src/developers/two-way-databinding.dbk)
Modified: openlaszlo/branches/paperpie/laszlo-explorer/coverpages/welcome/index.html
===================================================================
--- openlaszlo/branches/paperpie/laszlo-explorer/coverpages/welcome/index.html 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/laszlo-explorer/coverpages/welcome/index.html 2007-11-12 06:22:45 UTC (rev 7213)
@@ -60,7 +60,7 @@
<h3>
OpenLaszlo 4.0.5 is the recommended platform for .swf development
</h3>
-With OpenLaszlo 4.0.5, there is no longer any reason to continue application development using OpenLaszlo 3.4. Support for applications to DHTML remains at "beta" level; it will be fully supported with OL 4.1. This release has been tested by users world wide and vetted by the Laszlo Systems Quality Assurance team. Hundreds of improvements have been made since OpenLaszlo 4.0. Please see the <a href="../../../docs/release-notes.html" target="_top">release notes</a> for a detailed description of new features in this release, changes since the last major release, and known problems.
+With OpenLaszlo 4.0.5, there is no longer any reason to continue application development using OpenLaszlo 3.4. Support for DHTML applications remains at "beta" level; it will be fully supported with OL 4.1. This release has been tested by users world wide and vetted by the Laszlo Systems Quality Assurance team. Hundreds of improvements have been made since OpenLaszlo 4.0. Please see the <a href="../../../docs/release-notes.html" target="_top">release notes</a> for a detailed description of new features in this release, changes since the last major release, and known problems.
</div>
</div>
Modified: openlaszlo/branches/paperpie/lps/components/base/basedatacombobox.lzx
===================================================================
--- openlaszlo/branches/paperpie/lps/components/base/basedatacombobox.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/lps/components/base/basedatacombobox.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -132,6 +132,10 @@
@keywords private -->
<attribute name="_selectdel" value="null"/>
+ <!--- Data delegate.
+ @keywords private -->
+ <attribute name="_datacatchdel" value="null" />
+
<!--- Called when combobox opens or closes -->
<event name="onisopen"/>
@@ -140,11 +144,8 @@
super.init();
if ( this.value == null && this.defaulttext != null ) {
this._cbtext.setText(this.defaulttext);
- } else if (this.value == null && selectfirst) {
- // set first to be the initvalue
- _updateSelectionByIndex(0,false,true);
} else {
- _updateSelectionByIndex(this._selectedIndex, true);
+ this._updateSelectionOnData();
}
if ( this.statictext != null ) {
@@ -152,6 +153,52 @@
}
]]>
</method>
+
+ <!--- @keywords private -->
+ <method name="destroy" ><![CDATA[
+ if (this._datacatchdel != null) {
+ this._datacatchdel.unregisterAll();
+ }
+
+ super.destroy.apply(this, arguments);
+ ]]></method>
+
+ <!--- This catches the initial ondata, since there is no datapath
+ set for a basedatacombobox, and itemdatapath won't receive
+ an ondata event. This fixes an issue with 'p is null' on
+ an init call to an xpathQuery(), which subsequently fixes
+ an issue where selectfirst="true" wasn't working for remote
+ data.
+ @keywords private -->
+ <method name="_updateSelectionOnData" ><![CDATA[
+ var dp = new LzDatapointer(this);
+
+ var arr = dp.xpathQuery(this.itemdatapath);
+ if (arr != null) {
+ if (this._datacatchdel != null) {
+ this._datacatchdel.unregisterAll();
+ }
+
+ if (this.value == null && selectfirst) {
+ // set first to be the initvalue
+ this._updateSelectionByIndex(0,false,true);
+ } else {
+ this._updateSelectionByIndex(this._selectedIndex, true);
+ }
+ } else {
+ if (this._datacatchdel == null) {
+ var itmpath = this.itemdatapath;
+ var iof = itmpath.indexOf( ":/" );
+ if (iof > -1) {
+ var dset = dp.xpathQuery( itmpath.substring(0, iof + 2) );
+ if (dset != null) {
+ this._datacatchdel = new LzDelegate(this, "_updateSelectionOnData", dset, "ondata");
+ }
+ }
+ }
+ }
+ dp.destroy();
+ ]]></method>
<!--- @keywords private -->
<handler name="ondata"> <![CDATA[
@@ -195,9 +242,14 @@
if (! (nodes instanceof Array)) nodes = [nodes];
dp.setPointer(nodes[index]);
- var t = dp.xpathQuery(this.textdatapath);
+ var dpValid = dp.isValid();
+ if (dpValid) {
+ var t = dp.xpathQuery(this.textdatapath);
+ } else {
+ var t = null;
+ }
// if t is null, use default text (if it exists)
- if( ( t == null || t.length == 0 ) && this.defaulttext && this.defaulttext['length'] > 0 )
+ if( ( t == null || t.length == 0 ) && (this.defaulttext && this.defaulttext.length > 0) )
t = this.defaulttext;
if ( this._cbtext && (this.statictext == null) ) {
@@ -207,7 +259,11 @@
if ( this.selected && dp['p'] == this.selected['p'] ) return;
if (! (dontSetValue || this.ismenu)) {
- var v = dp.xpathQuery(this.valuedatapath);
+ if (dpValid) {
+ var v = dp.xpathQuery(this.valuedatapath);
+ } else {
+ var v = null;
+ }
this.setValue(v,true, true);
}
this.setAttribute('text', t);
@@ -268,12 +324,9 @@
cblist.setAttachTarget(this);
cblist.setAttribute('shownitems', this.shownitems);
- //local-dataset-modification by senshi
var itd = this.itemdatapath;
if (itd.indexOf( "local:" ) == 0) {
itd = "local:" + "parent.owner." + itd.substring( 6 );
- if ($debug)
- Debug.write( "local-dataset-modification:" + itd );
}
cblist.item.setDatapath(itd);
Modified: openlaszlo/branches/paperpie/lps/components/base/basegridrow.lzx
===================================================================
--- openlaszlo/branches/paperpie/lps/components/base/basegridrow.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/lps/components/base/basegridrow.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -41,8 +41,9 @@
</method>
<method name="setRegularColor" >
+ <![CDATA[
var pos = 0;
- if (this.datapath != null) {
+ if (this.datapath != null && this.datapath.isValid()) {
pos = this.datapath.xpathQuery( 'position()' );
}
var nextColor = null;
@@ -53,6 +54,7 @@
this.regularColor = nextColor;
this.updateBGColor();
}
+ ]]>
</method>
<handler name="ondata">
Modified: openlaszlo/branches/paperpie/lps/components/extensions/drawview.lzx
===================================================================
--- openlaszlo/branches/paperpie/lps/components/extensions/drawview.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/lps/components/extensions/drawview.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -268,7 +268,7 @@
var cachebitmap = true;
var _colorcache = {};
- DeclareEvent(prototype, 'oncontext');
+ var oncontext = LzDeclaredEvent;
function construct(parent,args) {
super.construct(parent, args);
@@ -561,7 +561,7 @@
var __LINETO_OP = 1;
var __QCURVE_OP = 2;
- DeclareEvent(prototype, 'oncontext');
+ var oncontext = LzDeclaredEvent;
function construct(parent,args) {
args['width'] = args['width'] > -1 ? args.width : null;
Modified: openlaszlo/branches/paperpie/lps/components/utils/replicator/replicator.lzx
===================================================================
--- openlaszlo/branches/paperpie/lps/components/utils/replicator/replicator.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/lps/components/utils/replicator/replicator.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -171,7 +171,7 @@
}
}
- DeclareEvent(prototype, 'onnodes');
+ var onnodes = LzDeclaredEvent;
/**
* @access private
Modified: openlaszlo/branches/paperpie/lps/components/utils/traits/cssable.lzx
===================================================================
--- openlaszlo/branches/paperpie/lps/components/utils/traits/cssable.lzx 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/lps/components/utils/traits/cssable.lzx 2007-11-12 06:22:45 UTC (rev 7213)
@@ -7,9 +7,9 @@
function initialize () {
if (this['_applyCSS']) this._applyCSS();
}
-DeclareEvent(prototype, 'cssPropertyMap' );
-DeclareEvent(prototype, 'cssStyle' );
-DeclareEvent(prototype, 'fontcolor' );
+var cssPropertyMap = LzDeclaredEvent;
+var cssStyle = LzDeclaredEvent;
+var fontcolor = LzDeclaredEvent;
var cssPropertyMap = null;
var cssStyle = null;
Modified: openlaszlo/branches/paperpie/lps/includes/console.css
===================================================================
--- openlaszlo/branches/paperpie/lps/includes/console.css 2007-11-12 04:45:54 UTC (rev 7212)
+++ openlaszlo/branches/paperpie/lps/includes/console.css 2007-11-12 06:22:45 UTC (rev 7213)
@@ -94,7 +94,7 @@
/* The input window */
#LaszloDebuggerInput
{
- width: 90%;
+ width: 83%;
font-family: monospace;
font-size: medium;
/* simulate 11/13pt */
Copied: openlaszlo/branches/paperpie/test/compiler_errors/override-builtin.lzx (from rev 7210, openlaszlo/trunk/test/compiler_errors/override-builtin.lzx)
Copied: openlaszlo/branches/paperpie/test/compiler_errors/override-state-apply.lzx (from rev 7210, openlaszlo/trunk/test/compiler_errors/override-state-apply.lzx)
More information about the Laszlo-checkins
mailing list