Merge pull request #39 from ashes999/master

Timer Component
craftyjs · Mar 22, 2014 · 10dce03 · 10dce03
2 parents 598d958 + 7c7188a
commit 10dce03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/components/components.json b/components/components.json
@@ -1,4 +1,5 @@
 [
   {"name":"TiledMapBuilder", "link": "https://github.com/Kibo/TiledMapBuilder"}
 , {"name":"ProgressBar", "link": "https://github.com/mucaho/crafty-component-progressbar"}
+, {"name":"Timer", "link": "https://github.com/deengames/a-day-and-a-night/blob/master/src/components/timer.js"}
 ]
diff --git a/components/index.html b/components/index.html
@@ -50,10 +50,10 @@ <h2>Components</h2>
       Components.each(this.addOne, this);
     },
     render: function() {
-      this.$el.find('.component-count').text('There is ' + Components.length + ' components!');
+      this.$el.find('.component-count').text('There are ' + Components.length + ' components!');
       // Nothing really change in the app yet
       // TODO Search, Columns
     }
   });
   var App = new AppView;
-</script>
+</script>