Mercurial > hg > webaudioevaluationtool

changeset 2318:fa52c9ea2486

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, 29 Apr 2016 16:20:56 +0100
parents cbc26d0f104a (current diff) f1e67258f0b8 (diff)
children 472412fab354
files
diffstat 5 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Fri Apr 29 15:21:00 2016 +0100
+++ b/js/core.js	Fri Apr 29 16:20:56 2016 +0100
@@ -809,10 +809,9 @@
 					if (node.specification.mandatory == true)
 					{
 						alert("This radio is mandatory");
-					} else {
-						node.response = -1;
+                        return;
 					}
-					return;
+                    break;
 				}
 				if (inputs[i].checked == true) {
 					node.response = node.specification.options[i];
--- a/test_create/attributes.json	Fri Apr 29 15:21:00 2016 +0100
+++ b/test_create/attributes.json	Fri Apr 29 16:20:56 2016 +0100
@@ -11,7 +11,8 @@
     "sampleRate": "Required Sample Rate",
     "hostURL": "Element URL Prefix",
     "repeatCount": "Repeat Count",
-    "loop": "Synchronous Loop",
+    "loop": "Loop playback",
+    "synchronous": "Synchronous playback",
     "showElementComments": "Show Comment Boxes",
     "type": "Type",
     "min": "Minimum",
--- a/test_create/style.css	Fri Apr 29 15:21:00 2016 +0100
+++ b/test_create/style.css	Fri Apr 29 16:20:56 2016 +0100
@@ -78,7 +78,7 @@
 }
 
 
-div#content > div.node{
+div#page-holder > div.node{
     background-color: rgb(200,228,151);
 }
 
--- a/test_create/test_core.js	Fri Apr 29 15:21:00 2016 +0100
+++ b/test_create/test_core.js	Fri Apr 29 16:20:56 2016 +0100
@@ -1451,21 +1451,28 @@
                 var pageObj = new specification.page(specification);
                 specification.pages.push(pageObj);
                 var newPage = new this.parent.pageNode(this.parent,pageObj);
-                this.parent.injectDOM.appendChild(newPage.rootDOM);
+                document.getElementById("page-holder").appendChild(newPage.rootDOM);
                 this.parent.pages.push(newPage);
             }
         }
         this.addPage.root.textContent = "Add Page";
+        this.addPage.root.id = "new-page-button";
+        this.addPage.root.style.float = "left";
         this.addPage.root.addEventListener("click",this.addPage,false);
-        this.injectDOM.appendChild(this.addPage.root);
+        
+        var pageHolder = document.createElement("div");
+        pageHolder.id ="page-holder";
+        this.injectDOM.appendChild(pageHolder);
         
         // Build each page
         for (var page of specification.pages)
         {
             var newPage = new this.pageNode(this,page);
-            this.injectDOM.appendChild(newPage.rootDOM);
+            pageHolder.appendChild(newPage.rootDOM);
             this.pages.push(newPage);
         }
+        
+        this.injectDOM.appendChild(this.addPage.root);
     }
     
     this.interfaceNode = function(parent,rootObject)
--- a/xml/test-schema.xsd	Fri Apr 29 15:21:00 2016 +0100
+++ b/xml/test-schema.xsd	Fri Apr 29 16:20:56 2016 +0100
@@ -80,6 +80,7 @@
                 <xs:attribute name="randomiseOrder" type="xs:boolean" default="false" />
                 <xs:attribute name="repeatCount" type="xs:nonNegativeInteger" default="0" />
                 <xs:attribute name="loop" type="xs:boolean" default="false" />
+                <xs:attribute name="synchronous" type="xs:boolean" default="false" />
                 <xs:attribute name="showElementComments" type="xs:boolean" default="false" />
                 <xs:attribute name="loudness" type="xs:nonPositiveInteger" use="optional" />
                 <xs:attribute name="label" use="optional" default="default">