Generalize https redirect

codefrau · Nov 24, 2015 · b66d67a · b66d67a
1 parent 8b94c87
commit b66d67a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/etoys/etoys.js b/etoys/etoys.js
@@ -20,10 +20,6 @@
  * THE SOFTWARE.
  */
 
-// KLUDGE until freudenbergs.de supports https:
-if (location.protocol == 'https:')
-    location.protocol = 'http:';
-
 var fullscreen = navigator.standalone;
 
 window.onload = function() {

diff --git a/scratch/scratch.js b/scratch/scratch.js
@@ -20,10 +20,6 @@
  * THE SOFTWARE.
  */
 
-// KLUDGE until freudenbergs.de supports https:
-if (location.protocol == 'https:')
-    location.protocol = 'http:';
-
 var fullscreen = navigator.standalone;
 
 window.onload = function() {

diff --git a/squeak.js b/squeak.js
@@ -805,6 +805,11 @@ SqueakJS.runSqueak = function(imageUrl, canvas, options) {
     processOptions(options);
     if (options.image) imageUrl = options.image;
     else options.image = imageUrl;
+    if (imageUrl.match(/^http:/) && location.protocol == 'https:') {
+        location.protocol == 'http:';
+        alert('Redirecting to "http:" for fetching "' + imageUrl + '"');
+        return
+    }
     SqueakJS.options = options;
     SqueakJS.appName = options.appName || imageUrl.replace(/.*\//, "").replace(/\.image$/, "");
     Squeak.fsck();