Merge branch 'master' into emberjs

bootstrap.css

@@ -228,6 +228,7 @@ body {
 }
 .container-fluid > .content {
   margin-left: 240px;
+  max-width: 800px;
 }
 a {
   color: #0069d6;

index.html

@@ -59,6 +59,7 @@ <h5>Examples Included For:</h5>
         <li><a href="http://documentcloud.github.com/backbone/">Backbone.js</a></li>  
         <li><a href="http://spinejs.com/">Spine.js</a></li>
         <li><a href="http://sammyjs.org/">Sammy.js</a></li> 
+        <li><a href="http://kmalakoff.github.com/knockback/">Knockback.js</a></li>
         <li><a href="http://knockoutjs.com/">KnockoutJS</a></li> 
         <li><a href="http://developer.yahoo.com/yui/">YUILibrary</a></li> 
         <li><a href="http://angularjs.org/">AngularJS</a></li> 
@@ -79,23 +80,25 @@ <h5>0.2 Changelog</h5>
 
           <h5>Live demos</h5>
           <ul>
-<li><a href="todo-example/emberjs/index.html">Ember.js</a></li> 
-<li><a href="todo-example/javascriptmvc/todo/todo/index.html">JavaScriptMVC</a></li> 
-<li><a href="todo-example/spine/index.html">Spine.js</a></li>
-<li><a href="todo-example/backbone/index.html">Backbone.js</a></li>  
-<li><a href="todo-example/backbone_require/index.html">Backbone.js + RequireJS</a></li>  
-<li><a href="todo-example/sammyjs/index.html">Sammy.js</a></li> 
-<li><a href="todo-example/knockoutjs/index.html">KnockoutJS (MVVM)</a></li> 
-<li><a href="todo-example/yuilibrary/index.html">YUILibrary</a></li> 
-<li><a href="todo-example/angularjs/main/index.html">AngularJS</a></li> 
-<li><a href="todo-example/angularjs/persistencejs/index.html">Angular + PersistenceJS</a></li> 
-<li><a href="todo-example/broke/index.html">Broke.js</a></li> 
-<li><a href="todo-example/fidel/index.html">Fidel.js</a></li>
+          <li><a href="todo-example/emberjs/index.html">Ember.js</a></li> 
+          <li><a href="todo-example/javascriptmvc/todo/todo/index.html">JavaScriptMVC</a></li> 
+          <li><a href="todo-example/spine/index.html">Spine.js</a></li>
+          <li><a href="todo-example/backbone/index.html">Backbone.js</a></li>  
+          <li><a href="todo-example/backbone_require/index.html">Backbone.js + RequireJS</a></li>  
+          <li><a href="todo-example/sammyjs/index.html">Sammy.js</a></li> 
+          <li><a href="todo-example/knockback/todos-classic/index.html">Knockback.js</a></li>
+          <li><a href="todo-example/knockoutjs/index.html">KnockoutJS (MVVM)</a></li> 
+          <li><a href="todo-example/yuilibrary/index.html">YUILibrary</a></li> 
+          <li><a href="todo-example/angularjs/main/index.html">AngularJS</a></li> 
+          <li><a href="todo-example/angularjs/persistencejs/index.html">Angular + PersistenceJS</a></li> 
+          <li><a href="todo-example/broke/index.html">Broke.js</a></li> 
+          <li><a href="todo-example/fidel/index.html">Fidel.js</a></li>
           </ul>
 
           <h5>Contributors</h5>
           <ul>
             <li><a href="http://twitter.com/addyosmani">Addy Osmani</a></li> 
+            <li><a href="https://github.com/boushley">Aaron Boushley</a></li>
             <li><a href="http://twitter.com/jeromegn">Jérôme Gravel-Niquet</a></li> 
             <li><a href="http://twitter.com/justinbmeyer">Justin Meyer</a></li> 
             <li><a href="http://twitter.com/macmann">Alex MacCaw</a></li> 
@@ -105,6 +108,7 @@ <h5>Contributors</h5>
             <li><a href="http://developer.yahoo.com">The YUI team</a></li> 
             <li><a href="https://github.com/jacobmumm">Jacob Mumm</a></li>
             <li><a href="https://github.com/brokenseal">Davide Callegari</a></li>
+            <li><a href="https://github.com/kmalakoff">Kevin Malakoff</a></li>
           </ul>
 
           <h5>Coming Soon</h5>
@@ -122,12 +126,11 @@ <h5>Coming Soon</h5>
         <div class="hero-unit">
           <h1>TodoMVC</h1>
           <p>A common learning application for popular JavaScript MVC frameworks</p>
-          <p><a class="btn primary large" href="https://github.com/addyosmani/todomvc/zipball/v0.2">Download Version 0.2</a> &nbsp;
+          <p><a class="btn primary large" href="https://github.com/addyosmani/todomvc/zipball/master">Download (latest)</a> &nbsp;
           <a class="btn secondary large" href="http://github.com/addyosmani/todomvc">Follow On GitHub</a></p>
         </div>
 
 
-<div class="row">
     <div class="span12">
       <h3>Screenshots</h3>
       <p>A preview of the Todo apps included in the download:</p>
@@ -191,9 +194,6 @@ <h2>Getting Involved</h2>
             <p><a class="btn" href="https://github.com/addyosmani/todomvc/pull/new/master">Submit Pull Request&raquo;</a></p>
 </div>
 
-
- </div>
-
   </div>
 
 

todo-example/emberjs/js/app.js

@@ -159,14 +159,13 @@ Todos.TodoStore = (function () {
 })();
 
 (function () {
-  var items = Todos.TodoStore.findAll();
 
-  if (items.length < 1)
-  {
-    var todo = Todos.Todo.create({'title': 'First Task'});
-    Todos.TodoStore.create(todo);
-    items = [todo];
+  var items = Todos.TodoStore.findAll();
+
+  if(items.length > 1){
+    Todos.todosController.set('[]', items);
   }
+
 
-  Todos.todosController.set('[]', items);
+
 })();