[Laszlo-checkins] r12307 - in openlaszlo/branches/4.2: . WEB-INF/lps/lfc/kernel/swf9

[ptw@openlaszlo.org]

Author: ptw
Date: 2009-01-05 16:09:15 -0800 (Mon, 05 Jan 2009)
New Revision: 12307

Modified:
   openlaszlo/branches/4.2/
   openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
Log:
Merged revisions 12303 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r12303 | max | 2009-01-05 18:12:27 -0500 (Mon, 05 Jan 2009) | 16 lines
  
  Change 20090104-maxcarlson-l by maxcarlson at Bank.lan on 2009-01-04 07:28:23 PST
      in /Users/maxcarlson/openlaszlo/trunk-clean
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: UPDATED - swf9: preserve value for initial frame number for resources
  
  Bugs Fixed: LPP-7534 - The view resource frame is not working when passing it with the class tag
  
  Technical Reviewer: andre.bargull at udo.edu
  QA Reviewer: hminsky
  
  Details: Take care to preserve the initial frame number for swf assets.
  
  Tests: See both testcases in LPP-7534
.......



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,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285
   + /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,12303

Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as	2009-01-06 00:06:31 UTC (rev 12306)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf9/LzSprite.as	2009-01-06 00:09:15 UTC (rev 12307)
@@ -1,7 +1,7 @@
 /**
   * LzSprite.as
   *
-  * @copyright Copyright 2007, 2008 Laszlo Systems, Inc.  All Rights Reserved.
+  * @copyright Copyright 2007, 2008, 2009 Laszlo Systems, Inc.  All Rights Reserved.
   *            Use is subject to license terms.
   *
   * @topic Kernel
@@ -987,12 +987,12 @@
 
               // Frames are one based not zero based
               var frames:Array = resinfo.frames;
+              var origfn = fn;
               if (fn == null || fn < 1) {
-                  fn = 1;
+                  origfn = fn = 1;
               } else if (fn > frames.length) {
                   fn = frames.length;
               }
-              this.frame = fn;
               var framenumber:int = fn - 1;
 
               var assetclass:Class;
@@ -1020,6 +1020,8 @@
 
                   var oRect:Rectangle = asset.getBounds( asset );
                   if (oRect.width == 0 || oRect.height == 0) {
+                      // store the frame number passed in to prevent it from being reset
+                      this.frame = origfn;
                       // it can take a while for new resources to show up.  Call back on the next frame, when we have a valid size.
                       LzIdleKernel.addCallback(this, '__resetframe');
                       return;
@@ -1050,6 +1052,9 @@
                         this.totalframes = this.loaderMC.totalFrames;
                         this.loaderMC.gotoAndStop(fn);
                     }
+                  } else {
+                    // Set later, to prevent movieclip resources from being forced to frame 1 - see LPP-7534
+                    this.frame = fn;
                   }
               } else {
                   // bad resource?