changeset 3084:2fe3caf84422

Merge branch 'master' into vnext
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Tue, 09 Jan 2018 16:13:32 +0000
parents 396b9aac3bb9 (current diff) 7bbab5127538 (diff)
children 1ff68ea1a4cf 2e8bf9499e92
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/test_create/test_core.js	Wed Nov 22 10:08:26 2017 +0000
+++ b/test_create/test_core.js	Tue Jan 09 16:13:32 2018 +0000
@@ -114,9 +114,9 @@
 
     $s.exportXML = function () {
         var s = new XMLSerializer();
-        var doc = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" + specification.encode();
+        var doc = specification.encode();
         var xmlstr = s.serializeToString(doc);
-        var bb = new Blob([s.serializeToString(doc)], {
+        var bb = new Blob(["<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>" + s.serializeToString(doc)], {
             type: 'application/xml'
         });
         var dnlk = window.URL.createObjectURL(bb);
--- a/tests/templates/itur1534.xml	Wed Nov 22 10:08:26 2017 +0000
+++ b/tests/templates/itur1534.xml	Tue Jan 09 16:13:32 2018 +0000
@@ -30,7 +30,7 @@
             <audioelement url="1.wav" id="training-1" type="anchor" />
             <audioelement url="0.wav" id="training-2" />
         </page>
-        <page id="test-0" randomiseOrder="true" repeatCount="0" loop="true" synchronous="true" position="0" label="capital">
+        <page id="test-0" randomiseOrder="true" repeatCount="0" loop="true" synchronous="true" label="capital">
             <interface>
                 <title>Quality</title>
                 <scales>