[Laszlo-checkins] r10938 - in openlaszlo/trunk: WEB-INF/lps/lfc/kernel/swf/dojo/flash8 lps/includes/source

[max@openlaszlo.org]

Author: max
Date: 2008-09-09 17:39:06 -0700 (Tue, 09 Sep 2008)
New Revision: 10938

Modified:
   openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/dojo/flash8/ExpressInstall.as
   openlaszlo/trunk/lps/includes/source/flash.js
Log:
Change 20080909-maxcarlson-l by maxcarlson at Bank on 2008-09-09 14:16:20 PDT
    in /Users/maxcarlson/openlaszlo/trunk-clean
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix Flash player updating behavior in Firefox

Bugs Fixed: LPP-6856 -  Flash upgrade process is broken in Firefox

Technical Reviewer: promanik
QA Reviewer: lhenrywilkins at laszlosystems.com

Details: ExpressInstall.as - Pass install status through to z.embed.dojo.installer._onInstallStatus() for processing.

flash.js - Clean up global lookups.  Comment out cruft.  Only reload the page if we're in IE - other browsers display a message asking the user to close the browser window.

Tests: See LPP-6856



Modified: openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/dojo/flash8/ExpressInstall.as
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/dojo/flash8/ExpressInstall.as	2008-09-09 23:03:57 UTC (rev 10937)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/kernel/swf/dojo/flash8/ExpressInstall.as	2008-09-10 00:39:06 UTC (rev 10938)
@@ -79,17 +79,9 @@
 		this.hold.startUpdate();
 	}
 
-	function callBack(msg = 'Download.Failed'){
+	function onInstallStatus(msg){
         //Debug.write('callBack', "javascript:lz.embed.dojo.installer._onInstallStatus('"+msg+"')");
         _root.getURL("javascript:lz.embed.dojo.installer._onInstallStatus('"+msg+"')");
-    }
-
-	function onInstallStatus(msg){
-        if (msg == 'Download.Complete') {
-            _root.getURL(_root.MMredirectURL);
-        } else {
-            this.callBack(msg);
-        }
 	}
 }
 

Modified: openlaszlo/trunk/lps/includes/source/flash.js
===================================================================
--- openlaszlo/trunk/lps/includes/source/flash.js	2008-09-09 23:03:57 UTC (rev 10937)
+++ openlaszlo/trunk/lps/includes/source/flash.js	2008-09-10 00:39:06 UTC (rev 10938)
@@ -569,10 +569,11 @@
     
     _detectVersion: function(){
         var versionStr;
+        var isIE = lz.embed.browser.isIE;
         
         // loop backwards through the versions until we find the newest version    
         for(var testVersion = 25; testVersion > 0; testVersion--){
-            if(lz.embed.browser.isIE){
+            if(isIE){
                 versionStr = VBGetSwfVer(testVersion);
             }else{
                 versionStr = this._JSFlashInfo(testVersion);        
@@ -583,7 +584,7 @@
                 return;
             }else if(versionStr != 0){
                 var versionArray;
-                if(lz.embed.browser.isIE){
+                if(isIE){
                     var tempArray = versionStr.split(" ");
                     var tempString = tempArray[1];
                     versionArray = tempString.split(",");
@@ -648,19 +649,22 @@
             return;
         }
         
+        /*
         // detect if the user has over-ridden the default flash version
-        if (typeof lz.embed.options["forceFlashComm"] != "undefined" &&
-                typeof lz.embed.options["forceFlashComm"] != null){
-            this.commVersion = lz.embed.options["forceFlashComm"];
+        if (typeof embed.options["forceFlashComm"] != "undefined" &&
+                typeof embed.options["forceFlashComm"] != null){
+            this.commVersion = embed.options["forceFlashComm"];
             return;
         }
+        */
         
         // 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
-        if(lz.embed.browser.isSafari == true || lz.embed.browser.isOpera == true){
+        if(browser.isSafari == true || browser.isOpera == true){
             this.commVersion = 8;
         }else{
             this.commVersion = 6;
@@ -748,7 +752,9 @@
                         + '://www.macromedia.com/go/getflashplayer">';
         }else{ // Flash 8
         */
-            if (flashVer > lz.embed.dojo.version) doExpressInstall = true;
+
+            var embed = lz.embed;
+            if (flashVer > embed.dojo.version) doExpressInstall = true;
             swfloc = this.properties.flash8;
             var swflocObjectVars = this.properties.flashvars;
             var swflocEmbedVars = this.properties.flashvars;
@@ -764,7 +770,7 @@
                                 + "&MMplayerType=PlugIn";
             }
 
-            if (lz.embed.browser.isIE) {
+            if (embed.browser.isIE) {
                 objectHTML =
                 '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" '
                   + 'codebase="'
@@ -1329,7 +1335,9 @@
     _onInstallStatus: function(msg){
         if (msg == "Download.Complete"){
             // Installation is complete.
-            lz.embed.dojo._initialize();
+            if (lz.embed.browser.isIE) {
+                top.location = top.location + '';
+            }
         }else if(msg == "Download.Cancelled"){
             alert("This content requires a more recent version of the Macromedia "
                         +" Flash Player.");