Changeset 4190

Timestamp:

05/26/06 15:10:40 (2 years ago)

Author:

BradNeuberg

Message:

We now load flash resources relative to dojo path, rather than hard code to ../..

Location:

trunk

Files:

• src/flash.js (modified) (4 diffs)
• src/flash/flash6/DojoExternalInterface.as (modified) (4 diffs)
• src/flash/flash8/DojoExternalInterface.as (modified) (3 diffs)
• src/storage/Storage.as (modified) (4 diffs)
• Storage_version6.swf (modified) (previous)
• Storage_version8.swf (modified) (previous)
• tests/flash/resources/HelloWorld_version6.swf (modified) (previous)
• tests/flash/resources/HelloWorld_version8.swf (modified) (previous)
• tests/flash/resources/UnitTestsComm_version6.swf (modified) (previous)
• tests/flash/resources/UnitTestsComm_version8.swf (modified) (previous)

trunk/src/flash.js

@@ -380 +380 @@
          //dojo.debug("installing");
          if(dojo.flash._installingListeners.length > 0){
-                        for(var i = 0;i < dojo.flash._installingListeners.length; i++){
+                        for(var i = 0; i < dojo.flash._installingListeners.length; i++){
                                 dojo.flash._installingListeners[i].call(null);
                         }
@@ -667 +667 @@
                 }else{ // Flash 8
                         swfloc = dojo.flash.flash8_version;
-                        var swflocObject = swfloc, swflocEmbed = swfloc;
+                        var swflocObject = swfloc;
+                        var swflocEmbed = swfloc;
+                        var dojoPath = djConfig.baseRelativePath;
                         if(doExpressInstall){
                                 // the location to redirect to after installing
@@ -675 +677 @@
                                 swflocObject += "?MMredirectURL=" + redirectURL
                                                 + "&MMplayerType=ActiveX"
-                                                + "&MMdoctitle="+docTitle;
-                                swflocEmbed += "?MMredirectURL=" + redirectURL + "&MMplayerType=PlugIn";
+                                                + "&MMdoctitle=" + docTitle
+                                                                + "&baseRelativePath=" + escape(dojoPath);
+                                swflocEmbed += "?MMredirectURL=" + redirectURL 
+                                                                + "&MMplayerType=PlugIn"
+                                                                + "&baseRelativePath=" + escape(dojoPath);
                         }
                         
@@ -700 +705 @@
                                   + 'align="middle" '
                                   + 'allowScriptAccess="sameDomain" '
-                                  + 'type="application/x-shockwave-flash" '
+                                  + 'type="application/x-shockwave-flash" '+ "&baseRelativePath=" + escape(dojoPath);
                                   + 'pluginspage="http://www.macromedia.com/go/getflashplayer" />'
                                 + '</object>';

trunk/src/flash/flash6/DojoExternalInterface.as

@@ -8 +8 @@
 class DojoExternalInterface{
         public static var available:Boolean;
+        public static var dojoPath = "";
+        
         public static var _fscommandReady = false;
         public static var _callbacks = new Array();
@@ -15 +17 @@
                 // FIXME: Set available variable by testing for capabilities
                 DojoExternalInterface.available = true;
+                
+                // extract the dojo base path
+                DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath();
+                //getURL("javascript:dojo.debug('FLASH:dojoPath="+DojoExternalInterface.dojoPath+"')");
                 
                 // Sometimes, on IE, the fscommand infrastructure can take a few hundred
@@ -176 +182 @@
         public static function _initializeFlashRunner(){
                 // figure out where our Flash movie is
-                var swfLoc = "../..";
-                if(swfLoc.charAt(swfLoc.length - 1) != '/'){
-                        swfLoc = swfLoc + "/";
-                }
-                swfLoc = swfLoc + "flash6_gateway.swf";
+                var swfLoc = DojoExternalInterface.dojoPath + "flash6_gateway.swf";
                 
                 // load our gateway helper file
@@ -187 +189 @@
                 _root._flashRunner.loadMovie(swfLoc);
         }
+        
+        private static function getDojoPath(){
+                var url = _root._url;
+                var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length;
+                var path = url.substring(start);
+                var end = path.indexOf("&");
+                if(end != -1){
+                        path = path.substring(0, end);
+                }
+                return path;
+        }
 }
 

trunk/src/flash/flash8/DojoExternalInterface.as

@@ -18 +18 @@
 class DojoExternalInterface{
         public static var available:Boolean;
+        public static var dojoPath = "";
         
         private static var flashMethods:Array = new Array();
@@ -25 +26 @@
         
         public static function initialize(){
+                // extract the dojo base path
+                DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath();
+                
                 // see if we need to do an express install
                 var install:ExpressInstall = new ExpressInstall();
@@ -205 +209 @@
                 return inputStr;
         }
+        
+        private static function getDojoPath(){
+                var url = _root._url;
+                var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length;
+                var path = url.substring(start);
+                var end = path.indexOf("&");
+                if(end != -1){
+                        path = path.substring(0, end);
+                }
+                return path;
+        }
 }
 

trunk/src/storage/Storage.as

@@ -9 +9 @@
         
         public function Storage(){
+                //getURL("javascript:dojo.debug('FLASH:Storage constructor')");
                 DojoExternalInterface.initialize();
                 DojoExternalInterface.addCallback("put", this, put);
@@ -21 +22 @@
                 // access so it is in the cache
                 _root.createEmptyMovieClip("_settingsBackground", 1);
-                _root._settingsBackground.loadMovie("../../storage_dialog.swf");
+                _root._settingsBackground.loadMovie(DojoExternalInterface.dojoPath + "storage_dialog.swf");
         }
 
@@ -88 +89 @@
                 // background that we can show a close button on.
                 _root.createEmptyMovieClip("_settingsBackground", 1);
-                _root._settingsBackground.loadMovie("../../storage_dialog.swf");
+                _root._settingsBackground.loadMovie(DojoExternalInterface.dojoPath + "storage_dialog.swf");
         }
         
@@ -108 +109 @@
                         results.push(i);        
                 
-                // join the keys together in a comma seperate string
+                // join the keys together in a comma seperated string
                 results = results.join(",");