Mercurial > hg > webaudioevaluationtool

changeset 2470:1647bb807186

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for #128
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Tue, 02 Aug 2016 12:56:45 +0100
parents 72cdcd6d143e
children 2a1f42b5614a
files interfaces/AB.js interfaces/ABX.js interfaces/ape.js interfaces/discrete.js interfaces/horizontal-sliders.js interfaces/mushra.js js/specification.js
diffstat 7 files changed, 47 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Tue Aug 02 12:43:56 2016 +0100
+++ b/interfaces/AB.js	Tue Aug 02 12:56:45 2016 +0100
@@ -45,6 +45,7 @@
 	title.className = "title";
 	title.align = "center";
 	var titleSpan = document.createElement('span');
+    titleSpan.id = "test-title";
 	
 	// Set title to that defined in XML, else set to default
 	if (titleAttr != undefined) {
@@ -136,6 +137,11 @@
     // Delete outside reference
 	var outsideReferenceHolder = document.getElementById("outside-reference-holder");
     outsideReferenceHolder.innerHTML = "";
+    
+    // Set the page title
+    if (typeof audioHolderObject.title == "string" && audioHolderObject.title.length > 0) {
+        document.getElementById("test-title").textContent = audioHolderObject.title
+    }
 	
 	if(interfaceObj.title != null)
 	{
--- a/interfaces/ABX.js	Tue Aug 02 12:43:56 2016 +0100
+++ b/interfaces/ABX.js	Tue Aug 02 12:56:45 2016 +0100
@@ -50,6 +50,7 @@
 	title.className = "title";
 	title.align = "center";
 	var titleSpan = document.createElement('span');
+    titleSpan.id = "test-title";
     
     // Set title to that defined in XML, else set to default
 	if (titleAttr != undefined) {
@@ -134,6 +135,11 @@
 		console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node");
 	}
 	interfaceObj = interfaceObj[0];
+    
+    // Set the page title
+    if (typeof page.title == "string" && page.title.length > 0) {
+        document.getElementById("test-title").textContent = page.title
+    }
 	
 	if(interfaceObj.title != null)
 	{
--- a/interfaces/ape.js	Tue Aug 02 12:43:56 2016 +0100
+++ b/interfaces/ape.js	Tue Aug 02 12:56:45 2016 +0100
@@ -220,6 +220,7 @@
 	title.className = "title";
 	title.align = "center";
 	var titleSpan = document.createElement('span');
+    titleSpan.id = "test-title";
 	
 	// Set title to that defined in XML, else set to default
 	if (titleAttr != undefined) {
@@ -297,6 +298,12 @@
 	var sliderHolder = document.getElementById('slider-holder');
 	feedbackHolder.innerHTML = "";
 	sliderHolder.innerHTML = "";
+    
+    // Set the page title
+    if (typeof audioHolderObject.title == "string" && audioHolderObject.title.length > 0) {
+        document.getElementById("test-title").textContent = audioHolderObject.title
+    }
+	
 	
 	// Delete outside reference
 	document.getElementById("outside-reference-holder").innerHTML = "";
--- a/interfaces/discrete.js	Tue Aug 02 12:43:56 2016 +0100
+++ b/interfaces/discrete.js	Tue Aug 02 12:56:45 2016 +0100
@@ -16,6 +16,7 @@
 	title.className = "title";
 	title.align = "center";
 	var titleSpan = document.createElement('span');
+    titleSpan.id = "test-title";
 	
 	// Set title to that defined in XML, else set to default
 	if (titleAttr != undefined) {
@@ -126,6 +127,12 @@
 		console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node");
 	}
 	interfaceObj = interfaceObj[0];
+    
+    // Set the page title
+    if (typeof page.title == "string" && page.title.length > 0) {
+        document.getElementById("test-title").textContent = page.title
+    }
+    
 	if(interfaceObj.title != null)
 	{
 		document.getElementById("pageTitle").textContent = interfaceObj.title;
--- a/interfaces/horizontal-sliders.js	Tue Aug 02 12:43:56 2016 +0100
+++ b/interfaces/horizontal-sliders.js	Tue Aug 02 12:56:45 2016 +0100
@@ -16,6 +16,7 @@
 	title.className = "title";
 	title.align = "center";
 	var titleSpan = document.createElement('span');
+    titleSpan.id="test-title";
 	
 	// Set title to that defined in XML, else set to default
 	if (titleAttr != undefined) {
@@ -126,6 +127,12 @@
 		console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node");
 	}
 	interfaceObj = interfaceObj[0];
+    
+    // Set the page title
+    if (typeof page.title == "string" && page.title.length > 0) {
+        document.getElementById("test-title").textContent = page.title
+    }
+    
 	if(interfaceObj.title != null)
 	{
 		document.getElementById("pageTitle").textContent = interfaceObj.title;
--- a/interfaces/mushra.js	Tue Aug 02 12:43:56 2016 +0100
+++ b/interfaces/mushra.js	Tue Aug 02 12:56:45 2016 +0100
@@ -22,6 +22,7 @@
 	title.className = "title";
 	title.align = "center";
 	var titleSpan = document.createElement('span');
+    titleSpan.id = "test-title";
 	
 	// Set title to that defined in XML, else set to default
 	if (titleAttr != undefined) {
@@ -127,6 +128,12 @@
 		console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node");
 	}
 	interfaceObj = interfaceObj[0];
+    
+    // Set the page title
+    if (typeof audioHolderObject.title == "string" && audioHolderObject.title.length > 0) {
+        document.getElementById("test-title").textContent = audioHolderObject.title
+    }
+    
 	if(interfaceObj.title != null)
 	{
 		document.getElementById("pageTitle").textContent = interfaceObj.title;
--- a/js/specification.js	Tue Aug 02 12:43:56 2016 +0100
+++ b/js/specification.js	Tue Aug 02 12:56:45 2016 +0100
@@ -454,6 +454,7 @@
 	this.page = function(specification) {
 		this.presentedId = undefined;
 		this.id = undefined;
+        this.title = undefined;
 		this.hostURL = undefined;
 		this.randomiseOrder = undefined;
 		this.loop = undefined;
@@ -491,6 +492,12 @@
 					break;
 				}
 			}
+            
+            // Get the title
+            var title = xml.getElementsByTagName('title');
+            if (title.length != 0) {
+                this.title = title[0].textContent;
+            }
 			
 			// Get the Comment Box Prefix
 			var CBP = xml.getElementsByTagName('commentboxprefix');