fix the use of _.template

"Underscore templates no longer accept an initial data object. _.template always returns a function now."
it3s · Oct 22, 2014 · 1d17582 · 1d17582
1 parent ae04236
commit 1d17582
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app/assets/javascripts/components/importEdit.js.coffee b/app/assets/javascripts/components/importEdit.js.coffee
@@ -33,9 +33,9 @@ App.components.importEdit = ->
 
   showErrors: ->
     if !@hasMap()
-      _tpl = _.template(@errMessage, msg: I18n.imports.errors.map)
+      _tpl = _.template(@errMessage)(msg: I18n.imports.errors.map)
       @attr.errsDiv.append _tpl
 
     if !@allEntriesAreValid()
-      _tpl = _.template(@errMessage, msg: I18n.imports.errors.invalid)
+      _tpl = _.template(@errMessage)(msg: I18n.imports.errors.invalid)
       @attr.errsDiv.append _tpl
diff --git a/app/assets/javascripts/components/overlay.js.coffee b/app/assets/javascripts/components/overlay.js.coffee
@@ -13,6 +13,6 @@ App.components.overlay = ->
     @render()
 
   render: ->
-    @overlay = $ _.template(overlayTemplate, @attr)
+    @overlay = $ _.template(overlayTemplate)(@attr)
     @container.css 'position', 'relative'
     @container.prepend @overlay
diff --git a/app/assets/javascripts/components/pictureUploader.js.coffee b/app/assets/javascripts/components/pictureUploader.js.coffee
@@ -26,7 +26,7 @@ App.components.pictureUploader = ->
       , 200)
 
     addPictureThumb: (result) ->
-      picture = $ _.template(@pictureThumb, result)
+      picture = $ _.template(@pictureThumb)(result)
       @picturesList.prepend picture
       App.mediator.publish 'components:start', picture
 

diff --git a/app/assets/javascripts/components/uploader.js.coffee b/app/assets/javascripts/components/uploader.js.coffee
@@ -12,7 +12,7 @@ App.components.uploader = ->
   method: 'PATCH'
 
   attributes: ->
-    _uploader = $ _.template(uploaderTemplate, buttonLabel: @buttonLabel)
+    _uploader = $ _.template(uploaderTemplate)(buttonLabel: @buttonLabel)
     {
       field:    @container.closest('.field')
       uploader: _uploader

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -13,7 +13,7 @@ en:
   profile: 'profile'
   you: 'you'
 
-  empty_location: "Loocation not provided yet"
+  empty_location: "Location not provided yet"
 
   search:
     empty: "No results found!"