Mercurial > hg > webaudioevaluationtool

changeset 2969:6e51b9734eab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SessionKey refactor typos
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Fri, 12 Jan 2018 13:17:09 +0000
parents d9121773632d
children 6cfb6c49c331
files js/core.js
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Fri Jan 12 13:15:21 2018 +0000
+++ b/js/core.js	Fri Jan 12 13:17:09 2018 +0000
@@ -3719,12 +3719,13 @@
         }
 
         var requestChains = null;
+        var sessionKey = null;
         var object = {};
 
         Object.defineProperties(object, {
             "key": {
                 "get": function () {
-                    return key;
+                    return sessionKey;
                 },
                 "set": function (a) {
                     throw ("Cannot set read-only property")
@@ -3740,7 +3741,7 @@
                 "value": function () {
                     requestChains = keyPromise().then(function (response) {
                         function throwerror() {
-                            key = null;
+                            sessionKey = null;
                             throw ("An unspecified error occured, no server key could be generated");
                         }
                         var parse = new DOMParser();
@@ -3750,15 +3751,15 @@
                         }
                         if (xml.getElementsByTagName("state").length > 0) {
                             if (xml.getElementsByTagName("state")[0].textContent == "OK") {
-                                key = xml.getAllElementsByTagName("key")[0].textContent;
+                                sessionKey = xml.getAllElementsByTagName("key")[0].textContent;
                                 this.parent.root.setAttribute("key", this.key);
                                 this.parent.root.setAttribute("state", "empty");
                                 this.update();
                                 return (true);
                             } else if (xml.getElementsByTagName("state")[0].textContent == "ERROR") {
-                                key = null;
+                                sessionKey = null;
                                 console.error("Could not generate server key. Server responded with error message: \"" + xml.getElementsByTagName("message")[0].textContent + "\"");
-                                return (true);
+                                return (false);
                             }
                         } else {
                             throwerror();