[Laszlo-checkins] r12306 - in openlaszlo/branches/4.2: . WEB-INF/lps/lfc/kernel/dhtml WEB-INF/lps/lfc/kernel/swf9 lps/includes/source
ptw@openlaszlo.org
ptw at openlaszlo.org
Mon Jan 5 16:06:35 PST 2009
Author: ptw
Date: 2009-01-05 16:06:31 -0800 (Mon, 05 Jan 2009)
New Revision: 12306
Modified:
openlaszlo/branches/4.2/
openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/LzXMLTranslator.js
openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzInputTextSprite.as
openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzXMLTranslator.as
openlaszlo/branches/4.2/lps/includes/source/embednew.js
openlaszlo/branches/4.2/lps/includes/source/flash.js
Log:
Merged revisions 12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
.......
r12251 | max | 2008-12-28 08:26:11 -0500 (Sun, 28 Dec 2008) | 18 lines
Change 20081227-maxcarlson-H by maxcarlson at Bank.lan on 2008-12-27 21:41:58 PST
in /Users/maxcarlson/openlaszlo/trunk-clean
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Allow default runtime for Flash to be any version
Bugs Fixed: LPP-7515 - compiler.runtime.default=swf9 seems to be not working
Technical Reviewer: andre.bargull at udo.edu
QA Reviewer: promanik
Details: Now that we no longer support swf6/7, the lzr argument isn't required in the URL/filename.
embednew.js, flash.js - Comment out lzr=swfx versioning code.
Tests: See LPP-7515
.......
r12271 | bargull | 2008-12-30 17:21:03 -0500 (Tue, 30 Dec 2008) | 26 lines
Change 20081230-bargull-Pvj by bargull at dell--p4--2-53 on 2008-12-30 17:00:14
in /home/Admin/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: add implicit null-ownerDocument/parentNode
New Features:
Bugs Fixed: LPP-7537
Technical Reviewer: hminsky
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Create a new, empty data-element and make it the parent of the parsed data-element.
Tests:
see bugreport
.......
r12285 | bargull | 2009-01-02 11:41:03 -0500 (Fri, 02 Jan 2009) | 27 lines
Change 20081229-bargull-zLj by bargull at dell--p4--2-53 on 2008-12-29 18:19:52
in /home/Admin/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: implement "setHTML()" for swf9
New Features:
Bugs Fixed: LPP-7533
Technical Reviewer: hminsky
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Moved definition of "setHTML" from LzInputTextSprite to LzTextSprite (will be required for LPP-6617),
and added "html"-flag to LzTextSprite (Flash TextField hasn't got this flag anymore in AS3), if this flag is set, use "TextField#htmlText", otherwise "TextField#text" to set new text.
Tests:
see bugreport
.......
Property changes on: openlaszlo/branches/4.2
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208
+ /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285
Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/LzXMLTranslator.js
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/LzXMLTranslator.js 2009-01-06 00:05:14 UTC (rev 12305)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/dhtml/LzXMLTranslator.js 2009-01-06 00:06:31 UTC (rev 12306)
@@ -1,7 +1,7 @@
/**
* LzXMLTranslator.js
*
- * @copyright Copyright 2006-2008 Laszlo Systems, Inc. All Rights Reserved.
+ * @copyright Copyright 2006-2009 Laszlo Systems, Inc. All Rights Reserved.
* Use is subject to license terms.
*
* @topic Kernel
@@ -18,7 +18,10 @@
stringTrimPat: new RegExp("^\\s+|\\s+$", "g"),
copyXML: function (xmldoc, trimwhitespace, nsprefix) {
- return this.copyBrowserXML(xmldoc, true, trimwhitespace, nsprefix);
+ var lfcnode = this.copyBrowserXML(xmldoc, true, trimwhitespace, nsprefix);
+ // create a new, empty ownerDocument (LPP-7537)
+ new LzDataElement(null, {}, [lfcnode]);
+ return lfcnode;
},
copyBrowserXML: function (node, ignorewhite, trimwhite, nsprefix) {
Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzInputTextSprite.as
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzInputTextSprite.as 2009-01-06 00:05:14 UTC (rev 12305)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzInputTextSprite.as 2009-01-06 00:06:31 UTC (rev 12306)
@@ -1,7 +1,7 @@
/**
* LzInputTextSprite.as
*
- * @copyright Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved.
+ * @copyright Copyright 2001-2009 Laszlo Systems, Inc. All Rights Reserved.
* Use is subject to license terms.
*
* @topic Kernel
@@ -166,13 +166,6 @@
}
}
- /**
- * Set the html flag on this text view
- */
- function setHTML (htmlp) :void {
- // TODO [hqm 2008-10] what do we do here?
- }
-
override public function getTextfieldHeight () {
return this.textfield.height;
}
Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as 2009-01-06 00:05:14 UTC (rev 12305)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as 2009-01-06 00:06:31 UTC (rev 12306)
@@ -2,7 +2,7 @@
/**
* LzTextSprite.as
*
- * @copyright Copyright 2007, 2008 Laszlo Systems, Inc. All Rights Reserved.
+ * @copyright Copyright 2007-2009 Laszlo Systems, Inc. All Rights Reserved.
* Use is subject to license terms.
*
* @topic Kernel
@@ -47,6 +47,7 @@
public var sizeToHeight:Boolean = false;
public var password:Boolean = false;
public var scrollheight:Number = 0;
+ public var html:Boolean = true;
public function LzTextSprite (newowner = null, args = null) {
super(newowner,false);
@@ -276,9 +277,24 @@
}
}
+ /**
+ * Set the html flag on this text view
+ */
+ function setHTML (htmlp:Boolean) :void {
+ // do _not_ reset text, see swf8-kernel
+ this.html = htmlp;
+ }
+
public function appendText( t:String ):void {
- this.textfield.appendText(t);
- this.text = this.textfield.text;
+ this.text += t;
+ if (! this.html) {
+ this.textfield.appendText(t);
+ } else {
+ var df:TextFormat = this.textfield.defaultTextFormat;
+ // reset textformat to workaround flash player bug (FP-77)
+ this.textfield.defaultTextFormat = df;
+ this.textfield.htmlText = this.text;
+ }
}
public function getText():String {
@@ -299,11 +315,15 @@
public function setText ( t:String ):void {
//this.textfield.cacheAsBitmap = false;
this.text = t;
- var df:TextFormat = this.textfield.defaultTextFormat;
- // reset textformat to workaround flash player bug (FP-77)
- this.textfield.defaultTextFormat = df;
- this.textfield.htmlText = t;
-
+ if (this.html) {
+ var df:TextFormat = this.textfield.defaultTextFormat;
+ // reset textformat to workaround flash player bug (FP-77)
+ this.textfield.defaultTextFormat = df;
+ this.textfield.htmlText = t;
+ } else {
+ this.textfield.text = t;
+ }
+
if (this.resize && (this.multiline == false)) {
// single line resizable fields adjust their width to match the text
var w:Number = this.getTextWidth();
Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzXMLTranslator.as
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzXMLTranslator.as 2009-01-06 00:05:14 UTC (rev 12305)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzXMLTranslator.as 2009-01-06 00:06:31 UTC (rev 12306)
@@ -1,7 +1,7 @@
/**
* LzXMLTranslator.lzs
*
- * @copyright Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved.
+ * @copyright Copyright 2001-2009 Laszlo Systems, Inc. All Rights Reserved.
* Use is subject to license terms.
*
* @topic Kernel
@@ -22,7 +22,8 @@
if (lfcnode is LzDataText) {
return null;
}
-
+ // create a new, empty ownerDocument (LPP-7537)
+ new LzDataElement(null, {}, [lfcnode]);
return (lfcnode cast LzDataElement);
}
Modified: openlaszlo/branches/4.2/lps/includes/source/embednew.js
===================================================================
--- openlaszlo/branches/4.2/lps/includes/source/embednew.js 2009-01-06 00:05:14 UTC (rev 12305)
+++ openlaszlo/branches/4.2/lps/includes/source/embednew.js 2009-01-06 00:06:31 UTC (rev 12306)
@@ -2,7 +2,7 @@
* @topic Browser
* @subtopic Integration
* @access public
- * @copyright Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved.
+ * @copyright Copyright 2001-2009 Laszlo Systems, Inc. All Rights Reserved.
* Use is subject to license terms.
*/
@@ -56,20 +56,23 @@
var url = properties.url;
- // look for version in query string
- var i = url.indexOf('lzr=swf');
- if (i == -1) {
+ /*
+ var requestVersion;
+
+ var sp = url.split('?');
+ if (sp.length == 1) {
+ // No lzr runtime arg supplied.
// add default version if missing
url += '&lzr=swf8';
- i = url.indexOf('lzr=swf');
- //alert('added version ' + url + ', ' + i);
- }
- // account for 'lzr=swf' length
- i += 7;
-
- // get LPS swf request version
- var requestVersion = url.substring(i, i + 1) * 1;
-
+ } else {
+ var queryvals = this.__parseQuery(sp[1]);
+ requestVersion = queryvals['lzr'];
+ if (requestVersion == null) {
+ requestVersion = 'swf8';
+ url += '&lzr=swf8';
+ }
+ }
+
// Check flash comm version
if (lz.embed.dojo.info.commVersion > requestVersion) {
// This should no longer be needed in a world without swf7
@@ -86,6 +89,7 @@
}
//alert(requestVersion + ', ' + minimumVersion);
+ */
var queryvals = this.__getqueryurl(url);
@@ -113,7 +117,7 @@
,bgcolor: properties.bgcolor
,wmode: properties.wmode
,flashvars: queryvals.flashvars
- ,flash6: url
+ //,flash6: url
,flash8: url
,appenddiv: lz.embed._getAppendDiv(properties.id, properties.appenddivid)
};
Modified: openlaszlo/branches/4.2/lps/includes/source/flash.js
===================================================================
--- openlaszlo/branches/4.2/lps/includes/source/flash.js 2009-01-06 00:05:14 UTC (rev 12305)
+++ openlaszlo/branches/4.2/lps/includes/source/flash.js 2009-01-06 00:06:31 UTC (rev 12306)
@@ -284,7 +284,7 @@
lz.embed.dojo = {
// Default values for embedding
defaults: {
- flash6: null,
+ //flash6: null,
flash8: null,
ready: false,
visible: true,
@@ -531,7 +531,7 @@
// 8 - We use the ExternalInterface API.
// -1 - For some reason neither method is supported, and no communication
// is possible.
- commVersion: 6,
+ commVersion: 8,
// installing: Boolean
// Set if we are in the middle of a Flash installation session.
@@ -661,6 +661,7 @@
// we prefer Flash 6 features over Flash 8, because they are much faster
// and much less buggy
+ /*
var browser = lz.embed.browser;
// at this point, we don't have a flash file to detect features on,
// so we need to instead look at the browser environment we are in
@@ -669,6 +670,7 @@
}else{
this.commVersion = 6;
}
+ */
}
};
@@ -1367,6 +1369,6 @@
lz.embed.dojo.info = new lz.embed.dojo.Info();
/* X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2009 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ******************************************************/
More information about the Laszlo-checkins
mailing list