Changeset 84506a in indico

Timestamp:

03/16/11 18:44:26 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

bb77c9

Parents:

63bc1c

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (03/16/11 18:33:45)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/16/11 18:44:26)

Message:

[REF] Get rid of some obsolete Secure url stuff

Location:

indico

Files:

• MaKaC/webinterface/tpls/js/vars.js.tpl (modified) (1 diff)
• MaKaC/webinterface/urlHandlers.py (modified) (1 diff)
• htdocs/js/indico/Core/Components.js (modified) (2 diffs)

indico/MaKaC/webinterface/tpls/js/vars.js.tpl

@@ -95 +95 @@
     Urls: {
         JsonRpcService: "<%= urlHandlers.UHJsonRpcService.getURL() %>",
-        SecureJsonRpcService: "<%= urlHandlers.UHSecureJsonRpcService.getURL() %>",
 
         ImagesBase: "<%= Config.getInstance().getImagesBaseURL() %>",

indico/MaKaC/webinterface/urlHandlers.py

@@ -4246 +4246 @@
     _relativeURL = "services/json-rpc"
 
-class UHSecureJsonRpcService (SecureURLHandler):
-    _relativeURL = "services/json-rpc"
-
 class UHJavascriptCalendar (URLHandler):
     _relativeURL = "js/calendar/calendar.js"

indico/htdocs/js/indico/Core/Components.js

@@ -16 +16 @@
 
 if (location.protocol == "https:") {
-    indicoSource = curry(jsonRpcValue, Indico.Urls.SecureJsonRpcService);
-    indicoRequest = curry(jsonRpc, Indico.Urls.SecureJsonRpcService);
-    imageSrc = imageFunctionGenerator(Indico.Urls.SecureImagesBase);
-
     function fixUrls(urls) {
         for(var key in urls) {
@@ -28 +24 @@
             }
 
-            // skip if the url starts with https
+            // skip if the url starts with https or it's ImagesBase
             if(urls[key].indexOf('https:') === 0) {
                 continue;
             }
 
-            urls[key] = urls[key].replace(/^http:/, 'https:');
+            if(urls['Secure' + key]) {
+                // we alraedy have a secure url, e.g. for ImageBase
+                urls[key] = urls['Secure' + key];
+            }
+            else {
+                urls[key] = urls[key].replace(/^http:/, 'https:');
+            }
         }
     }
 
     fixUrls(Indico.Urls);
-} else {
-    indicoSource = curry(jsonRpcValue, Indico.Urls.JsonRpcService);
-    indicoRequest = curry(jsonRpc, Indico.Urls.JsonRpcService);
-    imageSrc = imageFunctionGenerator(Indico.Urls.ImagesBase);
 }
+
+indicoSource = curry(jsonRpcValue, Indico.Urls.JsonRpcService);
+indicoRequest = curry(jsonRpc, Indico.Urls.JsonRpcService);
+imageSrc = imageFunctionGenerator(Indico.Urls.ImagesBase);