[Laszlo-checkins] r9457 - in openlaszlo/trunk/WEB-INF/lps/lfc/kernel: swf swf9

[ptw@openlaszlo.org]

Author: ptw
Date: 2008-06-04 12:56:22 -0700 (Wed, 04 Jun 2008)
New Revision: 9457

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
Log:
Change 20080604-ptw-8 by ptw at dueling-banjos.home on 2008-06-04 14:17:58 EDT
    in /Users/ptw/OpenLaszlo/ringding-clean
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Remove stray references to $refs

Bugs Fixed:
Lpp-6043 'SWF: text-sprite looking for "$refs"'

Technical Reviewer: a.bargull at intensis.de (Message-ID: <4846E397.2060006 at intensis.de>)
QA Reviewer: hminsky (pending)

Details:
    Don't know how these slipped through.  $refs no longer exists.  If
    you are trying to figure out if an attribute is being constrained,
    you look to see if the initial value is an LzValueExpr.

Tests:
    smokecheck, ant lztest, inspection



Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as	2008-06-04 18:22:06 UTC (rev 9456)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as	2008-06-04 19:56:22 UTC (rev 9457)
@@ -100,7 +100,7 @@
     //    if  single line, use font line height
     //    else get height from flash textobject.textHeight 
     // 
-    if (args.height == null && typeof(args.$refs.height) != "function") {
+    if (args['height'] == null) {
         this.sizeToHeight = true;
         // set autoSize to get text measured
         textclip.autoSize = true;
@@ -114,7 +114,7 @@
             // we got a correct line height from flash.
             textclip.autoSize = false;
         }
-    }  else {
+    }  else if (! args.height is LzValueExpr) {
         textclip._height = args.height;
         //this.setHeight(args.height);
     }

Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as	2008-06-04 18:22:06 UTC (rev 9456)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf9/LzTextSprite.as	2008-06-04 19:56:22 UTC (rev 9457)
@@ -133,11 +133,9 @@
             // 
             if (args['height'] == null) {
                 this.sizeToHeight = true;
-            }  else {
+            } else if (! args.height is LzValueExpr) {
                 // Does setting height of the text object do the right thing in swf9?
-                if (!(args.height is LzInitExpr)) {
-                    textclip.height = args.height;
-                }
+                textclip.height = args.height;
             }
             // Default the scrollheight to the visible height.
             this.scrollheight = this.height;