Mercurial > hg > webaudioevaluationtool

changeset 2821:a39750ca3954

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Fri, 05 May 2017 10:22:01 +0100
parents c241f0aee8a4 (current diff) 058f270e6d4d (diff)
children 8451aaf83c43
files
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/ape.js	Fri Apr 28 12:21:05 2017 +0100
+++ b/interfaces/ape.js	Fri May 05 10:22:01 2017 +0100
@@ -655,7 +655,9 @@
         var obj = [];
         $(this.trackSliderObjects).each(function (i, trackObj) {
             var node = storage.document.createElement('value');
-            node.setAttribute("interface-name", trackObj.getAttribute("interface-name"));
+            if (trackObj.getAttribute("interface-name") !== "null") {
+                node.setAttribute("interface-name", trackObj.getAttribute("interface-name"));
+            }
             node.textContent = convSliderPosToRate(trackObj);
             obj.push(node);
         });
@@ -847,7 +849,9 @@
                 for (var j = 0; j < mrnodes.length; j++) {
                     var name = mrnodes[j].getAttribute("name");
                     if (name == "elementTracker" || name == "elementTrackerFull" || name == "elementInitialPosition" || name == "elementFlagMoved") {
-                        mrnodes[j].setAttribute("interface-name", interfaceContext.interfaceSliders[k].name);
+                        if (interfaceContext.interfaceSliders[k].name !== null) {
+                            mrnodes[j].setAttribute("interface-name", interfaceContext.interfaceSliders[k].name);
+                        }
                         mrnodes[j].setAttribute("interface-id", k);
                     }
                 }