Update to match commit cfc98b0f on Backbone.js

zachwill · Dec 30, 2011 · 927c2b0 · 927c2b0
1 parent 8afb6d0
commit 927c2b0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/index.html b/index.html
@@ -50,7 +50,7 @@ <h3>Instructions:</h3>
       <div class="todo <%= done ? 'done' : '' %>">
         <div class="display">
           <input class="check" type="checkbox" <%= done ? 'checked="checked"' : '' %> />
-          <div class="todo-content"></div>
+          <div class="todo-text"></div>
           <span class="todo-destroy"></span>
         </div>
         <div class="edit">

diff --git a/todos.coffee b/todos.coffee
@@ -1,13 +1,9 @@
 $ ->
 
   class Todo extends Backbone.Model
-    defaults:
-      content: "Empty todo..."
+    defaults: ->
       done: false
-
-    initialize: ->
-      if not @get('content')
-        @set content: @defaults.content
+      order: Todos.nextOrder()
 
     toggle: ->
       done = @get('done')
@@ -48,7 +44,7 @@ $ ->
     events:
       'click .check': 'toggleDone'
       'click .todo-destroy': 'clear'
-      'dblclick .todo-content': 'edit'
+      'dblclick .todo-text': 'edit'
       'keypress .todo-input': 'updateOnEnter'
 
     initialize: ->
@@ -57,15 +53,15 @@ $ ->
 
     render: =>
       $(@el).html @template(@model.toJSON())
-      @setContent()
+      @setText()
       return this
 
-    setContent: ->
-      content = @model.get('content')
-      @$('.todo-content').text(content)
+    setText: ->
+      text = @model.get('text')
+      @$('.todo-text').text(text)
       @input = @$('.todo-input')
       @input.bind('blur', @close)
-            .val(content)
+            .val(text)
 
     toggleDone: ->
       @model.toggle()
@@ -75,7 +71,7 @@ $ ->
       @input.focus()
 
     close: =>
-      @model.save content: @input.val()
+      @model.save text: @input.val()
       $(@el).removeClass('editing')
 
     updateOnEnter: (event) ->
@@ -120,14 +116,10 @@ $ ->
     addAll: =>
       Todos.each(@addOne)
 
-    newAttributes: ->
-      content: @input.val()
-      order: Todos.nextOrder()
-      done: false
-
     createOnEnter: (event) ->
-      if event.keyCode is 13
-        Todos.create @newAttributes()
+      text = @input.val()
+      if text and event.keyCode is 13
+        Todos.create(text: text)
         @input.val('')
 
     clearCompleted: ->

diff --git a/todos.css b/todos.css
@@ -149,7 +149,7 @@ html {
     margin: 0 10px 0 7px;
     float: left;
   }
-  #todo-list .done .todo-content {
+  #todo-list .done .todo-text {
     text-decoration: line-through;
     color: #777777;
   }