vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #253 from zzmp/fix-redraw-infinite-delay

Browse source 
Fix redraw infinite delay
This commit is contained in:
Leo Horie 2014-09-17 17:47:36 -04:00
commit be9032eb8f
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mithril.js
View file

@ -439,7 +439,7 @@ Mithril = m = new function app(window, undefined) {
return _prop(store) 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) { m.module = function(root, module) {
var index = roots.indexOf(root) var index = roots.indexOf(root)
if (index < 0) index = roots.length if (index < 0) index = roots.length
@ -464,12 +464,19 @@ Mithril = m = new function app(window, undefined) {
var cancel = window.cancelAnimationFrame || window.clearTimeout var cancel = window.cancelAnimationFrame || window.clearTimeout
var defer = window.requestAnimationFrame || window.setTimeout var defer = window.requestAnimationFrame || window.setTimeout
if (lastRedrawId && force !== true) { if (lastRedrawId && force !== true) {
cancel(lastRedrawId) redrawAgain = true
lastRedrawId = defer(redraw, 16) //60 frames per second = 1 call per 16 ms
} }
else { else {
redraw() 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() m.redraw.strategy = m.prop()

1
tests/mithril-tests.js
View file

@ -1454,6 +1454,7 @@ function testMithril(mock) {
} }
}) })
root.childNodes[0].onclick({}) root.childNodes[0].onclick({})
mock.requestAnimationFrame.$resolve() //teardown
return strategy == "diff" && root.childNodes[0].childNodes[0].nodeValue == "1" return strategy == "diff" && root.childNodes[0].childNodes[0].nodeValue == "1"
}) })
test(function() { test(function() {

7
tests/mock.js
View file

@ -93,8 +93,11 @@ mock.window = new function() {
} }
window.requestAnimationFrame.$id = 1 window.requestAnimationFrame.$id = 1
window.requestAnimationFrame.$resolve = function() { window.requestAnimationFrame.$resolve = function() {
if (window.requestAnimationFrame.$callback) window.requestAnimationFrame.$callback() if (window.requestAnimationFrame.$callback) {
window.requestAnimationFrame.$callback = null var callback = window.requestAnimationFrame.$callback
window.requestAnimationFrame.$callback = null
callback()
}
} }
window.XMLHttpRequest = new function() { window.XMLHttpRequest = new function() {
var request = function() { var request = function() {