Removing need for separate setContainer calls

src/js/parser/javascript/base.js

@@ -40,7 +40,11 @@ export default {
     });
   },
 
-  render() {
+  render(container) {
+    if (container) {
+      this.setContainer(container);
+    }
+
     this._labelGroups = [];
     this._render();
   },
@@ -56,8 +60,7 @@ export default {
 
   proxy(node) {
     this._proxy = node;
-    this._proxy.setContainer(this.container);
+    this._proxy.render(this.container);
-    this._proxy.render();
   },
 
   _render() {

src/js/parser/javascript/charset.js

@@ -10,8 +10,7 @@ export default _.extend({}, Base, {
     this.partContainer = this.container.group();
 
     _.each(this.parts.elements, (part => {
-      part.setContainer(this.partContainer.group());
+      part.render(this.partContainer.group());
-      part.render();
     }).bind(this));
   },
 

src/js/parser/javascript/charset_range.js

@@ -5,11 +5,8 @@ export default _.extend({}, Base, {
   type: 'charset-range',
 
   _render() {
-    this.first.setContainer(this.container.group());
+    this.first.render(this.container.group());
-    this.first.render();
+    this.last.render(this.container.group());
-
-    this.last.setContainer(this.container.group());
-    this.last.render();
 
     this.hyphen = this.container.text()
       .attr({
@@ -18,8 +15,6 @@ export default _.extend({}, Base, {
   },
 
   _position() {
-    var box;
-
     this.first.position();
     this.last.position();
 

src/js/parser/javascript/match.js

@@ -16,8 +16,7 @@ export default _.extend({}, Base, {
       }
 
       this.contents.parts = _.map(parts, (function(part) {
-        part.setContainer(this.container.group());
+        part.render(this.container.group());
-        part.render();
         return part;
       }).bind(this));
 

src/js/parser/javascript/match_fragment.js

@@ -8,8 +8,7 @@ export default _.extend({}, Base, {
     if (this._repeat.textValue === '') {
       this.proxy(this._content);
     } else {
-      this._content.setContainer(this.container.group());
+      this._content.render(this.container.group());
-      this._content.render();
     }
   },
 

src/js/parser/javascript/regexp.js

@@ -14,9 +14,7 @@ export default _.extend({}, Base, {
         .addClass('regexp-matches');
 
       _.each(matches, (match => {
-        match.setContainer(this.matchContainer.group());
+        match.render(this.matchContainer.group());
-        match.render();
-        return match.container;
       }).bind(this));
     }
   },

src/js/parser/javascript/root.js

@@ -5,9 +5,9 @@ export default _.extend({}, Base, {
   type: 'root',
 
   _render() {
-    this.regexp.setContainer(this.container.group().transform(Snap.matrix()
+    this.regexp.render(this.container.group());
-      .translate(10, 0)));
+    this.regexp.container.transform(Snap.matrix()
-    this.regexp.render();
+      .translate(10, 0));
 
     this.start = this.container.circle()
       .addClass('pin')

src/js/parser/javascript/subexp.js

@@ -18,8 +18,7 @@ export default _.extend({}, Base, {
     if (label) {
       this.renderLabeledBox(label);
 
-      this.regexp.setContainer(this.container.group());
+      this.regexp.render(this.container.group());
-      this.regexp.render();
     } else {
       this.proxy(this.regexp);
     }

src/js/regexper.js

@@ -91,8 +91,7 @@ export default class Regexper {
 
     return Q.fcall(parser.parse.bind(parser), expression)
       .then((result) => {
-        result.setContainer(snap.group());
+        result.render(snap.group());
-        result.render();
         return result;
       }, this.showError.bind(this))
       .then((result) => {