fix issue random "CancelError" if sheet contain cells with errors

1bd374be · Boris Kocherov · d95dc894 · 1bd374be
Commit 1bd374be authored Jun 10, 2017 by Boris Kocherov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

cell/model/FormulaObjects/cubeFunctions.js cell/model/FormulaObjects/cubeFunctions.js +7 -3

No files found.
--- a/cell/model/FormulaObjects/cubeFunctions.js
+++ b/cell/model/FormulaObjects/cubeFunctions.js
@@ -321,7 +321,8 @@
 					scheme.execute = null;
 					scheme.hierarchies = [];
 				})
-				.push(undefined, function () {
+				.push(undefined, function (error) {
+					console.error(error);
 					scheme.execute = null;
 					scheme.hierarchies = [];
 				});
@@ -625,8 +626,11 @@
 			})
 			.push(undefined, function (error) {
 				// issue in one cell(cubevalue) not stop calculation in other
-				return waiter()
+				return new RSVP.Queue()
-					.then(function () {
+					.push(function () {
+						return waiter();
+					})
+					.push(function () {
 						return error_handler(current_cell_id)(error);
 					});
 			});