Permalink
Browse files

bump jasmine and handlebars_assets, postfix all handlebars templates …

…with _tpl to avoid name clashes
  • Loading branch information...
1 parent 97e05b6 commit 3dbbbbe9792cf559bdacdf188eebd7ebab9cb9da @jhass jhass committed Sep 12, 2012
Showing with 13 additions and 17 deletions.
  1. +3 −2 Gemfile
  2. +8 −13 Gemfile.lock
  3. +1 −1 app/assets/javascripts/app/helpers/handlebars-partials.js
  4. +1 −1 app/assets/javascripts/app/views.js
  5. 0 app/assets/templates/{activity-streams-photo.jst.hbs → activity-streams-photo_tpl.jst.hbs}
  6. 0 app/assets/templates/{aspects-dropdown.jst.hbs → aspects-dropdown_tpl.jst.hbs}
  7. 0 app/assets/templates/{comment-stream.jst.hbs → comment-stream_tpl.jst.hbs}
  8. 0 app/assets/templates/{comment.jst.hbs → comment_tpl.jst.hbs}
  9. 0 app/assets/templates/{composer-controls.jst.hbs → composer-controls_tpl.jst.hbs}
  10. 0 app/assets/templates/{feedback-actions.jst.hbs → feedback-actions_tpl.jst.hbs}
  11. 0 app/assets/templates/{feedback.jst.hbs → feedback_tpl.jst.hbs}
  12. 0 app/assets/templates/{flow.jst.hbs → flow_tpl.jst.hbs}
  13. 0 app/assets/templates/{framer-content.jst.hbs → framer-content_tpl.jst.hbs}
  14. 0 app/assets/templates/{framer-controls.jst.hbs → framer-controls_tpl.jst.hbs}
  15. 0 app/assets/templates/{header.jst.hbs → header_tpl.jst.hbs}
  16. 0 app/assets/templates/{likes-info.jst.hbs → likes-info_tpl.jst.hbs}
  17. 0 app/assets/templates/{mood.jst.hbs → mood_tpl.jst.hbs}
  18. 0 app/assets/templates/{oembed.jst.hbs → oembed_tpl.jst.hbs}
  19. 0 app/assets/templates/{photo-viewer.jst.hbs → photo-viewer_tpl.jst.hbs}
  20. 0 app/assets/templates/{photo.jst.hbs → photo_tpl.jst.hbs}
  21. 0 app/assets/templates/{picture-form.jst.hbs → picture-form_tpl.jst.hbs}
  22. 0 app/assets/templates/{post-form.jst.hbs → post-form_tpl.jst.hbs}
  23. 0 app/assets/templates/{post-new.jst.hbs → post-new_tpl.jst.hbs}
  24. 0 app/assets/templates/post-viewer/{author.jst.hbs → author_tpl.jst.hbs}
  25. 0 app/assets/templates/post-viewer/{comment.jst.hbs → comment_tpl.jst.hbs}
  26. 0 ...mplates/post-viewer/content/{activity-streams-photo.jst.hbs → activity-streams-photo_tpl.jst.hbs}
  27. 0 app/assets/templates/post-viewer/content/{note.jst.hbs → note_tpl.jst.hbs}
  28. 0 app/assets/templates/post-viewer/content/{photo-backdrop.jst.hbs → photo-backdrop_tpl.jst.hbs}
  29. 0 app/assets/templates/post-viewer/content/{rich-media.jst.hbs → rich-media_tpl.jst.hbs}
  30. 0 app/assets/templates/post-viewer/content/{status.jst.hbs → status_tpl.jst.hbs}
  31. 0 app/assets/templates/post-viewer/{feedback.jst.hbs → feedback_tpl.jst.hbs}
  32. 0 app/assets/templates/post-viewer/{interactions.jst.hbs → interactions_tpl.jst.hbs}
  33. 0 app/assets/templates/post-viewer/{nav.jst.hbs → nav_tpl.jst.hbs}
  34. 0 app/assets/templates/post-viewer/{new-comment.jst.hbs → new-comment_tpl.jst.hbs}
  35. 0 app/assets/templates/post-viewer/{reactions.jst.hbs → reactions_tpl.jst.hbs}
  36. 0 app/assets/templates/{post-viewer.jst.hbs → post-viewer_tpl.jst.hbs}
  37. 0 app/assets/templates/{profile-info.jst.hbs → profile-info_tpl.jst.hbs}
  38. 0 app/assets/templates/{profile.jst.hbs → profile_tpl.jst.hbs}
  39. 0 app/assets/templates/{reshare.jst.hbs → reshare_tpl.jst.hbs}
  40. 0 app/assets/templates/{services-selector.jst.hbs → services-selector_tpl.jst.hbs}
  41. 0 app/assets/templates/small-frame/{default.jst.hbs → default_tpl.jst.hbs}
  42. 0 app/assets/templates/{static-text.jst.hbs → static-text_tpl.jst.hbs}
  43. 0 app/assets/templates/{status-message.jst.hbs → status-message_tpl.jst.hbs}
  44. 0 app/assets/templates/{stream-element.jst.hbs → stream-element_tpl.jst.hbs}
  45. 0 app/assets/templates/{stream-faces.jst.hbs → stream-faces_tpl.jst.hbs}
  46. 0 app/assets/templates/{stream-frame.jst.hbs → stream-frame_tpl.jst.hbs}
  47. 0 app/assets/templates/{stream-interactions.jst.hbs → stream-interactions_tpl.jst.hbs}
  48. 0 app/assets/templates/{stream.jst.hbs → stream_tpl.jst.hbs}
  49. 0 app/assets/templates/{wallpaper-form.jst.hbs → wallpaper-form_tpl.jst.hbs}
  50. 0 app/assets/templates/{wallpaper-mood.jst.hbs → wallpaper-mood_tpl.jst.hbs}
View
@@ -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
View
@@ -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!
@@ -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'])
});
@@ -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")
}

0 comments on commit 3dbbbbe

Please sign in to comment.