# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1461957657 -3600
# Node ID d6cc7d948ae9b05e8465b7dc37cabad0721afc98
# Parent  ff06a00a1c0ad1544190a0e83bd485d211d7beaf# Parent  9e7c56327d9cb6c46d177259ae89d6bcb1badf71
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r ff06a00a1c0a -r d6cc7d948ae9 .gitignore
--- a/.gitignore	Fri Apr 29 18:21:03 2016 +0100
+++ b/.gitignore	Fri Apr 29 20:20:57 2016 +0100
@@ -7,4 +7,5 @@
 *.out
 *.synctex.gz
 *.toc
-saves/*.xml
\ No newline at end of file
+saves/*.xml
+*.DS_STORE
diff -r ff06a00a1c0a -r d6cc7d948ae9 .hgignore
--- a/.hgignore	Fri Apr 29 18:21:03 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-syntax: glob
-.project/**
-.project
-docs/SMC15/smc2015.log
-docs/SMC15/smc2015template.aux
-docs/SMC15/smc2015template.blg
-docs/SMC15/smc2015template.log
-docs/SMC15/smc2015template.out
-docs/SMC15/smc2015template.synctex.gz
-re:^docs/ExperimentVariableControl\.aux$
-re:^docs/ExperimentVariableControl\.log$
-re:^docs/ExperimentVariableControl\.synctex\.gz$
-*.aux
-*.bbl
-*.gz
-*.log
-*.blg
-*.DS_Store
-*._*
-re:^RealismEval/
-re:^SynthReal/
-re:^SynthRealismTest\.html$
-re:^example_eval/paperExample\.xml$
-re:^example_eval/project\.xml\.orig$
-re:^index2\.html$
-re:^realismTest\.html$
-saves/*.xml
-saves/timelines
-saves/timelines-old
-saves/*.csv
-saves/*/*.csv
-saves/*/*.png
-saves/*/*.xml
-saves/ratings/*.pdf
-saves/timelines_movement/*.pdf
-saves
-re:^docs/WAC2016/\._WAC2016\.bib$
-re:^docs/WAC2016/\._WAC2016\.tex$
-*.out
-*.fdb_latexmk
-*.toc
-subject
-resample
-test-data
-*.fls
-Makefile
-*eps-converted-to.pdf
-re:^docs/DMRN+10/img/\._TestCreate\.png$
-re:^docs/DMRN+10/img/\._APE\.png$
-re:^docs/DMRN+10/img/\._MUSHRA\.png$
diff -r ff06a00a1c0a -r d6cc7d948ae9 js/core.js
--- a/js/core.js	Fri Apr 29 18:21:03 2016 +0100
+++ b/js/core.js	Fri Apr 29 20:20:57 2016 +0100
@@ -469,8 +469,12 @@
 		popup.showPopup();
 		popup.popupContent.innerHTML = null;
 		popup.popupContent.textContent = "Submitting. Please Wait";
-        popup.hideNextButton();
-        popup.hidePreviousButton();
+		if(typeof(popup.hideNextButton) === "function"){
+			popup.hideNextButton();
+		}
+		if(typeof(popup.hidePreviousButton) === "function"){
+			popup.hidePreviousButton();
+		}
 	}
 }