[Laszlo-checkins] r13795 - openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml

[max@openlaszlo.org]

Author: max
Date: 2009-05-01 21:28:01 -0700 (Fri, 01 May 2009)
New Revision: 13795

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzBrowserKernel.lzs
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
Log:
Change 20090501-maxcarlson-N by maxcarlson at Bank on 2009-05-01 21:06:02 PDT
    in /Users/maxcarlson/openlaszlo/trunk-clean
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix early lz.Browser.getLoadURL() calls

Bugs Fixed: LPP-8145 - DHTML: lz.Browser.getLoadURL() fails if called too early

Technical Reviewer: hminsky
QA Reviewer: ptw

Details: LzSprite - Add comment to keep LzBrowserKernel.getLoadURL() in sync with the root sprite initialization.

LzBrowserKernel - If LzSprite.__rootSprite._url isn't there, use lz.embed.__propcache.url

Tests: Profiling in DHTML no longer warns in firebug or breaks in IE.



Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzBrowserKernel.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzBrowserKernel.lzs	2009-05-02 04:08:21 UTC (rev 13794)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzBrowserKernel.lzs	2009-05-02 04:28:01 UTC (rev 13795)
@@ -113,7 +113,12 @@
   */
 static function getLoadURL () {
     // get url app was loaded from
-    var url = LzSprite.__rootSprite._url;
+    if (LzSprite.__rootSprite && LzSprite.__rootSprite._url) {
+        var url = LzSprite.__rootSprite._url;
+    } else {
+        // if the canvas sprite is not initted yet.
+        var url = lz.embed.__propcache.url;
+    }
     if (! url) url = new String(window.location);
     var colon = url.indexOf(':');
     var slash = url.indexOf('/');

Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js	2009-05-02 04:08:21 UTC (rev 13794)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/dhtml/LzSprite.js	2009-05-02 04:28:01 UTC (rev 13795)
@@ -67,6 +67,7 @@
             this._id = p.id;
         }
         if (p.url) {
+            //also see LzBrowserKernel.getLoadURL()
             this._url = p.url;
         }
         if (p.cancelkeyboardcontrol) {