changeset 2332:98033840992d

Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Wed, 04 May 2016 18:20:55 +0100
parents fc8d79f8d9c5 (current diff) ee5e2db32f7c (diff)
children eae8aebb8214
files
diffstat 1 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Wed May 04 12:21:11 2016 +0100
+++ b/js/core.js	Wed May 04 18:20:55 2016 +0100
@@ -146,17 +146,20 @@
         var search = window.location.search.split('?')[1];
         // Now split the requests into pairs
         var searchQueries = search.split('&');
+
         for (var i in searchQueries)
         {
-            // Split each request into
+            // Split each key-value pair
             searchQueries[i] = searchQueries[i].split('=');
-            switch(searchQueries[i][0]) {
-                case "url":
-                    url = decodeURI(searchQueries[i][1]);
-                    break;
-                case "returnURL":
-                    gReturnURL = decodeURI(searchQueries[i][1]);
-                    break;
+            var key = searchQueries[i][0];
+            var value = decodeURIComponent(searchQueries[i][1]);
+            switch(key) {
+            case "url":
+                url = value;
+                break;
+            case "returnURL":
+                gReturnURL = value;
+                break;
             }
         }
         loadProjectSpec(url);