Merge branch 'el-cached' into develop

mkelley33 · Nov 8, 2012 · 714d15b · 714d15b
2 parents a4f89d7 + 3898971
commit 714d15b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/lib/generators/backbone/router/templates/view.coffee b/lib/generators/backbone/router/templates/view.coffee
@@ -4,5 +4,5 @@ class <%= view_namespace %>.<%= @action.camelize %>View extends Backbone.View
   template: JST["<%= jst @action %>"]
 
   render: ->
-    $(@el).html(@template())
+    @$el.html(@template())
     return this
diff --git a/lib/generators/backbone/scaffold/templates/views/edit_view.coffee b/lib/generators/backbone/scaffold/templates/views/edit_view.coffee
@@ -17,7 +17,7 @@ class <%= view_namespace %>.EditView extends Backbone.View
     )
 
   render : ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
 
     this.$("form").backboneLink(@model)
 

diff --git a/lib/generators/backbone/scaffold/templates/views/index_view.coffee b/lib/generators/backbone/scaffold/templates/views/index_view.coffee
@@ -14,7 +14,7 @@ class <%= view_namespace %>.IndexView extends Backbone.View
     @$("tbody").append(view.render().el)
 
   render: =>
-    $(@el).html(@template(<%= plural_model_name %>: @options.<%= plural_model_name %>.toJSON() ))
+    @$el.html(@template(<%= plural_model_name %>: @options.<%= plural_model_name %>.toJSON() ))
     @addAll()
 
     return this
diff --git a/lib/generators/backbone/scaffold/templates/views/model_view.coffee b/lib/generators/backbone/scaffold/templates/views/model_view.coffee
@@ -15,5 +15,5 @@ class <%= view_namespace %>.<%= singular_name.camelize %>View extends Backbone.V
     return false
 
   render: ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
     return this
diff --git a/lib/generators/backbone/scaffold/templates/views/new_view.coffee b/lib/generators/backbone/scaffold/templates/views/new_view.coffee
@@ -30,7 +30,7 @@ class <%= view_namespace %>.NewView extends Backbone.View
     )
 
   render: ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
 
     this.$("form").backboneLink(@model)
 

diff --git a/lib/generators/backbone/scaffold/templates/views/show_view.coffee b/lib/generators/backbone/scaffold/templates/views/show_view.coffee
@@ -4,5 +4,5 @@ class <%= view_namespace %>.ShowView extends Backbone.View
   template: JST["<%= jst 'show' %>"]
 
   render: ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
     return this
diff --git a/test/dummy/app/assets/javascripts/backbone/views/posts/edit_view.js.coffee b/test/dummy/app/assets/javascripts/backbone/views/posts/edit_view.js.coffee
@@ -17,7 +17,7 @@ class Dummy.Views.Posts.EditView extends Backbone.View
     )
 
   render : ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
 
     this.$("form").backboneLink(@model)
 

diff --git a/test/dummy/app/assets/javascripts/backbone/views/posts/index_view.js.coffee b/test/dummy/app/assets/javascripts/backbone/views/posts/index_view.js.coffee
@@ -14,7 +14,7 @@ class Dummy.Views.Posts.IndexView extends Backbone.View
     @$("tbody").append(view.render().el)
 
   render: =>
-    $(@el).html(@template(posts: @options.posts.toJSON() ))
+    @$el.html(@template(posts: @options.posts.toJSON() ))
     @addAll()
 
     return this
diff --git a/test/dummy/app/assets/javascripts/backbone/views/posts/new_view.js.coffee b/test/dummy/app/assets/javascripts/backbone/views/posts/new_view.js.coffee
@@ -30,7 +30,7 @@ class Dummy.Views.Posts.NewView extends Backbone.View
     )
 
   render: ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
 
     this.$("form").backboneLink(@model)
 

diff --git a/test/dummy/app/assets/javascripts/backbone/views/posts/post_view.js.coffee b/test/dummy/app/assets/javascripts/backbone/views/posts/post_view.js.coffee
@@ -15,5 +15,5 @@ class Dummy.Views.Posts.PostView extends Backbone.View
     return false
 
   render: ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
     return this
diff --git a/test/dummy/app/assets/javascripts/backbone/views/posts/show_view.js.coffee b/test/dummy/app/assets/javascripts/backbone/views/posts/show_view.js.coffee
@@ -4,5 +4,5 @@ class Dummy.Views.Posts.ShowView extends Backbone.View
   template: JST["backbone/templates/posts/show"]
 
   render: ->
-    $(@el).html(@template(@model.toJSON() ))
+    @$el.html(@template(@model.toJSON() ))
     return this