Author: hqm
Date: 2008-03-24 08:50:15 -0700 (Mon, 24 Mar 2008)
New Revision: 8367
Modified:
openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/Library.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/helpers/LzState.js
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
Log:
Change 20080324-hqm-p by [EMAIL PROTECTED] on 2008-03-24 11:43:40 EDT
in /Users/hqm/openlaszlo/devildog3
for http://svn.openlaszlo.org/openlaszlo/branches/devildog
Summary: remove some duplicated var declarations in merged LFC files
New Features:
Bugs Fixed:
Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Tests:
smoke, calendar (swf8 and dhtml)
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/Library.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/Library.lzs
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/Library.lzs
2008-03-24 15:50:15 UTC (rev 8367)
@@ -12,8 +12,13 @@
if ($swf9) {
#include "core/dummyclasses.js"
- #include "core/LzNode.js"
+}
+
+#include "core/LzNode.lzs"
+
+
+if ($swf9) {
+
} else {
- #include "core/LzNode.lzs"
#include "core/UserClass.lzs"
}
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.lzs
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzDefs.lzs
2008-03-24 15:50:15 UTC (rev 8367)
@@ -173,7 +173,7 @@
import flash.utils.Dictionary;
}#
- function LzInheritedHash (sup:Object) {
+ function LzInheritedHash (sup:Object = null) {
if(sup) {
for (var k in sup) {
this[k] = sup[k];
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.lzs
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/core/LzNode.lzs
2008-03-24 15:50:15 UTC (rev 8367)
@@ -42,8 +42,6 @@
static var attributes = new LzInheritedHash();
var __LZdeferDelegates:Boolean = false;
- var _instanceAttrs:* = null;
- var _instanceChildren:Array = null;
var __LZisnew:Boolean = false;
var __LZstyleConstraints:* = null;
// var syncNew:Boolean = null;
@@ -52,7 +50,6 @@
var data:* = null;
var classChildren:Array = null;
var __LZvizDat:Boolean = true;
- var layouts:* = null; // Used by replication
if ($swf9) {
@@ -143,11 +140,13 @@
/** @access private
* @devnote Used by replication to clone instances */
- var _instanceAttrs;
+ var _instanceAttrs:* = null;
+
/** @access private
* @devnote Used by replication to clone instances */
- var _instanceChildren;
+ var _instanceChildren:Array = null;
+
/**
* @param LzNode parent: a node above this one in the hierarchy -- not
* necessarily the immediate parent -- that will decide where this node goes
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/data/LzDataset.js
2008-03-24 15:50:15 UTC (rev 8367)
@@ -284,7 +284,7 @@
* Sets the name of this datasource - used only by initializer
* @access private
*/
-override function setName(name, ignore = null) {
+function setName(name, ignore = null) {
super.setName.apply(this, arguments);
//for compatibility with dataNode API
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/helpers/LzState.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/helpers/LzState.js
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/helpers/LzState.js
2008-03-24 15:50:15 UTC (rev 8367)
@@ -330,7 +330,7 @@
* application to the parent (and pass the ones that do apply to the
* state on to your superclass).
*/
-override function __LZstoreRefs ( refs, prop ){
+function __LZstoreRefs ( refs, prop ){
var parrefs = {};
var myrefs = {};
@@ -361,7 +361,7 @@
* application to the parent (and pass the ones that do apply to the
* state on to your superclass).
*/
-override function __LZstoreDelegates ( delarr, ignore = null ){
+function __LZstoreDelegates ( delarr, ignore = null ){
var pardels = [];
var mydels = [];
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.lzs
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LaszloView.lzs
2008-03-24 15:50:15 UTC (rev 8367)
@@ -84,7 +84,6 @@
var _width:Number;
var _y:Number;
var _x:Number;
- var _resource;
var __LZhaser;
/** Event called when this view adds a subview
@@ -570,12 +569,6 @@
*/
function $lzc$set_bgcolor(v) { this.setBGColor(v) }
-/** Sets the name of this views resource, or the URL from which it should
- * be loaded.
- * @type String
- */
-var resource;
-
/** 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.
@@ -738,9 +731,8 @@
/** @access private */
var __LZvizO = true;
+
/** @access private */
-var __LZvizDat = true;
-/** @access private */
var __LZvizLoad= true;
/**
@@ -947,7 +939,7 @@
* application, and attached to this view.
* @lzxtype string
*/
-var resource = null;
+var resource:String = null;
/**
* The width of the resource that this view attached
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/Library.lzs
2008-03-24 15:50:15 UTC (rev 8367)
@@ -7,9 +7,11 @@
* @access private
*/
+
+#include "views/LaszloView.lzs"
+
+
if($swf9) {
-
- #include "views/LaszloView.js"
#include "views/LzViewLinkage.js"
#include "views/LzText.js"
#include "views/LzInputText.js"
@@ -18,7 +20,6 @@
} else {
- #include "views/LaszloView.lzs"
#include "views/LzViewLinkage.lzs"
#include "views/LzText.lzs"
#include "views/LzInputText.lzs"
Modified: openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
===================================================================
--- openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
2008-03-24 15:12:38 UTC (rev 8366)
+++ openlaszlo/branches/devildog/WEB-INF/lps/lfc/views/LzText.js
2008-03-24 15:50:15 UTC (rev 8367)
@@ -376,7 +376,7 @@
* Get a reference to the control mc (overridden from LzView)
* @access private
*/
-function getMCRef () {
+override function getMCRef () {
return this.tsprite.getMCRef();
// return this.__LZtextclip;
}
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
