diff --git a/public/javascripts/models/task.js b/public/javascripts/models/task.js index 274bd1a..3d68270 100644 --- a/public/javascripts/models/task.js +++ b/public/javascripts/models/task.js @@ -9,7 +9,6 @@ Backbone var TaskModel = Backbone.Model.extend({ defaults: { - parent: 0, parentId: 0, content: '', isCompleted: 0 diff --git a/public/javascripts/views/list.js b/public/javascripts/views/list.js index 93bc96a..be0f6b1 100644 --- a/public/javascripts/views/list.js +++ b/public/javascripts/views/list.js @@ -37,10 +37,10 @@ TaskView model: task }); var a = taskView.render(); - if (a.model.get('parent')===null||a.model.get('parent')===0) + if (a.model.get('parentId')===0) this.$el.append(a.el); else - a.$el.insertAfter($('*[data-id="'+a.model.get('parent')+'"]').parents('li:first')); + a.$el.insertAfter($('*[data-id="'+a.model.get('parentId')+'"]').parents('li:first')); } }); diff --git a/public/javascripts/views/task.js b/public/javascripts/views/task.js index aa9efea..4a3a94f 100644 --- a/public/javascripts/views/task.js +++ b/public/javascripts/views/task.js @@ -160,11 +160,15 @@ define( }); }, + /** + * Add a new blank note + * @param {object} inputEle Input elelement from parent item + */ addNote: function (inputEle) { var $inputEle = $(inputEle); Tasks.add({ content: '', - parentId: this.model.get('parentId') + parentId: $inputEle.data('id')||0 }); $inputEle.blur(); $inputEle.closest('li').next('li').find('input').focus(); diff --git a/public/templates/task.html b/public/templates/task.html index b15103b..8eb73bc 100644 --- a/public/templates/task.html +++ b/public/templates/task.html @@ -15,11 +15,11 @@ - + <% if(model.isCompleted){%> <%}else {%> <%}%> - \ No newline at end of file + diff --git a/server.js b/server.js index ac6ddd9..9a4f909 100644 --- a/server.js +++ b/server.js @@ -44,7 +44,7 @@ app.get('/tasks', function (req, res) { app.post('/tasks', function (req, res) { Tasks.create({ content: req.body.content, - parent: parseInt(req.body.parent) || 0, + parentId: parseInt(req.body.parentId) || 0, isCompleted: false }).then(function (task) { res.send(task); @@ -58,10 +58,11 @@ app.get('/tasks/:id', function (req, res) { }); app.put('/tasks/:id', function (req, res) { - console.log(req.body.isCompleted); + console.log({isCompleted: req.body.isCompleted}); Tasks.findById(req.params.id).then(function (task) { task.content = req.body.content; - task.parent = parseInt(req.body.parent) || 0, + console.log({view: "put('/tasks/:id)", body:req.body}); + task.parentId = parseInt(req.body.parentId) || 0, task.isCompleted = req.body.isCompleted == 1; task.save().then(function (task) { res.send(task);