mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Merge branch 'master' into user-settings
This commit is contained in:
commit
6cb145ae34
@ -1,6 +1,10 @@
|
|||||||
|
|
||||||
|
|
||||||
body {
|
body {
|
||||||
|
background: radial-gradient(circle, #000, #373737);
|
||||||
|
/* 16/06/2013 : -webkit still needed for
|
||||||
|
safari, safari mobile and android browser and chrome for android
|
||||||
|
cf http://caniuse.com/css-gradients */
|
||||||
background: -webkit-radial-gradient(circle, #000, #373737);
|
background: -webkit-radial-gradient(circle, #000, #373737);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,15 +18,19 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
ns.AnimatedPreviewController.prototype.init = function () {
|
ns.AnimatedPreviewController.prototype.init = function () {
|
||||||
|
// the oninput event won't work on IE10 unfortunately, but at least will provide a
|
||||||
|
// consistent behavior across all other browsers that support the input type range
|
||||||
|
// see https://bugzilla.mozilla.org/show_bug.cgi?id=853670
|
||||||
$("#preview-fps")[0].addEventListener('change', this.onFPSSliderChange.bind(this));
|
$("#preview-fps")[0].addEventListener('change', this.onFPSSliderChange.bind(this));
|
||||||
};
|
};
|
||||||
|
|
||||||
ns.AnimatedPreviewController.prototype.onFPSSliderChange = function(evt) {
|
ns.AnimatedPreviewController.prototype.onFPSSliderChange = function (evt) {
|
||||||
this.setFPS(parseInt($("#preview-fps")[0].value, 10));
|
this.setFPS(parseInt($("#preview-fps")[0].value, 10));
|
||||||
};
|
};
|
||||||
|
|
||||||
ns.AnimatedPreviewController.prototype.setFPS = function (fps) {
|
ns.AnimatedPreviewController.prototype.setFPS = function (fps) {
|
||||||
this.fps = fps;
|
this.fps = fps;
|
||||||
|
$("#preview-fps").val(this.fps);
|
||||||
$("#display-fps").html(this.fps + " FPS");
|
$("#display-fps").html(this.fps + " FPS");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user