Mercurial > hg > webaudioevaluationtool
comparison core.js @ 398:b127506a3f49 Dev_main
Bug #1488 fixed. Movement checks now operate per axis and report which axis and sliders need moving.
| author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
|---|---|
| date | Fri, 11 Dec 2015 16:07:39 +0000 |
| parents | 32cf73391f31 |
| children | 3fb85ae8fced |
comparison
equal
deleted
inserted
replaced
| 397:32cf73391f31 | 398:b127506a3f49 |
|---|---|
| 231 $(window).keypress(function(e){ | 231 $(window).keypress(function(e){ |
| 232 if (e.keyCode == 13 && popup.popup.style.visibility == 'visible') | 232 if (e.keyCode == 13 && popup.popup.style.visibility == 'visible') |
| 233 { | 233 { |
| 234 console.log(e); | 234 console.log(e); |
| 235 popup.buttonProceed.onclick(); | 235 popup.buttonProceed.onclick(); |
| 236 e.preventDefault(); | |
| 236 } | 237 } |
| 237 }); | 238 }); |
| 238 | 239 |
| 239 this.createPopup = function(){ | 240 this.createPopup = function(){ |
| 240 // Create popup window interface | 241 // Create popup window interface |