Mercurial > hg > webaudioevaluationtool

changeset 2362:a3099bdb056c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implemented #55
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Mon, 16 May 2016 16:14:52 +0100
parents c6c214cea795
children 95dc0833eb0a de1d5100d7a1
files interfaces/AB.js interfaces/ABX.js interfaces/ape.js interfaces/discrete.js interfaces/horizontal-sliders.js interfaces/mushra.js
diffstat 6 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Mon May 16 16:10:24 2016 +0100
+++ b/interfaces/AB.js	Mon May 16 16:14:52 2016 +0100
@@ -29,7 +29,7 @@
         if (!state) {
             console.log(str);
             this.storeErrorNode(str);
-            alert(str);
+            interfaceContext.lightbox.post("Message",str);
         }
         return state;
     }
@@ -227,7 +227,7 @@
 			}
 			if (audioEngineContext.status == 0)
 			{
-				alert("Please listen to the samples before making a selection");
+				interfaceContext.lightbox.post("Message","Please listen to the samples before making a selection");
 				console.log("Please listen to the samples before making a selection");
 				return;
             }
@@ -440,7 +440,7 @@
 	    {
 	        if (audioEngineContext.timer.testStarted == false)
 	        {
-	            alert('You have not started the test! Please press start to begin the test!');
+	            interfaceContext.lightbox.post("Warning",'You have not started the test! Please click play on a sample to begin the test!');
 	            return;
 	        }
 	    }
--- a/interfaces/ABX.js	Mon May 16 16:10:24 2016 +0100
+++ b/interfaces/ABX.js	Mon May 16 16:14:52 2016 +0100
@@ -31,7 +31,7 @@
         if (!state) {
             console.log(str);
             this.storeErrorNode(str);
-            alert(str);
+            interfaceContext.lightbox.post("Message",str);
         }
         return state;
     }
@@ -222,7 +222,7 @@
 			}
 			if (audioEngineContext.status == 0)
 			{
-				alert("Please listen to the samples before making a selection");
+				interfaceContext.lightbox.post("Message", "Please listen to the samples before making a selection");
 				console.log("Please listen to the samples before making a selection");
 				return;
             }
@@ -477,7 +477,7 @@
 	    {
 	        if (audioEngineContext.timer.testStarted == false)
 	        {
-	            alert('You have not started the test! Please press start to begin the test!');
+	            interfaceContext.lightbox.post("Warning",'You have not started the test! Please listen to a sample to begin the test!');
 	            return;
 	        }
 	    }
--- a/interfaces/ape.js	Mon May 16 16:10:24 2016 +0100
+++ b/interfaces/ape.js	Mon May 16 16:14:52 2016 +0100
@@ -41,7 +41,7 @@
                str = 'You have not played fragment ' + (audioEngineContext.audioObjects[hasBeenPlayed[0]].interfaceDOM.getPresentedId()) + ' yet. Please listen, rate and comment all samples before submitting.';
            }
             this.storeErrorNode(str);
-            alert(str);
+            interfaceContext.lightbox.post("Message",str);
 	        return false;
 	    }
 	    return true;
@@ -87,7 +87,7 @@
 		if (state != true)
 		{
             this.storeErrorNode(str);
-			alert(str);
+			interfaceContext.lightbox.post("Message",str);
 			console.log(str);
 		}
 		return state;
@@ -124,7 +124,7 @@
                    str = 'You have not commented on fragment ' + (audioEngineContext.audioObjects[strNums[0]].interfaceDOM.getPresentedId()) + ' yet. Please listen, rate and comment all samples before submitting.';
 		       }
                 this.storeErrorNode(str);
-                alert(str);
+                interfaceContext.lightbox.post("Message",str);
                 console.log(str);
 			}
 		}
@@ -172,7 +172,7 @@
 		if (state != true)
 		{
             this.storeErrorNode(str);
-			alert(str);
+			interfaceContext.lightbox.post("Message",str);
 			console.log(str);
 		}
 		return state;
@@ -811,7 +811,7 @@
 	    {
 	        if (audioEngineContext.timer.testStarted == false)
 	        {
-	            alert('You have not started the test! Please click a fragment to begin the test!');
+	            interfaceContext.lightbox.post("Warning",'You have not started the test! Please click a fragment to begin the test!');
 	            return;
 	        }
 	    }
--- a/interfaces/discrete.js	Mon May 16 16:10:24 2016 +0100
+++ b/interfaces/discrete.js	Mon May 16 16:14:52 2016 +0100
@@ -515,7 +515,7 @@
 	    {
 	        if (audioEngineContext.timer.testStarted == false)
 	        {
-	            alert('You have not started the test! Please press start to begin the test!');
+	            interfaceContext.lightbox.post("Warning",'You have not started the test! Please press start to begin the test!');
 	            return;
 	        }
 	    }
--- a/interfaces/horizontal-sliders.js	Mon May 16 16:10:24 2016 +0100
+++ b/interfaces/horizontal-sliders.js	Mon May 16 16:14:52 2016 +0100
@@ -468,7 +468,7 @@
 	    {
 	        if (audioEngineContext.timer.testStarted == false)
 	        {
-	            alert('You have not started the test! Please press start to begin the test!');
+	            interfaceContext.lightbox.post("Warning",'You have not started the test! Please press start to begin the test!');
 	            return;
 	        }
 	    }
--- a/interfaces/mushra.js	Mon May 16 16:10:24 2016 +0100
+++ b/interfaces/mushra.js	Mon May 16 16:14:52 2016 +0100
@@ -492,7 +492,7 @@
 	    {
 	        if (audioEngineContext.timer.testStarted == false)
 	        {
-	            alert('You have not started the test! Please press start to begin the test!');
+	            interfaceContext.lightbox.post("Message",'You have not started the test! Please press start to begin the test!');
 	            return;
 	        }
 	    }