Reorganizing and cleanup of base Node code

src/js/parser/javascript/node.js

@@ -59,6 +59,23 @@ export default class Node {
     });
   }
 
+  render(container) {
+    if (container) {
+      this.container = container;
+    }
+
+    if (this.proxy) {
+      return this.proxy.render(this.container);
+    } else {
+      this.state.renderCounter++;
+      return this._render()
+        .then(() => {
+          this.state.renderCounter--;
+          return this;
+        });
+    }
+  }
+
   renderLabel(text) {
     var group = this.container.group()
           .addClass('label'),
@@ -82,34 +99,6 @@ export default class Node {
       });
   }
 
-  startRender() {
-    this.state.renderCounter++;
-  }
-
-  doneRender() {
-    this.state.renderCounter--;
-  }
-
-  render(container) {
-    if (container) {
-      this.container = container;
-    }
-
-    if (this.proxy) {
-      return this.proxy.render(this.container);
-    } else {
-      this.startRender();
-      return this._render()
-        .then(
-          () => {
-            this.doneRender();
-            return this;
-          },
-          null
-        );
-    }
-  }
-
   renderLabeledBox(label, content, options) {
     var label = this.container.text(0, 0, label)
           .addClass([this.type, 'label'].join('-')),