From 8f3af0b6f1a39e81bc6c17a008182d6d73cfb41e Mon Sep 17 00:00:00 2001 From: zzmp Date: Wed, 17 Sep 2014 14:24:22 -0700 Subject: [PATCH] prevent infinite delay on redraw --- mithril.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mithril.js b/mithril.js index e729f399..5321bdb1 100644 --- a/mithril.js +++ b/mithril.js @@ -439,7 +439,7 @@ Mithril = m = new function app(window, undefined) { return _prop(store) } - var roots = [], modules = [], controllers = [], lastRedrawId = 0, computePostRedrawHook = null, prevented = false + var roots = [], modules = [], controllers = [], lastRedrawId = 0, redrawAgain = false, computePostRedrawHook = null, prevented = false m.module = function(root, module) { var index = roots.indexOf(root) if (index < 0) index = roots.length @@ -464,12 +464,19 @@ Mithril = m = new function app(window, undefined) { var cancel = window.cancelAnimationFrame || window.clearTimeout var defer = window.requestAnimationFrame || window.setTimeout if (lastRedrawId && force !== true) { - cancel(lastRedrawId) - lastRedrawId = defer(redraw, 16) //60 frames per second = 1 call per 16 ms + redrawAgain = true } else { redraw() - lastRedrawId = defer(function() {lastRedrawId = null}, 16) + lastRedrawId = defer(delay, 16) //60 frames per second = 1 call per 16 ms + } + + function delay() { + lastRedrawId = null + if (redrawAgain) { + redrawAgain = false + m.redraw() + } } } m.redraw.strategy = m.prop()