Mercurial > hg > webaudioevaluationtool

changeset 2240:f80f7b713a7c

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, 15 Apr 2016 16:21:07 +0100
parents 8dd13f279c32 (current diff) 27f3cbb3a960 (diff)
children d052405e29e2
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test_create/attributes.json	Fri Apr 15 15:22:03 2016 +0100
+++ b/test_create/attributes.json	Fri Apr 15 16:21:07 2016 +0100
@@ -23,5 +23,8 @@
     "label": "Label",
     "calibration": "Perform Calibration",
     "preSilence": "Pre Silence",
-    "postSilence": "Post Silence"
+    "postSilence": "Post Silence",
+    "poolSize": "Pool Size",
+    "alwaysInclude": "Always Include",
+    "crossFade": "Cross Fade"
 }
--- a/test_create/test_core.js	Fri Apr 15 15:22:03 2016 +0100
+++ b/test_create/test_core.js	Fri Apr 15 16:21:07 2016 +0100
@@ -1248,7 +1248,8 @@
                 value = this.default;
             }
             if (this.input.type == "checkbox") {
-                this.input.checked = value;
+                if (value == "true" || value == "True") {this.input.checked = false;}
+                else {this.input.checked = false;}
             } else {
                 this.input.value = value;
             }