From 42bc63dc91e9a203be7975cf2d2dd9a333f15212 Mon Sep 17 00:00:00 2001
From: David Greenspan <dgreenspan@alum.mit.edu>
Date: Mon, 1 Jul 2013 15:33:46 -0700
Subject: [PATCH] get rid of EmptyComponent

not really empty since now Component renders its content
by default
---
 packages/spacebars/spacebars.js       | 4 ++--
 packages/spacebars/spacebars_tests.js | 6 +++---
 packages/ui/component.js              | 4 ----
 packages/ui/library.js                | 8 +++-----
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/spacebars/spacebars.js b/packages/spacebars/spacebars.js
index 444f3c8114..1df0977486 100644
--- a/packages/spacebars/spacebars.js
+++ b/packages/spacebars/spacebars.js
@@ -784,7 +784,7 @@ Spacebars.compile = function (inputString, options) {
                 var argCode =
                       codeGenArgs(block.openTag.args, funcInfo,
                                   extraArgs)[0];
-                bodyLines.push('buf.component(function () { return ((' + nameCode + ') || EmptyComponent).create(' + argCode +
+                bodyLines.push('buf.component(function () { return ((' + nameCode + ') || Component).create(' + argCode +
                                '); });');
               } else {
                 switch (tag.type) {
@@ -792,7 +792,7 @@ Spacebars.compile = function (inputString, options) {
                   var nameCode = codeGenPath(tag.path, funcInfo, true);
                   var argCode =
                         codeGenArgs(tag.args, funcInfo, {})[0];
-                  bodyLines.push('buf.component(function () { return ((' + nameCode + ') || EmptyComponent).create(' + argCode +
+                  bodyLines.push('buf.component(function () { return ((' + nameCode + ') || Component).create(' + argCode +
                                  '); });');
                   break;
                 case 'DOUBLE':
diff --git a/packages/spacebars/spacebars_tests.js b/packages/spacebars/spacebars_tests.js
index 01dc35b6e7..703a92cbbf 100644
--- a/packages/spacebars/spacebars_tests.js
+++ b/packages/spacebars/spacebars_tests.js
@@ -421,7 +421,7 @@ Tinytest.add("spacebars - compiler", function (test) {
 
       'function (buf) {',
       '  var self = this;',
-      '  buf.component(function () { return ((self.lookup("foo")) || EmptyComponent).create({"data": Spacebars.call(self.lookup("bar")), "baz": Spacebars.call(Spacebars.index(self.lookup("x"), "y"))}); });',
+      '  buf.component(function () { return ((self.lookup("foo")) || Component).create({"data": Spacebars.call(self.lookup("bar")), "baz": Spacebars.call(Spacebars.index(self.lookup("x"), "y"))}); });',
       '}');
 
   run('{{#foo.bar}}{{/foo.baz}}', {fail: 'Close tag'});
@@ -431,7 +431,7 @@ Tinytest.add("spacebars - compiler", function (test) {
 
       'function (buf) {',
       '  var self = this;',
-      '  buf.component(function () { return ((self.lookup("if")) || EmptyComponent).create({"data": Spacebars.call(self.lookup("foo")), "content": Component.extend({render: function (buf) {',
+      '  buf.component(function () { return ((self.lookup("if")) || Component).create({"data": Spacebars.call(self.lookup("foo")), "content": Component.extend({render: function (buf) {',
       '    buf.text("bar");',
       '  }})}); });',
       '}');
@@ -440,7 +440,7 @@ Tinytest.add("spacebars - compiler", function (test) {
 
       'function (buf) {',
       '  var self = this;',
-      '  buf.component(function () { return ((self.lookup("if")) || EmptyComponent).create({"data": Spacebars.call(self.lookup("foo")), "content": Component.extend({render: function (buf) {',
+      '  buf.component(function () { return ((self.lookup("if")) || Component).create({"data": Spacebars.call(self.lookup("foo")), "content": Component.extend({render: function (buf) {',
       '    buf.text("bar");',
       '  }}), "elseContent": Component.extend({render: function (buf) {',
       '    buf.text("baz");',
diff --git a/packages/ui/component.js b/packages/ui/component.js
index eaf189b66d..d565d967a0 100644
--- a/packages/ui/component.js
+++ b/packages/ui/component.js
@@ -693,10 +693,6 @@ Component.extend = function (options) {
   return newClass;
 };
 
-// @export EmptyComponent
-EmptyComponent = Component.extend({});
-// (might be some optimizations possible in the future)
-
 // @export TextComponent
 TextComponent = Component.extend({
   render: function (buf) {
diff --git a/packages/ui/library.js b/packages/ui/library.js
index 1d9a65872b..eeb9e834bb 100644
--- a/packages/ui/library.js
+++ b/packages/ui/library.js
@@ -85,9 +85,8 @@ Each = Component.extend({
 
     if (items.empty()) {
       buf.component(function () {
-        return (self.getArg('elseContent') ||
-                EmptyComponent).create(
-                  { data: self.getArg('data') });
+        return (self.getArg('elseContent') || Component).create(
+          { data: self.getArg('data') });
       }, { key: 'elseContent' });
     } else {
       items.forEach(function (doc, id) {
@@ -132,8 +131,7 @@ Each = Component.extend({
     var childId = self._itemChildId(id);
     if (self.items.size() === 0) {
       // made empty
-      var elseClass = self.getArg('elseContent') ||
-            EmptyComponent;
+      var elseClass = self.getArg('elseContent') || Component;
       var comp = elseClass.create({data: self.getArg('data')});
       self.replaceChild(childId, comp, 'elseContent');
     } else {