Author: max
Date: 2007-08-06 19:38:56 -0700 (Mon, 06 Aug 2007)
New Revision: 5951
Modified:
openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/core/LzNode.lzs
Log:
Change 20070806-maxcarlson-l by [EMAIL PROTECTED] on 2007-08-06 18:53:14 PDT
in /Users/maxcarlson/openlaszlo/wafflecone
for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone
Summary: Only set style constraints if the existing value is null
New Features:
Bugs Fixed: LPP-2894 - CSS: subclasses and instances can't override style
constraints set on superclass*
Technical Reviewer: promanik
QA Reviewer: ben, ptw
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details: LzNode.lzs - Only set styleConstraints[k] if this[k] is null.
Tests:
http://localhost:8080/wafflecone/test/style/constraints/main.lzx?lzr=swf8 now
passes.
Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/core/LzNode.lzs
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/core/LzNode.lzs
2007-08-07 01:57:02 UTC (rev 5950)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/lfc/core/LzNode.lzs
2007-08-07 02:38:56 UTC (rev 5951)
@@ -514,7 +514,10 @@
if (! (k in initialArgs)) {
// A style that is a function is a constraint
if (v instanceof Function) {
- styleConstraints[k] = v;
+ if (this[k] == null) {
+// Debug.warn("setting %w[%w] to %w, was %w", this, k, v,
this[k]);
+ styleConstraints[k] = v;
+ }
} else {
// Debug.format("%w[%s] (%#w) %#w -> %#w", this, k,
stylemap[k], this.k, v);
if (v != null) this.setAttribute(k, v);
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
