From ccb3d61675da138be61bab83f44bc4c26cdc8ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Yves=20G=C3=A9rardy?= <py@py.gy>
Date: Tue, 13 Jun 2017 15:35:05 +0200
Subject: [PATCH] Make redraw monolithic, add m.redraw.sync

---
 api/redraw.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/api/redraw.js b/api/redraw.js
index 07937445..33472635 100644
--- a/api/redraw.js
+++ b/api/redraw.js
@@ -19,26 +19,32 @@ function throttle(callback) {
 	}
 }
 
+
 module.exports = function($window, throttleMock) {
-	var _throttle = throttleMock || throttle
 	var renderService = coreRenderer($window)
 	renderService.setEventCallback(function(e) {
 		if (e.redraw !== false) redraw()
 	})
 
 	var callbacks = []
+	var rendering = false
+
 	function subscribe(key, callback) {
 		unsubscribe(key)
-		callbacks.push(key, _throttle(callback))
+		callbacks.push(key, callback)
 	}
 	function unsubscribe(key) {
 		var index = callbacks.indexOf(key)
 		if (index > -1) callbacks.splice(index, 2)
 	}
-	function redraw() {
-		for (var i = 1; i < callbacks.length; i += 2) {
-			callbacks[i]()
-		}
+	function sync() {
+		if (rendering) throw new Error("Nested m.redraw.sync() call")
+		rendering = true
+		for (var i = 1; i < callbacks.length; i+=2) try {callbacks[i]()} catch (e) {/*noop*/}
+		rendering = false
 	}
+
+	var redraw = (throttleMock || throttle)(sync)
+	redraw.sync = sync
 	return {subscribe: subscribe, unsubscribe: unsubscribe, redraw: redraw, render: renderService.render}
 }