diff --git a/Gemfile b/Gemfile
index 697034b85828457d099ebd60432a14299c465aa3..e02acd9de981dd8d43e3658326d5e79d43bbc0d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c9f03c7d49fce26fcde878a1d03268b0e1f0105..0124904807d7d31d79d4219dd3465fecc95f0c55 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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!
diff --git a/app/assets/javascripts/app/helpers/handlebars-partials.js b/app/assets/javascripts/app/helpers/handlebars-partials.js
index eb4e1b5e9ec9b421ef7e64bf81a32c44414336e1..ac42bf4857f69d8649903383ddb6c91f6fdd4246 100644
--- a/app/assets/javascripts/app/helpers/handlebars-partials.js
+++ b/app/assets/javascripts/app/helpers/handlebars-partials.js
@@ -1,4 +1,4 @@
/* 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'])
});
diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js
index 629a528b9e6762e2042609954868b636386acd76..d9871d22c73cabab7d3af6550b445495323f9a68 100644
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -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")
}
diff --git a/app/assets/templates/activity-streams-photo.jst.hbs b/app/assets/templates/activity-streams-photo_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/activity-streams-photo.jst.hbs
rename to app/assets/templates/activity-streams-photo_tpl.jst.hbs
diff --git a/app/assets/templates/aspects-dropdown.jst.hbs b/app/assets/templates/aspects-dropdown_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/aspects-dropdown.jst.hbs
rename to app/assets/templates/aspects-dropdown_tpl.jst.hbs
diff --git a/app/assets/templates/comment-stream.jst.hbs b/app/assets/templates/comment-stream_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/comment-stream.jst.hbs
rename to app/assets/templates/comment-stream_tpl.jst.hbs
diff --git a/app/assets/templates/comment.jst.hbs b/app/assets/templates/comment_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/comment.jst.hbs
rename to app/assets/templates/comment_tpl.jst.hbs
diff --git a/app/assets/templates/composer-controls.jst.hbs b/app/assets/templates/composer-controls_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/composer-controls.jst.hbs
rename to app/assets/templates/composer-controls_tpl.jst.hbs
diff --git a/app/assets/templates/feedback-actions.jst.hbs b/app/assets/templates/feedback-actions_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/feedback-actions.jst.hbs
rename to app/assets/templates/feedback-actions_tpl.jst.hbs
diff --git a/app/assets/templates/feedback.jst.hbs b/app/assets/templates/feedback_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/feedback.jst.hbs
rename to app/assets/templates/feedback_tpl.jst.hbs
diff --git a/app/assets/templates/flow.jst.hbs b/app/assets/templates/flow_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/flow.jst.hbs
rename to app/assets/templates/flow_tpl.jst.hbs
diff --git a/app/assets/templates/framer-content.jst.hbs b/app/assets/templates/framer-content_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/framer-content.jst.hbs
rename to app/assets/templates/framer-content_tpl.jst.hbs
diff --git a/app/assets/templates/framer-controls.jst.hbs b/app/assets/templates/framer-controls_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/framer-controls.jst.hbs
rename to app/assets/templates/framer-controls_tpl.jst.hbs
diff --git a/app/assets/templates/header.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/header.jst.hbs
rename to app/assets/templates/header_tpl.jst.hbs
diff --git a/app/assets/templates/likes-info.jst.hbs b/app/assets/templates/likes-info_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/likes-info.jst.hbs
rename to app/assets/templates/likes-info_tpl.jst.hbs
diff --git a/app/assets/templates/mood.jst.hbs b/app/assets/templates/mood_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/mood.jst.hbs
rename to app/assets/templates/mood_tpl.jst.hbs
diff --git a/app/assets/templates/oembed.jst.hbs b/app/assets/templates/oembed_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/oembed.jst.hbs
rename to app/assets/templates/oembed_tpl.jst.hbs
diff --git a/app/assets/templates/photo-viewer.jst.hbs b/app/assets/templates/photo-viewer_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/photo-viewer.jst.hbs
rename to app/assets/templates/photo-viewer_tpl.jst.hbs
diff --git a/app/assets/templates/photo.jst.hbs b/app/assets/templates/photo_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/photo.jst.hbs
rename to app/assets/templates/photo_tpl.jst.hbs
diff --git a/app/assets/templates/picture-form.jst.hbs b/app/assets/templates/picture-form_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/picture-form.jst.hbs
rename to app/assets/templates/picture-form_tpl.jst.hbs
diff --git a/app/assets/templates/post-form.jst.hbs b/app/assets/templates/post-form_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-form.jst.hbs
rename to app/assets/templates/post-form_tpl.jst.hbs
diff --git a/app/assets/templates/post-new.jst.hbs b/app/assets/templates/post-new_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-new.jst.hbs
rename to app/assets/templates/post-new_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/author.jst.hbs b/app/assets/templates/post-viewer/author_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/author.jst.hbs
rename to app/assets/templates/post-viewer/author_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/comment.jst.hbs b/app/assets/templates/post-viewer/comment_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/comment.jst.hbs
rename to app/assets/templates/post-viewer/comment_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/content/activity-streams-photo.jst.hbs b/app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/content/activity-streams-photo.jst.hbs
rename to app/assets/templates/post-viewer/content/activity-streams-photo_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/content/note.jst.hbs b/app/assets/templates/post-viewer/content/note_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/content/note.jst.hbs
rename to app/assets/templates/post-viewer/content/note_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/content/photo-backdrop.jst.hbs b/app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/content/photo-backdrop.jst.hbs
rename to app/assets/templates/post-viewer/content/photo-backdrop_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/content/rich-media.jst.hbs b/app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/content/rich-media.jst.hbs
rename to app/assets/templates/post-viewer/content/rich-media_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/content/status.jst.hbs b/app/assets/templates/post-viewer/content/status_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/content/status.jst.hbs
rename to app/assets/templates/post-viewer/content/status_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/feedback.jst.hbs b/app/assets/templates/post-viewer/feedback_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/feedback.jst.hbs
rename to app/assets/templates/post-viewer/feedback_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/interactions.jst.hbs b/app/assets/templates/post-viewer/interactions_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/interactions.jst.hbs
rename to app/assets/templates/post-viewer/interactions_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/nav.jst.hbs b/app/assets/templates/post-viewer/nav_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/nav.jst.hbs
rename to app/assets/templates/post-viewer/nav_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/new-comment.jst.hbs b/app/assets/templates/post-viewer/new-comment_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/new-comment.jst.hbs
rename to app/assets/templates/post-viewer/new-comment_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer/reactions.jst.hbs b/app/assets/templates/post-viewer/reactions_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer/reactions.jst.hbs
rename to app/assets/templates/post-viewer/reactions_tpl.jst.hbs
diff --git a/app/assets/templates/post-viewer.jst.hbs b/app/assets/templates/post-viewer_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/post-viewer.jst.hbs
rename to app/assets/templates/post-viewer_tpl.jst.hbs
diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/profile-info.jst.hbs
rename to app/assets/templates/profile-info_tpl.jst.hbs
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/profile.jst.hbs
rename to app/assets/templates/profile_tpl.jst.hbs
diff --git a/app/assets/templates/reshare.jst.hbs b/app/assets/templates/reshare_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/reshare.jst.hbs
rename to app/assets/templates/reshare_tpl.jst.hbs
diff --git a/app/assets/templates/services-selector.jst.hbs b/app/assets/templates/services-selector_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/services-selector.jst.hbs
rename to app/assets/templates/services-selector_tpl.jst.hbs
diff --git a/app/assets/templates/small-frame/default.jst.hbs b/app/assets/templates/small-frame/default_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/small-frame/default.jst.hbs
rename to app/assets/templates/small-frame/default_tpl.jst.hbs
diff --git a/app/assets/templates/static-text.jst.hbs b/app/assets/templates/static-text_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/static-text.jst.hbs
rename to app/assets/templates/static-text_tpl.jst.hbs
diff --git a/app/assets/templates/status-message.jst.hbs b/app/assets/templates/status-message_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/status-message.jst.hbs
rename to app/assets/templates/status-message_tpl.jst.hbs
diff --git a/app/assets/templates/stream-element.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/stream-element.jst.hbs
rename to app/assets/templates/stream-element_tpl.jst.hbs
diff --git a/app/assets/templates/stream-faces.jst.hbs b/app/assets/templates/stream-faces_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/stream-faces.jst.hbs
rename to app/assets/templates/stream-faces_tpl.jst.hbs
diff --git a/app/assets/templates/stream-frame.jst.hbs b/app/assets/templates/stream-frame_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/stream-frame.jst.hbs
rename to app/assets/templates/stream-frame_tpl.jst.hbs
diff --git a/app/assets/templates/stream-interactions.jst.hbs b/app/assets/templates/stream-interactions_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/stream-interactions.jst.hbs
rename to app/assets/templates/stream-interactions_tpl.jst.hbs
diff --git a/app/assets/templates/stream.jst.hbs b/app/assets/templates/stream_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/stream.jst.hbs
rename to app/assets/templates/stream_tpl.jst.hbs
diff --git a/app/assets/templates/wallpaper-form.jst.hbs b/app/assets/templates/wallpaper-form_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/wallpaper-form.jst.hbs
rename to app/assets/templates/wallpaper-form_tpl.jst.hbs
diff --git a/app/assets/templates/wallpaper-mood.jst.hbs b/app/assets/templates/wallpaper-mood_tpl.jst.hbs
similarity index 100%
rename from app/assets/templates/wallpaper-mood.jst.hbs
rename to app/assets/templates/wallpaper-mood_tpl.jst.hbs