diff --git a/app/assets/javascripts/backbone/models/comment.js.coffee b/app/assets/javascripts/backbone/models/comment.js.coffee index d4f3e5d..6d3bfbd 100644 --- a/app/assets/javascripts/backbone/models/comment.js.coffee +++ b/app/assets/javascripts/backbone/models/comment.js.coffee @@ -3,6 +3,7 @@ class RailsBackboneRelational.Models.Comment extends Backbone.RelationalModel defaults: content: null + done: false #initialize: () -> #console.log(this) diff --git a/app/assets/javascripts/backbone/models/comment.js.coffee~ b/app/assets/javascripts/backbone/models/comment.js.coffee~ index 33260d7..d4f3e5d 100644 --- a/app/assets/javascripts/backbone/models/comment.js.coffee~ +++ b/app/assets/javascripts/backbone/models/comment.js.coffee~ @@ -4,8 +4,8 @@ class RailsBackboneRelational.Models.Comment extends Backbone.RelationalModel defaults: content: null - initialize: () -> - console.log(this) + #initialize: () -> + #console.log(this) #alert('brothers:') #save: -> #alert('save') diff --git a/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs b/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs index c60a3b1..1d40f9f 100644 --- a/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs +++ b/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs @@ -1,6 +1,9 @@
+ + + />
@@ -11,6 +14,7 @@ + kill diff --git a/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~ b/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~ index 6d69493..af021f4 100644 --- a/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~ +++ b/app/assets/javascripts/backbone/templates/comments/comment.jst.ejs~ @@ -1,6 +1,9 @@ - +
+ + + />
@@ -11,8 +14,9 @@ + kill - +
diff --git a/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee b/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee index 4e75412..be8a096 100644 --- a/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee +++ b/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee @@ -5,8 +5,11 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View events: "click .destroy" : "destroy" - "click .todo-array button": "show_index" + "dblclick .todo-array button": "show_index" + "click .todo-array button": "whiteSpaceCheck" + "click .check" : "toggleDone" + #"hover .todo-array button": "show_tooltip" initialize: () -> @@ -16,7 +19,8 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View tagName: "td" - + toggleDone : () -> + return destroy: () -> @model.destroy() @@ -60,12 +64,23 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View alert(num) - show_index: (ev) -> - num = $(ev.target).index() + show_index: (ev) -> + item = $(ev.target) + num =(item).index() array = @model.split() array[num...num] = ['='] text = array.join("") @model.save( content: text ) + + whiteSpaceCheck: (ev) -> + item = $(ev.target) + + $(item).toggleClass("test1"); + num =(item).index() + + + + diff --git a/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee~ b/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee~ index 17ef234..be8a096 100644 --- a/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee~ +++ b/app/assets/javascripts/backbone/views/comments/comment_view.js.coffee~ @@ -5,8 +5,11 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View events: "click .destroy" : "destroy" - "click .todo-array button": "show_index" + "dblclick .todo-array button": "show_index" + "click .todo-array button": "whiteSpaceCheck" + "click .check" : "toggleDone" + #"hover .todo-array button": "show_tooltip" initialize: () -> @@ -14,9 +17,10 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View className: 'sspann' - tagName: "div" - + tagName: "td" + toggleDone : () -> + return destroy: () -> @model.destroy() @@ -60,12 +64,23 @@ class RailsBackboneRelational.Views.Comments.CommentView extends Backbone.View alert(num) - show_index: (ev) -> - num = $(ev.target).index() + show_index: (ev) -> + item = $(ev.target) + num =(item).index() array = @model.split() array[num...num] = ['='] text = array.join("") @model.save( content: text ) + + whiteSpaceCheck: (ev) -> + item = $(ev.target) + + $(item).toggleClass("test1"); + num =(item).index() + + + + diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less index ef16129..3b2f72d 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less @@ -108,5 +108,20 @@ white-space:normal; border:1px solid #0000ff; font-stretch:expanded; font-weight:bold; +/* + *transition-delay: 1s; + */ +} +.test1{ + +white-space:normal; + +border:1px solid #0000ff; +font-stretch:expanded; +font-weight:bold; +/* + *transition-delay: 1s; + */ } + diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less~ b/app/assets/stylesheets/bootstrap_and_overrides.css.less~ index 5dc8a49..953d54b 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css.less~ +++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less~ @@ -1,5 +1,7 @@ @import "twitter/bootstrap/bootstrap"; -@import "twitter/bootstrap/responsive"; +/* + *@import "twitter/bootstrap/responsive"; + */ // Set the correct sprite paths @@ -106,5 +108,10 @@ white-space:normal; border:1px solid #0000ff; font-stretch:expanded; font-weight:bold; +transition-delay: 11s; } +.test1{ + +} +