[fusion-commits] r1619 - branches/fusion-1.1/lib

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-10-27 15:35:59 -0400 (Mon, 27 Oct 2008)
New Revision: 1619

Modified:
   branches/fusion-1.1/lib/fusion.js
Log:
re #78: also check for https as the host protocol

Modified: branches/fusion-1.1/lib/fusion.js
===================================================================
--- branches/fusion-1.1/lib/fusion.js	2008-10-27 19:26:51 UTC (rev 1618)
+++ branches/fusion-1.1/lib/fusion.js	2008-10-27 19:35:59 UTC (rev 1619)
@@ -263,8 +263,8 @@
                  */
         var test = window.location.protocol+'//'+window.location.host;
         var configUrl = 'config.json';
-        //if (this.fusionURL.indexOf(test,0) == 0) {
-        if ( ((this.fusionURL.indexOf("http://") < 0) || (this.fusionURL.indexOf(test,0) == 0)) && !(this.bForceRedirect)) {
+        if ( ( ((this.fusionURL.indexOf("http://") < 0) && (this.fusionURL.indexOf("https://") < 0)) ||
+              (this.fusionURL.indexOf(test,0) == 0) ) && !(this.bForceRedirect)) {
             this.sRedirectScript = '';
         } else {
             this.sRedirectScript = 'redirect.php';
@@ -1020,7 +1020,8 @@
                         Fusion.fusionURL = src.slice(0, index);
                         Fusion._scriptObject = scripts[i];
                         
-                if (Fusion.fusionURL.indexOf("http://")<0) {
+                if ( (Fusion.fusionURL.indexOf("http://")<0) && 
+                     (Fusion.fusionURL.indexOf("https://")<0) ) {
                   if (Fusion.fusionURL.slice(0,1) == "/") {
                     Fusion.fusionURL = window.location.protocol + "//" + window.location.host + Fusion.fusionURL;
                   } else {