Mercurial > hg > webaudioevaluationtool
changeset 2326:d6cc7d948ae9
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
| author | www-data <www-data@sucuk.dcs.qmul.ac.uk> |
|---|---|
| date | Fri, 29 Apr 2016 20:20:57 +0100 |
| parents | ff06a00a1c0a (current diff) 9e7c56327d9c (diff) |
| children | 510fe0e815fd |
| files | .hgignore |
| diffstat | 3 files changed, 8 insertions(+), 53 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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$
--- 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(); + } } }