Math: ensure internal updating flag gets cleared. Fixes #1083

Mottie · Nov 23, 2015 · a8d9c2b · a8d9c2b
1 parent 06faff7
commit a8d9c2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/dist/js/widgets/widget-math.min.js b/dist/js/widgets/widget-math.min.js
diff --git a/js/widgets/widget-math.js b/js/widgets/widget-math.js
@@ -180,7 +180,7 @@
 		recalculate : function(c, wo, init) {
 			if ( c && ( !wo.math_isUpdating || init ) ) {
 
-				var time, mathAttr, $mathCells;
+				var undef, time, mathAttr, $mathCells;
 				if ( c.debug ) {
 					time = new Date();
 				}
@@ -215,14 +215,22 @@
 				}
 
 				// update internal cache
-				ts.update( c );
+				ts.update( c, undef, function(){
+					math.updateComplete( c );
+				});
 
 				if ( c.debug ) {
 					console.log( 'Math widget update completed' + ts.benchmark( time ) );
 				}
 			}
 		},
 
+		updateComplete : function( c ) {
+			var wo = c.widgetOptions;
+			if ( wo.math_isUpdating && c.debug && console.groupEnd ) { console.groupEnd(); }
+			wo.math_isUpdating = false;
+		},
+
 		mathType : function( c, $cells, priority ) {
 			if ( $cells.length ) {
 				var formula, result, $el, arry, getAll, $targetCells, index, len,
@@ -532,8 +540,7 @@
 				})
 				.on( update + '.tsmath', function() {
 					setTimeout( function(){
-						if ( wo.math_isUpdating && c.debug && console.groupEnd ) { console.groupEnd(); }
-						wo.math_isUpdating = false;
+						math.updateComplete( c );
 					}, 40 );
 				});
 			wo.math_isUpdating = false;