mirror of
https://github.com/wassname/HackFlowy.git
synced 2026-06-27 16:00:04 +08:00
Merge pull request #15 from desyncr/fix-initial-view
Minor fixes on front end code
This commit is contained in:
+2
-3
@@ -21,9 +21,8 @@
|
||||
<div id="name">
|
||||
<h2></h2>
|
||||
</div>
|
||||
<ul class="children"></ul>
|
||||
<!-- <button id="add">+</button>
|
||||
<input id="newTask" type="text" placeholder="What needs to be done?"> -->
|
||||
<ul class="children">
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
<footer id="footer">
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
define(
|
||||
['jquery',
|
||||
'backbone',
|
||||
'views/list'
|
||||
'views/list',
|
||||
'models/task'
|
||||
],
|
||||
|
||||
function(
|
||||
$,
|
||||
Backbone,
|
||||
ListView
|
||||
ListView,
|
||||
Task
|
||||
) {
|
||||
|
||||
var PageView = Backbone.View.extend({
|
||||
|
||||
@@ -35,7 +35,7 @@ taskTemplate
|
||||
this.listenTo(this.model, 'change', this.render);
|
||||
this.listenTo(this.model, 'destroy', this.remove);
|
||||
this.socket = io.connect();
|
||||
var task = this;
|
||||
var task = this;
|
||||
this.socket.on('task', function(data){
|
||||
if (task.model.id == data.id) {
|
||||
task.model.set({'content':data.content, 'is_completed':data.is_completed});
|
||||
|
||||
+20
-32
@@ -1,37 +1,25 @@
|
||||
<div class="task-wrappper">
|
||||
<div class="task">
|
||||
<div class="task">
|
||||
<div class="link">•
|
||||
|
||||
<div class="options">
|
||||
<div class="options-left">
|
||||
<div class="mouse-tip"></div>
|
||||
<% if(model.is_completed=='Y'){%>
|
||||
<a class="uncomplete">
|
||||
Uncomplete
|
||||
<hr>
|
||||
</a>
|
||||
<%}else {%>
|
||||
<a class="complete">
|
||||
Complete
|
||||
<hr>
|
||||
</a>
|
||||
<%}%>
|
||||
<a class="note">
|
||||
<span class="note">Add Note</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<% if(model.is_completed=='Y'){%>
|
||||
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit task-completed">
|
||||
<%}else {%>
|
||||
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit">
|
||||
<%}%>
|
||||
<div class="divNote">
|
||||
<textarea></textarea>
|
||||
<div class="options-left">
|
||||
<div class="mouse-tip"></div>
|
||||
<% if(model.is_completed=='Y'){%>
|
||||
<a class="uncomplete">Uncomplete<hr></a>
|
||||
<%}else {%>
|
||||
<a class="complete">Complete<hr></a>
|
||||
<%}%>
|
||||
<a class="note">
|
||||
<span class="note">Add Note</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<% if(model.is_completed=='Y'){%>
|
||||
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit task-completed">
|
||||
<%}else {%>
|
||||
<input value="<%= model.content %>" data-id="<%= model.id %>" class="edit">
|
||||
<%}%>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user