Merge branch 'master' into gh-pages

This commit is contained in:
Julian Descottes 2012-08-30 01:56:20 +02:00
commit 9aaaa380a7

View File

@ -218,7 +218,7 @@
startAnimation : function () { startAnimation : function () {
var scope = this; var scope = this;
var animFPSTuner = document.getElementById("preview-fps"); var animFPSTuner = $("preview-fps");
var animPreviewFPS = parseInt(animFPSTuner.value, 10); var animPreviewFPS = parseInt(animFPSTuner.value, 10);
var startPreviewRefresh = function() { var startPreviewRefresh = function() {
return setInterval(scope.refreshAnimatedPreview, 1000/animPreviewFPS); return setInterval(scope.refreshAnimatedPreview, 1000/animPreviewFPS);
@ -228,24 +228,7 @@
animFPSTuner.addEventListener('change', function(evt) { animFPSTuner.addEventListener('change', function(evt) {
window.clearInterval(refreshUpdater); window.clearInterval(refreshUpdater);
animPreviewFPS = parseInt(animFPSTuner.value, 10); animPreviewFPS = parseInt(animFPSTuner.value, 10);
if(isNaN(animPreviewFPS)) {
animPreviewFPS = 1;
}
if(evt.keyCode == 38) {
animPreviewFPS++;
}
else if (evt.keyCode == 40) {
animPreviewFPS--;
}
if(animPreviewFPS < 1) {
animPreviewFPS = 1;
}
if(animPreviewFPS > 100) {
animPreviewFPS = 100;
}
$("display-fps").innerHTML = animPreviewFPS + " fps"; $("display-fps").innerHTML = animPreviewFPS + " fps";
animFPSTuner.value = animPreviewFPS;
$("fps-value").innerHTML = animPreviewFPS + " fps";
refreshUpdater = startPreviewRefresh(); refreshUpdater = startPreviewRefresh();
}); });
}, },