Commit 3dbbbbe9 authored by Jonne Haß's avatar Jonne Haß

bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl...

bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes
parent 97e05b62
......@@ -122,7 +122,7 @@ group :assets do
# gem 'therubyracer', :platform => :ruby
gem 'handlebars_assets', '0.4.4'
gem 'handlebars_assets', '0.6.5'
gem 'uglifier', '1.3.0'
# asset_sync is required as needed by application.rb
......@@ -137,7 +137,8 @@ gem 'faraday', '0.8.1'
gem 'faraday_middleware', '0.8.7'
gem 'jasmine', :git => 'https://github.com/pivotal/jasmine-gem.git'
gem 'jasmine', '1.2.1'
### GROUPS ####
group :test do
......
......@@ -31,16 +31,6 @@ GIT
specs:
settingslogic (2.0.8)
GIT
remote: https://github.com/pivotal/jasmine-gem.git
revision: 1e075fbf5a69812fcc914c453f002ecf5bed38ab
specs:
jasmine (1.2.0)
jasmine-core (>= 1.2.0)
rack (~> 1.0)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
GIT
remote: https://github.com/plataformatec/markerb.git
revision: 93b1e8bea9b8fa89ef930f78ba562f596c022198
......@@ -209,7 +199,7 @@ GEM
guard (>= 0.10.0)
spork (>= 0.8.4)
haml (3.1.7)
handlebars_assets (0.4.4)
handlebars_assets (0.6.5)
execjs (>= 1.2.9)
sprockets (>= 2.0.3)
tilt
......@@ -240,6 +230,11 @@ GEM
actionpack (~> 3.0)
i18n-inflector (~> 2.6)
railties (~> 3.0)
jasmine (1.2.1)
jasmine-core (>= 1.2.0)
rack (~> 1.0)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.2.0)
journey (1.0.4)
jquery-rails (2.0.2)
......@@ -488,12 +483,12 @@ DEPENDENCIES
guard-rspec (= 0.7.3)
guard-spork (= 0.8.0)
haml (= 3.1.7)
handlebars_assets (= 0.4.4)
handlebars_assets (= 0.6.5)
heroku (= 2.28.12)
heroku_san (= 3.0.4)
http_accept_language (= 1.0.2)
i18n-inflector-rails (~> 1.0)
jasmine!
jasmine (= 1.2.1)
jquery-rails (= 2.0.2)
json (= 1.7.5)
markerb!
......
/* we need to wrap this in a document ready to ensure JST is accessible */
$(function(){
Handlebars.registerPartial('status-message', JST['status-message'])
Handlebars.registerPartial('status-message', JST['status-message_tpl'])
});
......@@ -40,7 +40,7 @@ app.views.Base = Backbone.View.extend({
renderTemplate : function(){
var presenter = _.isFunction(this.presenter) ? this.presenter() : this.presenter
this.template = JST[this.templateName]
this.template = JST[this.templateName+"_tpl"]
if(!this.template) {
console.log(this.templateName ? ("no template for " + this.templateName) : "no templateName specified")
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment