Refactoring parser code to remove global state

This allows canceling an in-progress render and moves some of the
rendering code to a more appropriate location.
This commit is contained in:
Jeff Avallone committed 2014-12-18 11:13:15 -05:00
1 parent 7de0a6490a
commit 80ec29cd6b
5 files changed
+96 -69

No files matched your search

+10 -14
View File
@@ -8,6 +8,8 @@ export default class Node {
this.elements = elements || [];
this.properties = properties;
this.state = Node.state;
}
set module(mod) {
@@ -68,7 +70,7 @@ export default class Node {
result = arguments;
setTimeout(() => {
if (Node.cancelRender) {
if (this.state.cancelRender) {
deferred.reject('Render cancelled');
} else {
deferred.resolve.apply(this, result);
@@ -102,27 +104,27 @@ export default class Node {
}
startRender() {
Node.renderCounter++;
this.state.renderCounter++;
}
doneRender() {
var evt;
if (Node.maxCounter === 0) {
Node.maxCounter = Node.renderCounter;
if (this.state.maxCounter === 0) {
this.state.maxCounter = this.state.renderCounter;
}
Node.renderCounter--;
this.state.renderCounter--;
evt = document.createEvent('Event');
evt.initEvent('updateStatus', true, true);
evt.detail = {
percentage: (Node.maxCounter - Node.renderCounter) / Node.maxCounter
percentage: (this.state.maxCounter - this.state.renderCounter) / this.state.maxCounter
};
document.body.dispatchEvent(evt);
if (Node.renderCounter === 0) {
Node.maxCounter = 0;
if (this.state.renderCounter === 0) {
this.state.maxCounter = 0;
}
return this.deferredStep();
@@ -240,9 +242,3 @@ export default class Node {
});
}
};
Node.reset = () => {
Node.renderCounter = 0;
Node.maxCounter = 0;
Node.cancelRender = false;
};