Author: hqm
Date: 2008-01-09 19:16:48 -0800 (Wed, 09 Jan 2008)
New Revision: 7799
Added:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LFCApplication.as
Removed:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzApplication.as
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloAnimation.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/debugger/swf9stubs.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/Library.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
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/LzScript.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
Log:
checkpoint mini lfc
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloAnimation.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloAnimation.js
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloAnimation.js
2008-01-10 03:16:48 UTC (rev 7799)
@@ -437,6 +437,3 @@
} // End of LzAnimator
-
-
-
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/controllers/LaszloLayout.js
2008-01-10 03:16:48 UTC (rev 7799)
@@ -426,3 +426,4 @@
}
+
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js 2008-01-10
02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.js 2008-01-10
03:16:48 UTC (rev 7799)
@@ -76,6 +76,16 @@
*/
var ConstructorMap = {};
+var LzInstantiateView = function (e, tn = null)
+{
+ if ( tn == null ){
+ tn = 1;
+ }
+ canvas.initiatorAddNode( e , tn );
+}
+
+
+
/** The `lz` object is a pseudo-package for all LZX globals. Any declared LZX
tag
* can be accessed from JavaScript using the tag name and the `lz` object.
*
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js 2008-01-10
02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.js 2008-01-10
03:16:48 UTC (rev 7799)
@@ -1134,9 +1134,13 @@
// TODO: [2005-03-24 ptw] Remove this if we ever enable
// warnings in the LFC as this will be redundant
#passthrough {
- if ($debug) {
- if ((! x) || (! (x is Function))) { Debug.error('Class for tag %s has
not been defined yet', e.name); }
- }
+
+ // TODO [hqm 2008-01] enable this warning unconditionally for now for
swf9 debugging
+ // if ($debug) {
+ if ((! x) || (! (x is Function))) {
+ trace('Class for tag ', e.name, ' has not been defined yet', x); }
+ //}
+
}#
// TODO: [2005-04-20 ptw] Don't know what this means, preserved
// for posterity:
@@ -1144,7 +1148,7 @@
var w;
if (x) {
w = new x(this, e.attrs , ('children' in e) ? e.children : null ,
async );
- }
+ }
return w;
}
@@ -2097,3 +2101,4 @@
} // End of LzNode
+
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/debugger/swf9stubs.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/debugger/swf9stubs.lzs
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/debugger/swf9stubs.lzs
2008-01-10 03:16:48 UTC (rev 7799)
@@ -15,7 +15,6 @@
trace.apply(Debug, args);
}
- static var trace = Debug.write;
static var monitor = Debug.write;
static var warn = Debug.write;
static var error = Debug.write;
Added:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LFCApplication.as
Property changes on:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LFCApplication.as
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/Library.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/Library.lzs
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/Library.lzs
2008-01-10 03:16:48 UTC (rev 7799)
@@ -8,7 +8,7 @@
* @subtopic AS2
*/
-#include "kernel/swf9/LzApplication.as"
+#include "kernel/swf9/LFCApplication.as"
#include "kernel/swf9/LzIdleKernel.as"
#include "kernel/swf9/LzSprite.as"
#include "kernel/swf9/LzTextSprite.as"
Deleted:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzApplication.as
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
2008-01-10 03:16:48 UTC (rev 7799)
@@ -83,6 +83,7 @@
}
public function init (v:Boolean = true):void {
+ trace('calling LzSprite.init', v, this.owner);
this.setVisible(v);
}
@@ -91,6 +92,7 @@
*/
public function addChildSprite(sprite:LzSprite):void {
addChild(sprite);
+ trace('addChildSprite ', sprite, 'added to ' ,this.owner);
}
public function draw():void {
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
2008-01-10 03:16:48 UTC (rev 7799)
@@ -50,28 +50,26 @@
public var password:Boolean = false;
public var scrollheight:Number = 0;
- public function LzTextSprite (newowner = null, isroot = null) {
+ public function LzTextSprite (newowner = null) {
super(newowner,false)
// owner:*, isroot:Boolean
this.textfield = createTextField(0,0,400,20);
+ trace('new LzTextSprite owner=', this.owner);
}
override public function setWidth( width:Number ):void {
+ super.setWidth(width);
this.textfield.width = width;
trace('lztextsprite setwidth', width);
- super.setWidth(width);
}
- override public function setHeight( width:Number ):void {
+ override public function setHeight( height:Number ):void {
+ super.setHeight(height);
this.textfield.height = height;
- super.setWidth(width);
+ trace('lztextsprite setheight', height);
}
-
-
-
-
private function createTextField(x:Number, y:Number, width:Number,
height:Number):TextField {
var tfield:TextField = new TextField();
tfield.x = x;
@@ -237,6 +235,7 @@
this.text = t;// this.format + t + this.closeformat if proper
measurement were working
this.textfield.htmlText = this.format + t + this.closeformat;
+ trace('setting textfield.htmlText', this.textfield.htmlText);
if (this.resize && (this.multiline == false)) {
// single line resizable fields adjust their width to match
the text
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloCanvas.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloCanvas.js
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloCanvas.js
2008-01-10 03:16:48 UTC (rev 7799)
@@ -271,10 +271,8 @@
//this.isinited = false;
//Debug.write('LzCanvas.initDone');
+ LzInstantiator.requestInstantiation( this, sva );
- // LzInstantiator.requestInstantiation( this, sva );
- LzInstantiator.createImmediate( this, sva );
- //
}
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.js
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.js
2008-01-10 03:16:48 UTC (rev 7799)
@@ -334,12 +334,15 @@
* @param LzView s: The new subview
*/
function addSubview ( s ){
+ trace('entering addSubview ', this.sprite, s, s.sprite);
if (this.sprite) {
+ trace('adding subview ', this.sprite, s, s.sprite);
this.sprite.addChildSprite(s.sprite);
}
if ( s.addedToParent ) return;
+ trace(' .... adding to subviews list');
// Don't use the prototype's default subviews array, it is a
// sentinel which lives on the prototype and is shared by all
// instances, make a new one if you want to push a view.
@@ -1541,3 +1544,5 @@
}
+
+
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzScript.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzScript.lzs
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzScript.lzs
2008-01-10 03:16:48 UTC (rev 7799)
@@ -67,6 +67,7 @@
* @modifiers override
*/
static var tagname = 'script';
+ConstructorMap['script'] = LzScript;
function LzScript ( parent, args ) {
super(parent, args);
@@ -74,3 +75,5 @@
}
}; // End of LzScript
+
+
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
2008-01-10 02:52:31 UTC (rev 7798)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
2008-01-10 03:16:48 UTC (rev 7799)
@@ -91,26 +91,28 @@
static var setters = new LzInheritedHash(LzView.setters);
setters = LzText.setters;
- // TODO [hqm 2008-01] This generates a parser bug if not passthrough'ed
- #passthrough {
- if (LzSprite.capabilities.advancedfonts) {
+ function LzText ( parent:* , attrs:* = null , children:* = null,
instcall:* = null) {
+ super(parent,attrs,children,instcall);
- setters.antiAliasType = "setAntiAliasType";
- defaultattrs.antiAliasType = "normal";
+ // TODO [hqm 2008-01] How can we make this a static block
+ // so it only needs to be once on the class, not on each instance??
+ /*
+ if (LzSprite.capabilities.advancedfonts) {
- setters.gridFit = "setGridFit";
- defaultattrs.gridfit = "subpixel";
+ setters.antiAliasType = "setAntiAliasType";
+ defaultattrs.antiAliasType = "normal";
- setters.sharpness = "setSharpness";
- defaultattrs.sharpness = 0;
+ setters.gridFit = "setGridFit";
+ defaultattrs.gridfit = "subpixel";
- setters.thickness = "setThickness";
- defaultattrs.thickness = 0;
- }
- }#
+ setters.sharpness = "setSharpness";
+ defaultattrs.sharpness = 0;
- function LzText ( parent:* , attrs:* = null , children:* = null,
instcall:* = null) {
- super(parent,attrs,children,instcall);
+ setters.thickness = "setThickness";
+ defaultattrs.thickness = 0;
+ }
+ */
+
trace('lztext constructor called');
}
@@ -355,11 +357,11 @@
*/
override function __makeSprite(args) {
trace("LzText __makeSprite", lzutils.objAsString(args));
- this.sprite = new LzTextSprite(this, args);
+ this.sprite = new LzTextSprite(this);
#passthrough {
this.tsprite = sprite as LzTextSprite;
}#
- trace("LzText this.spite", lzutils.objAsString(this.sprite));
+ trace("LzText this.sprite", lzutils.objAsString(this.sprite));
}
@@ -855,7 +857,7 @@
* Sets the selectability (with Ibeam cursor) of the text field
* @param Boolean isSel: true if the text may be selected by the user
*/
-function setSelectable ( isSel ){
+ function setSelectable ( isSel, ignore = null ){
this.selectable = isSel;
this.tsprite.setSelectable(isSel);
}
@@ -895,7 +897,7 @@
* multiple lines.
* @param Boolean ml: true if the text field should allow multiple lines
*/
-function setMultiline ( ml ){
+ function setMultiline ( ml, ignore = null ){
this.tsprite.setMultiline(ml);
this.multiline = (ml == true);
}
@@ -905,7 +907,7 @@
/**
* @access private
*/
-function setBorder ( onroff ){
+ function setBorder ( onroff , ignore = null){
this.tsprite.setBorder(onroff);
}
@@ -913,7 +915,7 @@
* @access private
* @todo should wrapping be made orthogonal to the multiline flag?
*/
-function setWordWrap ( wrap ){
+ function setWordWrap ( wrap , ignore = null){
this.tsprite.setWordWrap(wrap);
}
@@ -921,7 +923,7 @@
/**
* @access private
*/
-function setEmbedFonts ( onroff ){
+ function setEmbedFonts ( onroff , ignore = null){
this.tsprite.setEmbedFonts(onroff);
}
@@ -930,7 +932,7 @@
* and higher.
* @param aliasType "normal" or "advanced"
*/
-function setAntiAliasType( aliasType ){
+ function setAntiAliasType( aliasType , ignore = null){
if (this.capabilities.advancedfonts) {
if ((aliasType == "normal") || (aliasType == "advanced")) {
this.antiAliasType = aliasType;
@@ -959,7 +961,7 @@
* Only works in swf8 and higher.
* @param gridFit "none", "pixel", or "subpixel"
*/
-function setGridFit( gridFit ){
+ function setGridFit( gridFit, ignore = null ){
if (this.capabilities.advancedfonts) {
if ((gridFit == "none") || (gridFit == "pixel") || (gridFit ==
"subpixel")) {
this.gridFit = gridFit;
@@ -989,7 +991,7 @@
* Only works in swf8 and higher.
* @param sharpness -400 to 400
*/
-function setSharpness( sharpness ){
+ function setSharpness( sharpness, ignore = null ){
if (this.capabilities.advancedfonts) {
if ((sharpness >= -400) && (sharpness <= 400)) {
this.sharpness = sharpness;
@@ -1019,7 +1021,7 @@
* Only works in swf8 and higher.
* @param thickness -200 to 200
*/
-function setThickness( thickness ){
+ function setThickness( thickness , ignore = null){
if (this.capabilities.advancedfonts) {
if ((thickness >= -200) && (thickness <= 200)) {
this.thickness = thickness;
@@ -1058,7 +1060,7 @@
/**
*
*/
-function setHScroll (s){
+ function setHScroll (s, ignore = null){
this.tsprite.setHScroll(s);
}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
