Mercurial > hg > webaudioevaluationtool

changeset 2769:62ad83c6a403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into Dev_main
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Fri, 21 Apr 2017 11:22:28 +0100
parents 789ce0944e4d (current diff) 9d31ddedae2b (diff)
children 1f9773f8a49b
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Wed Apr 19 11:22:43 2017 +0100
+++ b/js/core.js	Fri Apr 21 11:22:28 2017 +0100
@@ -596,7 +596,7 @@
             } else {
                 jumpID = condition.jumpToOnFail;
             }
-            if (jumpID !== undefined) {
+            if (jumpID !== null) {
                 jumpToId.call(this, jumpID);
                 break;
             }
@@ -828,7 +828,7 @@
             }
             i++;
         }
-        processConditional.call(this, node, node.response);
+        processConditional.call(this, node, node.response.name);
         return true;
     }