Changeset 6981

Timestamp:

01/04/07 14:36:01 (23 months ago)

Author:

jburke

Message:

Fixes #2274: allow modules that use iframes to have djConfig overrides to specify local file paths. Also made it so that if using iframe_history.html, you can pass init args via fragment identifiers so iframe_history.html can be more easily cached.

Location:

trunk

Files:

• iframe_history.html (modified) (4 diffs)
• src/io/IframeIO.js (modified) (1 diff)
• src/undo/browser.js (modified) (3 diffs)
• src/widget/RichText.js (modified) (1 diff)

trunk/iframe_history.html

@@ -11 +11 @@
         var domain = "";
         // document.domain = "localhost";
-        function init(){
-                // parse the query string if there is one to try to get args that
-                // we can act on
-                var sparams = document.location.search;
-                if(sparams.length >= 0){
-                        if(sparams.charAt(0) == "?"){
-                                sparams = sparams.substring(1);
-                        }
+        
+        function defineParams(sparams){
+                if(sparams){
                         var ss = (sparams.indexOf("&") >= 0) ? "&" : "&";
                         sparams = sparams.split(ss);
@@ -28 +23 @@
                         }
                 }
+        }
+        
+        function init(){
+                // parse the query string if there is one to try to get params that
+                // we can act on. Also allow params to be in a fragment identifier.
+                var query = null;
+                var frag = null;
+                var url = document.location.href;
+                var hashIndex = url.indexOf("#");
+                
+                //Extract fragment identifier
+                if(hashIndex != -1){
+                        frag = url.substring(hashIndex + 1, url.length);
+                        url = url.substring(0, hashIndex);
+                }
+
+                //Extract querystring
+                var parts = url.split("?");
+                if(parts.length == 2){
+                        query = parts[1];
+                }
+
+                defineParams(query);
+                defineParams(frag);
 
                 if(noInit){ return; }
@@ -33 +52 @@
                         document.domain = domain;
                 }
-                if((window.parent != window)&&(window.parent["dojo"])){
+                var hasParentDojo = false;
+                try{
+                        hasParentDojo = window.parent != window && window.parent["dojo"];
+                }catch(e){
+                        alert("Initializing iframe_history.html failed. If you are using a cross-domain Dojo build,"
+                                + " please save iframe_history.html to your domain and set djConfig.dojoIframeHistoryUrl"
+                                + " to the path on your domain to iframe_history.html");
+                        throw e;
+                }
+
+                if(hasParentDojo){
                         //Set the page title so IE history shows up with a somewhat correct name.
                         document.title = window.parent.document.title;
@@ -43 +72 @@
                         }
                 }
+
         }
         // -->

trunk/src/io/IframeIO.js

@@ -19 +19 @@
         var r = dojo.render.html;
         var cframe = null;
-        var turi = uri||dojo.uri.moduleUri("dojo", "../iframe_history.html?noInit=true");
+        var turi = uri;
+        if(!turi){
+                if(djConfig["useXDomain"] && !djConfig["dojoIframeHistoryUrl"]){
+                        dojo.debug("dojo.io.createIFrame: When using cross-domain Dojo builds,"
+                                + " please save iframe_history.html to your domain and set djConfig.dojoIframeHistoryUrl"
+                                + " to the path on your domain to iframe_history.html");
+                }
+                turi = (djConfig["dojoIframeHistoryUrl"]||dojo.uri.moduleUri("dojo", "../iframe_history.html")) + "#noInit=true";
+        }
         var ifrstr = ((r.ie)&&(dojo.render.os.win)) ? '<iframe name="'+fname+'" src="'+turi+'" onload="'+onloadstr+'">' : 'iframe';
         cframe = document.createElement(ifrstr);

trunk/src/undo/browser.js

@@ -4 +4 @@
 try{
         if((!djConfig["preventBackButtonFix"])&&(!dojo.hostenv.post_load_)){
-                document.write("<iframe style='border: 0px; width: 1px; height: 1px; position: absolute; bottom: 0px; right: 0px; visibility: visible;' name='djhistory' id='djhistory' src='"+(dojo.hostenv.getBaseScriptUri()+'iframe_history.html')+"'></iframe>");
+                document.write("<iframe style='border: 0px; width: 1px; height: 1px; position: absolute; bottom: 0px; right: 0px; visibility: visible;' name='djhistory' id='djhistory' src='" + (djConfig["dojoIframeHistoryUrl"] || dojo.hostenv.getBaseScriptUri()+'iframe_history.html') + "'></iframe>");
         }
 }catch(e){/* squelch */}
@@ -97 +97 @@
                 var url = null;
                 if(!this.historyIframe){
+                        if(djConfig["useXDomain"] && !djConfig["dojoIframeHistoryUrl"]){
+                                dojo.debug("dojo.undo.browser: When using cross-domain Dojo builds,"
+                                        + " please save iframe_history.html to your domain and set djConfig.dojoIframeHistoryUrl"
+                                        + " to the path on your domain to iframe_history.html");
+                        }
                         this.historyIframe = window.frames["djhistory"];
                 }
@@ -305 +310 @@
         _loadIframeHistory: function(){
                 //summary: private method. Do not call this directly.
-                var url = dojo.hostenv.getBaseScriptUri()+"iframe_history.html?"+(new Date()).getTime();
+                var url = (djConfig["dojoIframeHistoryUrl"] || dojo.hostenv.getBaseScriptUri()+'iframe_history.html')
+                        + "?" + (new Date()).getTime();
                 this.moveForward = true;
                 dojo.io.setIFrameSrc(this.historyIframe, url, false);   

trunk/src/widget/RichText.js

@@ -511 +511 @@
                         }
                         // opera likes this to be outside the with block
-                        this.iframe.src = dojo.uri.moduleUri("dojo", "widget/templates/richtextframe.html") + ((dojo.doc().domain != currentDomain) ? ("#"+dojo.doc().domain) : "");
+                        if(djConfig["useXDomain"] && !djConfig["dojoRichTextFrameUrl"]){
+                                dojo.debug("dojo.widget.RichText: When using cross-domain Dojo builds,"
+                                        + " please save src/widget/templates/richtextframe.html to your domain and set djConfig.dojoRichTextFrameUrl"
+                                        + " to the path on your domain to richtextframe.html");
+                        }
+                        this.iframe.src = (djConfig["dojoRichTextFrameUrl"] || dojo.uri.moduleUri("dojo", "widget/templates/richtextframe.html")) 
+                                + ((dojo.doc().domain != currentDomain) ? ("#"+dojo.doc().domain) : "");
                         this.iframe.width = this.inheritWidth ? this._oldWidth : "100%";
                         if(this.height){