Author: hqm
Date: 2008-03-24 08:12:38 -0700 (Mon, 24 Mar 2008)
New Revision: 8366
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LzAnimatorGroup.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataNode.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataProvider.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataRequest.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatapointer.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatasource.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzParam.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzReplicationManager.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloCanvas.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzScript.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
Log:
Change 20080324-hqm-f by [EMAIL PROTECTED] on 2008-03-24 11:11:33 EDT
in /Users/hqm/openlaszlo/devildog3
for http://svn.openlaszlo.org/openlaszlo/branches/devildog
Summary: get rid of LFCNode, LFCView, LFCText
New Features:
Bugs Fixed:
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
These are back to being LzNode, LzView, LzText, in order to make merging swf9
and swf8
LFC code easier.
Tests:
test/swf9/hello.lzx
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -59,19 +59,19 @@
* @lzxname layout
*/
-dynamic class LzLayout extends LFCNode {
+dynamic class LzLayout extends LzNode {
/** @access private
* @modifiers override
*/
static var tagname = 'layout';
- static var getters = new LzInheritedHash(LFCNode.getters);
- static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+ static var getters = new LzInheritedHash(LzNode.getters);
+ static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+ static var options = new LzInheritedHash(LzNode.options);
+ static var setters = new LzInheritedHash(LzNode.setters);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
function LzLayout ( parent:* , attrs:* , children:* = null, instcall:* =
null) {
super(parent,attrs,children,instcall);
@@ -120,10 +120,10 @@
// view.layouts: If it doesn't already exist, layouts create an array
//in the view that it attaches to that hold the list of layouts attached
//to the view.
- if ( (LFCView(this.immediateparent)).layouts == null ){
- (LFCView(this.immediateparent)).layouts = [ this ];
+ if ( (LzView(this.immediateparent)).layouts == null ){
+ (LzView(this.immediateparent)).layouts = [ this ];
} else {
- (LFCView(this.immediateparent)).layouts.push( this );
+ (LzView(this.immediateparent)).layouts.push( this );
}
this.updateDelegate = new LzDelegate( this , "update" );
@@ -151,10 +151,10 @@
this.delegates.push( new LzDelegate ( this, "removeSubview",
this.immediateparent, "onremovesubview" ));
- var vsl = (LFCView(this.immediateparent)).subviews.length;
+ var vsl = (LzView(this.immediateparent)).subviews.length;
for (var i = 0; i < vsl; i++){
- this.gotNewSubview( (LFCView(this.immediateparent)).subviews[i] );
+ this.gotNewSubview( (LzView(this.immediateparent)).subviews[i] );
}
}
@@ -192,7 +192,7 @@
* not set.
*
* @access protected
- * @param LFCView sd: The subview to add.
+ * @param LzView sd: The subview to add.
*/
function addSubview( sd ) {
if ( sd.getOption( 'layoutAfter' ) ){
@@ -220,7 +220,7 @@
* Called when a subview is removed. This is not well tested.
*
* @access protected
- * @param LFCView sd: The subview to be removed.
+ * @param LzView sd: The subview to be removed.
*/
function removeSubview( sd ) {
for ( var i = this.subviews.length-1; i >= 0; i-- ){
@@ -238,7 +238,7 @@
* layouts include all the subviews of a given view.
*
* @access protected
- * @param LFCView s: The subview to ignore.
+ * @param LzView s: The subview to ignore.
*/
function ignore( s ) {
//default behavior on addSubview is to reset
@@ -309,10 +309,10 @@
this.delegates[ i ] .unregisterAll();
}
}
- if (this.immediateparent && (LFCView(this.immediateparent)).layouts) {
- for ( var i = (LFCView(this.immediateparent)).layouts.length -1 ; i >=
0 ; i-- ){
- if ( (LFCView(this.immediateparent)).layouts[ i ] == this ){
- (LFCView(this.immediateparent)).layouts.splice( i , 1 );
+ if (this.immediateparent && (LzView(this.immediateparent)).layouts) {
+ for ( var i = (LzView(this.immediateparent)).layouts.length -1 ; i >=
0 ; i-- ){
+ if ( (LzView(this.immediateparent)).layouts[ i ] == this ){
+ (LzView(this.immediateparent)).layouts.splice( i , 1 );
}
}
}
@@ -325,9 +325,9 @@
*
* @access public
*
- * @param LFCView sub1: The reference subview which the second subview should
+ * @param LzView sub1: The reference subview which the second subview should
* follow in the layout order. Alternatively, can be "first" or "last"
- * @param LFCView sub2: The subview to be moved after the reference subview.
+ * @param LzView sub2: The subview to be moved after the reference subview.
*/
function setLayoutOrder ( sub1 , sub2 ){
//this will cause problems if sub1 or sub2 are not subviews
@@ -358,9 +358,9 @@
* Swap the positions of the two subviews within the layout
* @access public
*
- * @param LFCView sub1: The reference subview which the second subview should
+ * @param LzView sub1: The reference subview which the second subview should
* follow in the layout order.
- * @param LFCView sub2: The subview to be moved after the reference subview.
+ * @param LzView sub2: The subview to be moved after the reference subview.
*/
function swapSubviewOrder ( sub1 , sub2 ){
//this will cause problems if sub1 or sub2 are not subviews
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LzAnimatorGroup.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LzAnimatorGroup.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LzAnimatorGroup.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -41,19 +41,19 @@
* @see LzAnimator
*
*/
-class LzAnimatorGroup extends LFCNode {
+class LzAnimatorGroup extends LzNode {
/** @access private
* @modifiers override
*/
static var tagname = 'animatorgroup';
- static var getters = new LzInheritedHash(LFCNode.getters);
- static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+ static var getters = new LzInheritedHash(LzNode.getters);
+ static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+ static var options = new LzInheritedHash(LzNode.options);
+ static var setters = new LzInheritedHash(LzNode.setters);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
/** The name of the attribute whose value is animated. This
* attribute is required on an animator, unless the animator is
@@ -262,12 +262,12 @@
args[ k ] = this.immediateparent[ k ] ;
}
}
- if ( (LFCView(this.immediateparent)).animators == null ){
- (LFCView(this.immediateparent)).animators = [ this ];
+ if ( (LzView(this.immediateparent)).animators == null ){
+ (LzView(this.immediateparent)).animators = [ this ];
} else {
- (LFCView(this.immediateparent)).animators.push( this );
+ (LzView(this.immediateparent)).animators.push( this );
}
- args.start = LFCNode._ignoreAttribute;
+ args.start = LzNode._ignoreAttribute;
} else {
// initialize target to immediateparent, may be set later by attribute
this.target = this.immediateparent;
@@ -530,7 +530,7 @@
this.updateDel.unregisterAll();
this.animators = null;
this.actAnim = null;
- var anims:Array = LFCView(this.parent).animators;
+ var anims:Array = LzView(this.parent).animators;
if ( anims && anims.length ){
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js 2008-03-24
14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js 2008-03-24
15:12:38 UTC (rev 8366)
@@ -31,8 +31,10 @@
* defaultplacement in lexical parent). See the
* <method>LzNode.determinePlacement</method> method. Defaults to false.
*/
-public class LFCNode {
+dynamic public class LzNode {
+ static var tagname = 'node';
+
var __LZdeferDelegates:Boolean = false;
var _instanceAttrs:* = null;
var _instanceChildren:Array = null;
@@ -65,7 +67,7 @@
* @param Boolean instcall
* @access private
*/
- function LFCNode ( parent:* = null, attrs:* = null, children:* = null,
instcall:* = null){
+ function LzNode ( parent:* = null, attrs:* = null, children:* = null,
instcall:* = null){
this.setters = this['constructor'].setters;
this.getters = this['constructor'].getters;
this.defaultattrs = this['constructor'].defaultattrs;
@@ -73,7 +75,7 @@
this.__LZdelayedSetters = this['constructor'].__LZdelayedSetters;
this.earlySetters = this['constructor'].earlySetters;
- this.__LZUID = "__U" + ++LFCNode.__UIDs;
+ this.__LZUID = "__U" + ++LzNode.__UIDs;
this.__LZdeferDelegates = true;
var qpos = LzDelegate.__LZdelegatesQueue.length;
// super.apply(this.arguments)
@@ -83,9 +85,9 @@
var nm = null;
// Have to extract name from attrs
if (attrs) {
- if (attrs['id'] && (attrs.id != LFCNode._ignoreAttribute)) {
+ if (attrs['id'] && (attrs.id != LzNode._ignoreAttribute)) {
nm = '#' + attrs.id;
- } else if (attrs['name'] && (attrs.name !=
LFCNode._ignoreAttribute)) {
+ } else if (attrs['name'] && (attrs.name !=
LzNode._ignoreAttribute)) {
nm = ((parent === canvas)?'#':'.') + attrs.name;
} else if (attrs['_profile_name']) {
nm = attrs._profile_name;
@@ -125,11 +127,11 @@
var dattrk = dattrs[ k ];
if ( dattrk is Object ) {
if ( attrk is Array ) {
-// Debug.debug("%w: LFCNode.initialize: merging Array %s",
this, k);
+// Debug.debug("%w: LzNode.initialize: merging Array %s",
this, k);
iargs[ k ] = attrk.concat( dattrk );
continue;
} else if (typeof attrk == 'object') {
-// Debug.debug("%w: LFCNode.initialize: merging Object
%s", this, k);
+// Debug.debug("%w: LzNode.initialize: merging Object %s",
this, k);
var tmp = new LzInheritedHash(dattrk);
for (var j in attrk) {
tmp[j] = attrk[j];
@@ -151,7 +153,7 @@
//we know the defaultattrs has $refs, so attach it
iargs.$refs = new LzInheritedHash(dattr$refs);
}
- var ia = LFCNode._ignoreAttribute;
+ var ia = LzNode._ignoreAttribute;
for (var k in cleanup) {
iargs.$refs[ k ] = ia;
}
@@ -431,7 +433,7 @@
* See also, immediateparent.
* @keywords readonly
*/
- var parent:LFCNode;
+ var parent:LzNode;
/** @access private */
var children:Array = null;
@@ -503,7 +505,7 @@
* @type LzNode
* @keywords readonly
*/
- var immediateparent:LFCNode = null;
+ var immediateparent:LzNode = null;
/** @access private */
var dependencies = null;
@@ -520,7 +522,7 @@
* @type LzNode
* @keywords readonly
*/
- var classroot:LFCNode;
+ var classroot:LzNode;
/** The depth of this node in the overall node hierarchy
* @type Number
@@ -680,9 +682,9 @@
static var nodecount = 0;
function construct ( parent , args ){
- //trace("LFCNode.construct", nodecount++, parent,
lzcoreutils.objAsString(args));
+ //trace("LzNode.construct", nodecount++, parent,
lzcoreutils.objAsString(args));
if (parent == null) {
- //trace("LFCNode construct parent == null, args=",
lzcoreutils.objAsString(args));
+ //trace("LzNode construct parent == null, args=",
lzcoreutils.objAsString(args));
}
var lp = parent; // lp == lexical parent
@@ -700,9 +702,9 @@
this.placement = thisplacement;
}
while (thisplacement != null) {
- if (ip.determinePlacement == LFCNode.prototype.determinePlacement)
{
+ if (ip.determinePlacement == LzNode.prototype.determinePlacement) {
// this is the fast path -- basically inline the relevant part
- // of LFCNode.prototype.determinePlacement, below
+ // of LzNode.prototype.determinePlacement, below
var pp = ip.searchSubnodes("name", thisplacement);
if (pp == null) pp = ip;
} else {
@@ -822,7 +824,7 @@
// Register in the source locator table, if debugging
if ($debug) {
if (this.__LZsourceLocation) {
- LFCNode.sourceLocatorTable[this.__LZsourceLocation] = this;
+ LzNode.sourceLocatorTable[this.__LZsourceLocation] = this;
}
}
@@ -899,7 +901,7 @@
for ( var a in args ){
//handle flash bug where objects slots are enumerated multiple times
- if ( oset[a] || args[a] === LFCNode._ignoreAttribute ) continue;
+ if ( oset[a] || args[a] === LzNode._ignoreAttribute ) continue;
oset[ a ] = true;
if (setrs && setrs[ a ] == null ){
@@ -1577,7 +1579,7 @@
* @param String dp: The string to use as the datapath.
*/
function setDatapath ( dp , ignore = null) {
- if (null != this.datapath && dp != LFCNode._ignoreAttribute) {
+ if (null != this.datapath && dp != LzNode._ignoreAttribute) {
this.datapath.setXPath(dp);
} else {
// LzDatapath will set datapath of its immediateparent
@@ -1717,7 +1719,7 @@
function determinePlacement ( aSub , placement,
args) {
// Note that if you modify this function, please check that
- // LFCNode.prototype.construct (in this file) is in sync -- it
+ // LzNode.prototype.construct (in this file) is in sync -- it
// basically inlines this code as an optimization.
if ( placement == null ){
@@ -2027,8 +2029,8 @@
(this.parent[this.name] === this)) {
return '.' + this.name;
} else {
- // Don't use LFCNode.toString, which is lame
- if (this.toString !== LFCNode.prototype.toString) {
+ // Don't use LzNode.toString, which is lame
+ if (this.toString !== LzNode.prototype.toString) {
return String(this);
} else {
// Return empty string so __String does not call toString
@@ -2107,24 +2109,6 @@
} // End of LzNode
-
-
-dynamic public class LzNode extends LFCNode {
- static var getters = new LzInheritedHash(LFCNode.getters);
- static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
-
- public function LzNode ( parent:* , attrs:* , children:* = null,
instcall:* = null) {
- super(parent,attrs,children,instcall);
- }
-
- static var tagname = 'node';
-
-}
-
ConstructorMap[LzNode.tagname] = LzNode;
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataNode.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataNode.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataNode.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -271,8 +271,8 @@
if (str != null && str != "") {
//Debug.info("stringToLzData: parsing: ", typeof(str), str);
var nativexml = LzXMLParser.parseXML(str, trimwhitespace, nsprefix);
- var lfcnode = LzXMLTranslator.copyXML(nativexml, trimwhitespace,
nsprefix);
- return lfcnode;
+ var LzNode = LzXMLTranslator.copyXML(nativexml, trimwhitespace,
nsprefix);
+ return LzNode;
} else {
return null;
}
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataProvider.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataProvider.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataProvider.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -17,7 +17,7 @@
* @shortdesc DataProvider
*/
-class LzDataProvider extends LFCNode {
+class LzDataProvider extends LzNode {
/** @access private
* @modifiers override
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataRequest.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataRequest.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataRequest.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -20,7 +20,7 @@
* @lzxname datarequest
*/
-class LzDataRequest extends LFCNode {
+class LzDataRequest extends LzNode {
/** @access private
* @modifiers override
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatapointer.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatapointer.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatapointer.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -73,15 +73,15 @@
* @lzxname datapointer
* @see LzDataset
*/
-class LzDatapointer extends LFCNode {
+class LzDatapointer extends LzNode {
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var getters = new LzInheritedHash(LFCNode.getters);
-// See below. defaultattrs doesn't get LFCNode values
-// static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+ static var setters = new LzInheritedHash(LzNode.setters);
+ static var getters = new LzInheritedHash(LzNode.getters);
+// See below. defaultattrs doesn't get LzNode values
+// static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+ static var options = new LzInheritedHash(LzNode.options);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
LzDatapointer.setters.xpath = "setXPath";
LzDatapointer.setters.context = "setDataContext";
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -93,14 +93,14 @@
*/
// [2008-03-18 pbr] dynamic is a temp fix to allow runtime property creation
-dynamic class LzDataset extends LFCNode with LzDataElementMixin,
LzDataNodeMixin {
+dynamic class LzDataset extends LzNode with LzDataElementMixin,
LzDataNodeMixin {
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var getters = new LzInheritedHash(LFCNode.getters);
- static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+ static var setters = new LzInheritedHash(LzNode.setters);
+ static var getters = new LzInheritedHash(LzNode.getters);
+ static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+ static var options = new LzInheritedHash(LzNode.options);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
LzDataset.setters.querytype = "setQueryType";
LzDataset.setters.data = "setData";
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatasource.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatasource.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDatasource.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -43,14 +43,14 @@
* @shortdesc An abstract class to represent backend data sources.
* @lzxname datasource
*/
-class LzDatasource extends LFCNode {
+class LzDatasource extends LzNode {
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var getters = new LzInheritedHash(LFCNode.getters);
- static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+ static var setters = new LzInheritedHash(LzNode.setters);
+ static var getters = new LzInheritedHash(LzNode.getters);
+ static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+ static var options = new LzInheritedHash(LzNode.options);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
/**
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzParam.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzParam.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzParam.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -36,7 +36,7 @@
*
* @lzxname params
*/
-class LzParam extends LFCNode {
+class LzParam extends LzNode {
/** @access private
* @modifiers override
@@ -45,12 +45,12 @@
//undefine all setters but name and id
//TODO Check above comment
-static var setters = new LzInheritedHash(LFCNode.setters);
-static var getters = new LzInheritedHash(LFCNode.getters);
-static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
-static var options = new LzInheritedHash(LFCNode.options);
-static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
-static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+static var setters = new LzInheritedHash(LzNode.setters);
+static var getters = new LzInheritedHash(LzNode.getters);
+static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+static var options = new LzInheritedHash(LzNode.options);
+static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
LzParam.setters.$hasdefaultattrs = -1;
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzReplicationManager.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzReplicationManager.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzReplicationManager.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -188,7 +188,7 @@
if (global[id] is LzNode) global[id] = null;
//don't want to rerunxpath
- args.xpath = LFCNode._ignoreAttribute;
+ args.xpath = LzNode._ignoreAttribute;
//copy sortpath and sortorder from odp, if they were set
if ( odp.sortpath != null ){
@@ -228,13 +228,13 @@
//add clone transformer to original instance attributes
this.cloneAttrs = new LzInheritedHash(view._instanceAttrs);
- this.cloneAttrs.datapath = LFCNode._ignoreAttribute;
+ this.cloneAttrs.datapath = LzNode._ignoreAttribute;
this.cloneAttrs.$datapath = { name : 'datapath' };
this.cloneAttrs.$datapath.attrs = { datacontrolsvisibility:
odp.datacontrolsvisibility,
__LZmanager : this }
- this.cloneAttrs.id = LFCNode._ignoreAttribute;
- this.cloneAttrs.name = LFCNode._ignoreAttribute;
+ this.cloneAttrs.id = LzNode._ignoreAttribute;
+ this.cloneAttrs.name = LzNode._ignoreAttribute;
if ($profile) {
if (view._profile_name) {
this.cloneAttrs._profile_name = 'clone of ' + view._profile_name;
@@ -246,7 +246,7 @@
//<view datapath="${ ... }"/>
//we need to mask this
this.cloneAttrs.$refs = new LzInheritedHash( this.cloneAttrs.$refs );
- this.cloneAttrs.$refs.datapath = LFCNode._ignoreAttribute;
+ this.cloneAttrs.$refs.datapath = LzNode._ignoreAttribute;
//but, we want the constraint to apply to this object instead
var cons = view._instanceAttrs.$refs.datapath;
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloCanvas.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloCanvas.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloCanvas.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -8,7 +8,7 @@
*/
-dynamic class LzCanvas extends LFCView {
+dynamic class LzCanvas extends LzView {
#passthrough (toplevel:true) {
import flash.utils.*;
@@ -24,12 +24,12 @@
- static var getters = new LzInheritedHash(LFCView.getters);
- static var defaultattrs = new LzInheritedHash(LFCView.defaultattrs);
- static var options = new LzInheritedHash(LFCView.options);
- static var setters = new LzInheritedHash(LFCView.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCView.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCView.earlySetters);
+ static var getters = new LzInheritedHash(LzView.getters);
+ static var defaultattrs = new LzInheritedHash(LzView.defaultattrs);
+ static var options = new LzInheritedHash(LzView.options);
+ static var setters = new LzInheritedHash(LzView.setters);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzView.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzView.earlySetters);
var resourcetable:*;
var _lzinitialsubviews:*;
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -11,20 +11,22 @@
*/
-public class LFCView extends LFCNode {
+dynamic public class LzView extends LzNode {
- static var getters = new LzInheritedHash(LFCNode.getters);
- static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+ static var tagname = 'view';
- LFCView.setters.clip = -1;
- LFCView.setters.x ="setX";
- LFCView.setters.y = "setY";
+ static var getters = new LzInheritedHash(LzNode.getters);
+ static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+ static var options = new LzInheritedHash(LzNode.options);
+ static var setters = new LzInheritedHash(LzNode.setters);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
- function LFCView ( parent:* , attrs:* , children:* = null, instcall:* =
null) {
+ LzView.setters.clip = -1;
+ LzView.setters.x ="setX";
+ LzView.setters.y = "setY";
+
+ function LzView ( parent:* , attrs:* , children:* = null, instcall:* =
null) {
super(parent,attrs,children,instcall);
}
@@ -239,7 +241,7 @@
/**
* Base level constructor for views. See <method
- * classname="LFCNode">construct</method> for more on this.
+ * classname="LzNode">construct</method> for more on this.
*
* @access protected
*/
@@ -250,7 +252,7 @@
var ip = this.immediateparent;
if (ip == null) {
- //trace("LFCView.construct immediateparent == null", this.id);
+ //trace("LzView.construct immediateparent == null", this.id);
}
if (ip) {
@@ -274,7 +276,7 @@
var r =null;
if ('resource' in args && args['resource'] != null ){
r = args.resource;
- args.resource = LFCNode._ignoreAttribute;
+ args.resource = LzNode._ignoreAttribute;
}
if ('clip' in args && args['clip']){
if (this.sprite) this.makeMasked();
@@ -312,7 +314,7 @@
/**
* Called right before the view is shown. See <method
- * classname="LFCNode">init</method> for more.
+ * classname="LzNode">init</method> for more.
*
* @access protected
*/
@@ -360,7 +362,7 @@
*/
override function __LZinstantiationDone (){
if (this.immediateparent) {
- (LFCView(this.immediateparent)).addSubview( this );
+ (LzView(this.immediateparent)).addSubview( this );
} else {
// trace("LaszloView.__LZinstantiationDone immediateparent =
null");
}
@@ -398,13 +400,13 @@
var clip:Boolean = false;
-LFCView.setters.rotation= "setRotation";
-LFCView.setters.opacity = "setOpacity";
+LzView.setters.rotation= "setRotation";
+LzView.setters.opacity = "setOpacity";
/** @access private */
-LFCView.setters.alpha = "setOpacity";
-LFCView.setters.visible = "setVisible"
+LzView.setters.alpha = "setOpacity";
+LzView.setters.visible = "setVisible"
/** @access private */
-LFCView.setters.visibility = "setVisibility"
+LzView.setters.visibility = "setVisibility"
/**
* @lzxtype "left" | "center" | "right" | constraint
@@ -412,7 +414,7 @@
* @keywords final
*/
var align:String = "left"
-LFCView.setters.align = "setAlign"
+LzView.setters.align = "setAlign"
/**
* Creates a constraint on the view's y position which is a function
@@ -422,7 +424,7 @@
* @lzxdefault "top"
*/
var valign = "top"
-LFCView.setters.valign = "setValign"
+LzView.setters.valign = "setValign"
/** The URL from which to load the resource for this
* view. If this attribute is set, the media for the view is loaded
@@ -439,11 +441,11 @@
* a setter. [bshine 2007.11.07]
* @access private
*/
-LFCView.setters.source = "setSource";
+LzView.setters.source = "setSource";
/** The background color of the canvas.
* @lzxtype token
*/
-LFCView.setters.bgcolor = "setBGColor";
+LzView.setters.bgcolor = "setBGColor";
/** Sets the name of this views resource, or the URL from which it should
* be loaded.
@@ -452,20 +454,20 @@
/// TODO HQM 01 2008 remove this dupe declaration of 'resource' from the
source when merging
//var resource;
-LFCView.setters.resource = "setResource";
+LzView.setters.resource = "setResource";
/** If true, this view intercepts click events; otherwise they are passed
* to its container. This defaults to true if the view defines a mouse
* event handler or a cursor.
* @lzxtype boolean
*/
-LFCView.setters.clickable = "setClickable";
+LzView.setters.clickable = "setClickable";
/** Setting clickRegion to a vector-based SWF turns the SWF shape into a
clickable hotspot.
* @access public
* @lzxtype string
*/
var clickregion;
-LFCView.setters.clickregion = "__LZsetClickRegion";
+LzView.setters.clickregion = "__LZsetClickRegion";
/** The cursor to display when the mouse is over this view. Any
* resource can be used as a cursor. This attribute can be set for
* any view with clickable=true, or any view whose class defaults
@@ -473,14 +475,14 @@
* @lzxtype token
*/
var cursor;
-LFCView.setters.cursor = "setCursor";
+LzView.setters.cursor = "setCursor";
/** A color to use to render object that appears inside this view,
* which includes any vector or bitmap art in the view's resource
* and any contained views.
* @lzxtype color
*/
var fgcolor;
-LFCView.setters.fgcolor = "setColor";
+LzView.setters.fgcolor = "setColor";
/** The font to use for any @c{<text>} or @c{<inputtext>} elements that
* appear inside this view. Like all the font properties
* (<code>fontstyle</code> and <code>fontsize</code> too) these
@@ -491,7 +493,7 @@
* @lzxtype string
*/
var font;
-LFCView.setters.font = "setFontName" ;
+LzView.setters.font = "setFontName" ;
/** The style to use to render text fields that appear inside of
* this view. One of "plain", "bold" , "italic" or "bolditalic".
@@ -515,54 +517,54 @@
* @lzxdefault "none"
*/
var stretches = "none";
-LFCView.setters.stretches = "stretchResource";
+LzView.setters.stretches = "stretchResource";
/** If true, the resource attached to this view begins playing when
* the view is instantiated.
* @lzxtype boolean
*/
-LFCView.setters.play = "setPlay";
+LzView.setters.play = "setPlay";
/** Show or hide the handcursor for this view, if clickable */
-LFCView.setters.showhandcursor = "setShowHandCursor";
+LzView.setters.showhandcursor = "setShowHandCursor";
var layout;
-LFCView.setters.layout = "setLayout";
+LzView.setters.layout = "setLayout";
/** Activate/inactivate children for accessibility
* @type Boolean
* @lzxtype boolean
*/
var aaactive;
-LFCView.setters.aaactive = "setAAActive";
+LzView.setters.aaactive = "setAAActive";
/** Set accessibility name
* @type String
* @lzxtype string
*/
var aaname;
-LFCView.setters.aaname = "setAAName";
+LzView.setters.aaname = "setAAName";
/** Set accessibility description
* @type String
* @lzxtype string
*/
var aadescription;
-LFCView.setters.aadescription = "setAADescription";
+LzView.setters.aadescription = "setAADescription";
/** Set accessibility tab order
* @type Number
* @lzxtype number
*/
var aatabindex;
-LFCView.setters.aatabindex = "setAATabIndex";
+LzView.setters.aatabindex = "setAATabIndex";
/** Set accessibility silencing/unsilencing
* @type Boolean
* @lzxtype boolean
*/
var aasilent;
-LFCView.setters.aasilent = "setAASilent";
+LzView.setters.aasilent = "setAASilent";
-LFCView.__LZdelayedSetters.layout = "setLayout";
+LzView.__LZdelayedSetters.layout = "setLayout";
-LFCView.earlySetters.clickregion = 7;
-LFCView.earlySetters.stretches = 8;
+LzView.earlySetters.clickregion = 7;
+LzView.earlySetters.stretches = 8;
/** A value to be added to the
* <attribute>x</attribute> position of this view before drawing
@@ -571,14 +573,14 @@
* internal coordinate system.
* @type Number
*/
-LFCView.setters.xoffset = "setXOffset";
+LzView.setters.xoffset = "setXOffset";
/** A value to be added to the <attribute>y</attribute> position of this view
* before drawing it. This affects the apparent rotation point of the view, as
* well as its apparent <attribute>y</attribute> position. It does not affect
the view's width or its
* internal coordinate system.
* @type Number
*/
-LFCView.setters.yoffset = "setYOffset";
+LzView.setters.yoffset = "setYOffset";
/** @access private */
var sprite:LzSprite = null;
@@ -654,7 +656,7 @@
* @lzxtype sizeExpression
*/
var width:Number = 0;
-LFCView.setters.width = "setWidth";
+LzView.setters.width = "setWidth";
/**
* The height of the view
@@ -663,7 +665,7 @@
* @lzxtype sizeExpression
*/
var height:Number = 0;
-LFCView.setters.height = "setHeight";
+LzView.setters.height = "setHeight";
/** If stretches is not set to none, the width
* that this view would be if it weren't stretched. This attribute can be used
@@ -736,7 +738,7 @@
* know what frame the resource is showing while it is playing.
*/
var frame:Number = 0;
-LFCView.setters.frame = "setResourceNumber";
+LzView.setters.frame = "setResourceNumber";
/** @keywords deprecated
* @access private
@@ -1044,7 +1046,7 @@
if (this.sprite) this.sprite.predestroy();
if ( this.addedToParent ){
- var svs = LFCView(this.immediateparent).subviews;
+ var svs = LzView(this.immediateparent).subviews;
if (svs != null) {
for( var i = svs.length - 1; i >= 0; i-- ){
if ( svs[ i ] == this ){
@@ -1066,16 +1068,16 @@
this.setVisible ( false );
if ( this.addedToParent ){
- if ( ('__LZoutliewidth' in LFCView(this.immediateparent)) &&
(LFCView(this.immediateparent).__LZoutliewidth == this) ) {
- LFCView(this.immediateparent).__LZoutliewidth=null;
+ if ( ('__LZoutliewidth' in LzView(this.immediateparent)) &&
(LzView(this.immediateparent).__LZoutliewidth == this) ) {
+ LzView(this.immediateparent).__LZoutliewidth=null;
}
- if ( ('__LZoutlieheight' in LFCView(this.immediateparent)) &&
(LFCView(this.immediateparent).__LZoutlieheight == this) ) {
- LFCView(this.immediateparent).__LZoutlieheight=null;
+ if ( ('__LZoutlieheight' in LzView(this.immediateparent)) &&
(LzView(this.immediateparent).__LZoutlieheight == this) ) {
+ LzView(this.immediateparent).__LZoutlieheight=null;
}
- if ('onremovesubview' in LFCView(this.immediateparent))
- if (LFCView(this.immediateparent).onremovesubview.ready)
LFCView(this.immediateparent).onremovesubview.sendEvent( this );
+ if ('onremovesubview' in LzView(this.immediateparent))
+ if (LzView(this.immediateparent).onremovesubview.ready)
LzView(this.immediateparent).onremovesubview.sendEvent( this );
}
}
@@ -1309,8 +1311,8 @@
this.sprite.setWidth(newsize);
if (this.onwidth.ready) this.onwidth.sendEvent( newsize );
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckwidth)
- (LFCView(this.immediateparent)).__LZcheckwidthFunction( this );
+ if (this.immediateparent &&
(LzView(this.immediateparent)).__LZcheckwidth)
+ (LzView(this.immediateparent)).__LZcheckwidthFunction( this );
}
}
@@ -1334,8 +1336,8 @@
this.sprite.setHeight(newsize);
if (this.onheight.ready) this.onheight.sendEvent( newsize );
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckheight)
- (LFCView(this.immediateparent)).__LZcheckheightFunction( this );
+ if (this.immediateparent &&
(LzView(this.immediateparent)).__LZcheckheight)
+ (LzView(this.immediateparent)).__LZcheckheightFunction( this );
}
}
@@ -1591,8 +1593,8 @@
if ( this.pixellock ) v = Math.floor( v );
this.sprite.setX(v)
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckwidth)
- (LFCView(this.immediateparent)).__LZcheckwidthFunction( this );
+ if (this.immediateparent &&
(LzView(this.immediateparent)).__LZcheckwidth)
+ (LzView(this.immediateparent)).__LZcheckwidthFunction( this );
if (this.onx.ready) this.onx.sendEvent( this.x );
}
}
@@ -1618,8 +1620,8 @@
if ( this.pixellock ) v = Math.floor( v );
this.sprite.setY(v)
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckheight)
- (LFCView(this.immediateparent)).__LZcheckheightFunction( this
);
+ if (this.immediateparent &&
(LzView(this.immediateparent)).__LZcheckheight)
+ (LzView(this.immediateparent)).__LZcheckheightFunction( this );
if (this.ony.ready) this.ony.sendEvent( this.y );
}
}
@@ -1641,16 +1643,16 @@
this.setY( this.y, true );
}
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckwidth)
- (LFCView(this.immediateparent)).__LZcheckwidthFunction( this );
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckheight)
- (LFCView(this.immediateparent)).__LZcheckheightFunction( this );
+ if (this.immediateparent && (LzView(this.immediateparent)).__LZcheckwidth)
+ (LzView(this.immediateparent)).__LZcheckwidthFunction( this );
+ if (this.immediateparent &&
(LzView(this.immediateparent)).__LZcheckheight)
+ (LzView(this.immediateparent)).__LZcheckheightFunction( this );
}
function setWidth ( v , ignore = null){
if (this._width != v) {
this._width = v;
- //Debug.write('LFCView.setWidth', this, v, this.sprite);
+ //Debug.write('LzView.setWidth', this, v, this.sprite);
this.sprite.setWidth(v);
if ( v == null ){
@@ -1681,8 +1683,8 @@
//this.__LZbgRef._xscale = v;
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckwidth)
- (LFCView(this.immediateparent)).__LZcheckwidthFunction( this );
+ if (this.immediateparent &&
(LzView(this.immediateparent)).__LZcheckwidth)
+ (LzView(this.immediateparent)).__LZcheckwidthFunction( this );
if (this.onwidth.ready) this.onwidth.sendEvent( v );
@@ -1728,8 +1730,8 @@
}
this.hassetheight = true;
- if (this.immediateparent &&
(LFCView(this.immediateparent)).__LZcheckheight)
- (LFCView(this.immediateparent)).__LZcheckheightFunction( this );
+ if (this.immediateparent &&
(LzView(this.immediateparent)).__LZcheckheight)
+ (LzView(this.immediateparent)).__LZcheckheightFunction( this );
if (this.onheight.ready) this.onheight.sendEvent( v );
@@ -1740,20 +1742,5 @@
}
-dynamic class LzView extends LFCView {
- static var getters = new LzInheritedHash(LFCView.getters);
- static var defaultattrs = new LzInheritedHash(LFCView.defaultattrs);
- static var options = new LzInheritedHash(LFCView.options);
- static var setters = new LzInheritedHash(LFCView.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCView.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCView.earlySetters);
-
- static var tagname = 'view';
- function LzView ( parent:* , attrs:* , children:* = null, instcall:* =
null) {
- super(parent,attrs,children,instcall);
- }
-
-}
-
ConstructorMap[LzView.tagname] = LzView;
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzInputText.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -55,8 +55,9 @@
* @shortdesc The basic input-text element.
* @lzxname inputtext
*/
-public class LFCInputText extends LFCText {
+dynamic public class LzInputText extends LzText {
+ public static var tagname = 'inputtext';
/**
* Called to create the sprite object. May be overridden to use a
specific
* version, e.g. LzTextSprite();
@@ -67,17 +68,17 @@
this.sprite = tsprite;
}
- static var getters = new LzInheritedHash(LFCText.getters);
- static var defaultattrs = new
LzInheritedHash(LFCText.defaultattrs);
- static var options = new LzInheritedHash(LFCText.options);
- static var setters = new LzInheritedHash(LFCText.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCText.__LZdelayedSetters);
- static var earlySetters:* = new
LzInheritedHash(LFCText.earlySetters);
+ static var getters = new LzInheritedHash(LzText.getters);
+ static var defaultattrs = new LzInheritedHash(LzText.defaultattrs);
+ static var options = new LzInheritedHash(LzText.options);
+ static var setters = new LzInheritedHash(LzText.setters);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzText.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzText.earlySetters);
- function LFCInputText ( parent:* , attrs:* = null, children:* = null,
instcall:* = null) {
+ function LzInputText ( parent:* , attrs:* = null, children:* = null,
instcall:* = null) {
super(parent,attrs,children,instcall);
- trace("making LFCInputText", attrs);
+ trace("making LzInputText", attrs);
focusable = true; // Defined in LzView
}
@@ -271,26 +272,7 @@
-} // End of LFCInputText
+} // End of LzInputText
-
-
-public dynamic class LzInputText extends LFCInputText {
- static var getters = LFCInputText.getters;
- static var defaultattrs = LFCInputText.defaultattrs;
- static var options = LFCInputText.options;
- static var setters = LFCInputText.setters;
- static var __LZdelayedSetters:* = LFCInputText.__LZdelayedSetters;
- static var earlySetters:* = LFCInputText.earlySetters;
-
- public static var tagname = 'inputtext';
-
- public function LzInputText ( parent:* , attrs:* = null , children:* =
null, instcall:* = null) {
- super(parent,attrs,children,instcall);
- }
-
-}
-
-
ConstructorMap[LzInputText.tagname] = LzInputText;
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzScript.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzScript.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzScript.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -61,14 +61,14 @@
* @lzxname script
*/
-public class LzScript extends LFCNode {
+public class LzScript extends LzNode {
- static var getters = new LzInheritedHash(LFCNode.getters);
- static var defaultattrs = new LzInheritedHash(LFCNode.defaultattrs);
- static var options = new LzInheritedHash(LFCNode.options);
- static var setters = new LzInheritedHash(LFCNode.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCNode.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCNode.earlySetters);
+ static var getters = new LzInheritedHash(LzNode.getters);
+ static var defaultattrs = new LzInheritedHash(LzNode.defaultattrs);
+ static var options = new LzInheritedHash(LzNode.options);
+ static var setters = new LzInheritedHash(LzNode.setters);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzNode.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzNode.earlySetters);
/** @access private
* @modifiers override
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
2008-03-24 14:55:19 UTC (rev 8365)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
2008-03-24 15:12:38 UTC (rev 8366)
@@ -72,19 +72,21 @@
* the initial text value.
*/
// TODO [hqm 2008-01] removed "with LzFormatter" until we get mixins working
-class LFCText extends LFCView {
+dynamic class LzText extends LzView {
+ static var tagname = 'text';
+
var tsprite:LzTextSprite;
- static var getters = new LzInheritedHash(LFCView.getters);
- static var defaultattrs = new LzInheritedHash(LFCView.defaultattrs);
- static var options = new LzInheritedHash(LFCView.options);
- static var setters = new LzInheritedHash(LFCView.setters);
- static var __LZdelayedSetters:* = new
LzInheritedHash(LFCView.__LZdelayedSetters);
- static var earlySetters:* = new LzInheritedHash(LFCView.earlySetters);
+ static var getters = new LzInheritedHash(LzView.getters);
+ static var defaultattrs = new LzInheritedHash(LzView.defaultattrs);
+ static var options = new LzInheritedHash(LzView.options);
+ static var setters = new LzInheritedHash(LzView.setters);
+ static var __LZdelayedSetters:* = new
LzInheritedHash(LzView.__LZdelayedSetters);
+ static var earlySetters:* = new LzInheritedHash(LzView.earlySetters);
- function LFCText ( parent:* = null, attrs:* = null , children:* = null,
instcall:* = null) {
+ function LzText ( parent:* = null, attrs:* = null , children:* = null,
instcall:* = null) {
super(parent,attrs,children,instcall);
// TODO [hqm 2008-01] How can we make this a static block
@@ -92,19 +94,19 @@
/*
if (LzSprite.capabilities.advancedfonts) {
- LFCText.setters.antiAliasType = "setAntiAliasType";
- LFCText.defaultattrs.antiAliasType = "normal";
- LFCText.setters.antiAliasType = "setAntiAliasType";
- LFCText.defaultattrs.antiAliasType = "normal";
+ LzText.setters.antiAliasType = "setAntiAliasType";
+ LzText.defaultattrs.antiAliasType = "normal";
+ LzText.setters.antiAliasType = "setAntiAliasType";
+ LzText.defaultattrs.antiAliasType = "normal";
- LFCText.setters.gridFit = "setGridFit";
- LFCText.defaultattrs.gridfit = "subpixel";
+ LzText.setters.gridFit = "setGridFit";
+ LzText.defaultattrs.gridfit = "subpixel";
- LFCText.setters.sharpness = "setSharpness";
- LFCText.defaultattrs.sharpness = 0;
+ LzText.setters.sharpness = "setSharpness";
+ LzText.defaultattrs.sharpness = 0;
- LFCText.setters.thickness = "setThickness";
- LFCText.defaultattrs.thickness = 0;
+ LzText.setters.thickness = "setThickness";
+ LzText.defaultattrs.thickness = 0;
}
*/
@@ -180,7 +182,7 @@
return 0;
}
-LFCText.defaultattrs.pixellock = true;
+LzText.defaultattrs.pixellock = true;
/**
* If true, the lines of text are wrapped to fit within the text
@@ -262,9 +264,9 @@
this.tsprite.__initTextProperties(args);
//trace("__initTextProperties", lzcoreutils.objAsString(args));
- args.font = LFCNode._ignoreAttribute;
- args.fontsize = LFCNode._ignoreAttribute;
- args.fontstyle = LFCNode._ignoreAttribute;
+ args.font = LzNode._ignoreAttribute;
+ args.fontsize = LzNode._ignoreAttribute;
+ args.fontstyle = LzNode._ignoreAttribute;
if ('maxlength' in args && args.maxlength != null) {
this.setMaxLength(args.maxlength);
@@ -371,7 +373,7 @@
}
/**
- * Get a reference to the control mc (overridden from LFCView)
+ * Get a reference to the control mc (overridden from LzView)
* @access private
*/
function getMCRef () {
@@ -382,23 +384,23 @@
/**
* @access private
*/
-LFCText.setters.text = "setText";
+LzText.setters.text = "setText";
/**
* @access private
*/
-LFCText.setters.resize = "setResize";
+LzText.setters.resize = "setResize";
/**
* @access private
*/
-LFCText.setters.multiline = -1;
+LzText.setters.multiline = -1;
/**
* @access private
*/
-LFCText.setters.yscroll = "setYScroll";
+LzText.setters.yscroll = "setYScroll";
/**
* @access private
*/
-LFCText.setters.xscroll = "setXScroll";
+LzText.setters.xscroll = "setXScroll";
/**
* If true, the text is selectable
@@ -407,8 +409,8 @@
* @modifiers virtual
*/
// no var decl since this is a virtual field
-LFCText.setters.selectable = "setSelectable";
-LFCText.defaultattrs.selectable = false;
+LzText.setters.selectable = "setSelectable";
+LzText.defaultattrs.selectable = false;
/**
* @lzxtype numberExpression
@@ -416,7 +418,7 @@
*/
var maxlength;
/** @access private */
-LFCText.setters.maxlength = "setMaxLength";
+LzText.setters.maxlength = "setMaxLength";
/**
* @lzxtype string
@@ -424,14 +426,14 @@
*/
var pattern;
/** @access private */
-LFCText.setters.pattern = "setPattern";
+LzText.setters.pattern = "setPattern";
-LFCText.defaultattrs.clip = true;
+LzText.defaultattrs.clip = true;
/**
* setResize set behavior of text field width when new text is added.
- * LFCText only (cannot be used with LzInputText).
+ * LzText only (cannot be used with LzInputText).
* @param Boolean val: if true, the textfield will recompute it's width after
setText() is called
*/
function setResize ( val, ignore = null ){
@@ -470,7 +472,7 @@
*/
//Abstract method
-//LFCText.prototype.setText
+//LzText.prototype.setText
/**
* Appends the string to the current text in the textfield.
@@ -550,7 +552,7 @@
* @access private
*/
override function toString ( ){
- return "LFCText: " + this.getText();
+ return "LzText: " + this.getText();
}
@@ -622,15 +624,15 @@
/**
* @access private
*/
-LFCText.setters.font = "setFontName";
+LzText.setters.font = "setFontName";
/**
* @access private
*/
-LFCText.setters.fontsize = "setFontSize";
+LzText.setters.fontsize = "setFontSize";
/**
* @access private
*/
-LFCText.setters.fontstyle = "setFontStyle";
+LzText.setters.fontstyle = "setFontStyle";
/**
* @access private
@@ -849,11 +851,11 @@
var t = ts == null ? this.text : ts;
var i;
- for ( var ec in LFCText.escapeChars ){
+ for ( var ec in LzText.escapeChars ){
while( t.indexOf( ec ) > -1 ){
i = t.indexOf( ec );
- t = t.substring( 0 , i ) + LFCText.escapeChars[ ec ] +
+ t = t.substring( 0 , i ) + LzText.escapeChars[ ec ] +
t.substring( i+1 );
}
}
@@ -1135,31 +1137,7 @@
*/
}
-} // End of LFCText
+} // End of LzText
-
-// This is a dynamic wrapper class around the 'real' LFC class. This
-// is so that the Flash 9 compiler will make efficient code for the
-// built-in methods and attributes, while giving us a dynamic class
-// for the user to see, to allow attaching properties at runtime.
-public dynamic class LzText extends LFCText {
- // We can just point to the 'real class' setters tables, we don't need to
- // make copies of them.
- static var getters = LFCText.getters;
- static var defaultattrs = LFCText.defaultattrs;
- static var options = LFCText.options;
- static var setters = LFCText.setters;
- static var __LZdelayedSetters:* = LFCText.__LZdelayedSetters;
- static var earlySetters:* = LFCText.earlySetters;
-
-
- static var tagname = 'text';
- function LzText ( parent:* = null, attrs:* = null, children:* = null,
instcall:* = null) {
- super(parent,attrs,children,instcall);
- }
-
-}
-
-
ConstructorMap[LzText.tagname] = LzText;
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
