update to use handlebars_wax

becsegal · May 25, 2012 · 53eb88f · 53eb88f
1 parent 5ca3b8e
commit 53eb88f
Show file tree

Hide file tree

Showing 10 changed files with 234 additions and 1,621 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,8 +18,7 @@ gem 'omniauth-foursquare'
 gem 'omniauth-tumblr'
 gem 'omniauth-lastfm'
 
-gem 'hbs'
-gem 'handlebars_assets', :git => 'git://github.com/goggin13/handlebars_assets.git'
+gem 'handlebars_wax', :git => 'git@github.com:goggin13/handlebars_wax.git'
 
 group :assets do
   gem 'sass-rails',   '~> 3.1.4'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,13 +13,12 @@ GIT
       rails
 
 GIT
-  remote: git://github.com/goggin13/handlebars_assets.git
-  revision: d6a500a6c80cda4f990df68cc41d0298f8ebfa61
+  remote: git@github.com:goggin13/handlebars_wax.git
+  revision: 0568d999d7f80aaec2009c9272fc7a0dfd049b2b
   specs:
-    handlebars_assets (0.4.1)
-      execjs (>= 1.2.9)
-      sprockets (>= 2.0.3)
-      tilt
+    handlebars_wax (0.0.1)
+      hbs
+      rails (~> 3.1.4)
 
 PATH
   remote: .
@@ -229,8 +228,7 @@ DEPENDENCIES
   capybara
   coffee-rails (~> 3.1.1)
   factory_girl_rails
-  handlebars_assets!
-  hbs
+  handlebars_wax!
   jquery-rails
   let_me_in!
   omniauth-banters!

diff --git a/app/assets/javascripts/let_me_in/popup.coffee b/app/assets/javascripts/let_me_in/popup.coffee
@@ -3,8 +3,6 @@ window.popup_window = null
 window.popup_close_callback = null
 
 window.closePopup = (json) ->
-  console.debug "closePopup: "
-  console.debug json
   if window.popup_window?
     window.popup_window.close()
   if window.popup_close_callback?

diff --git a/app/controllers/let_me_in/application_controller.rb b/app/controllers/let_me_in/application_controller.rb
@@ -1,11 +1,6 @@
 module LetMeIn
   class ApplicationController < ActionController::Base
     include SessionsHelper
-    before_filter :load_hbs_helpers
     respond_to :html, :json
-
-    def load_hbs_helpers
-      LetMeIn::HandlebarsConfig.register_partials
-    end
   end
 end
diff --git a/app/views/let_me_in/linked_accounts/index.html.erb b/app/views/let_me_in/linked_accounts/index.html.erb
@@ -4,14 +4,14 @@
 
 <div id='linked_accounts'>
   <%= render  :partial => 'linked_accounts/linked_accounts.jst', 
-              :locals => {:hbs => {:data => @data.as_json} } %>
+              :locals => {:data => @data.as_json} %>
 </div>
 <br />
 <h1>Add Account</h1>
 <hr />
 <div id='new_linked_accounts'>
   <%= render  :partial => 'linked_accounts/linked_accounts.jst', 
-              :locals => {:hbs => {:data => LetMeIn::Engine.config.account_types.as_json} } %>
+              :locals => {:data => LetMeIn::Engine.config.account_types.as_json} %>
 </div>
 
 <!-- <pre>

diff --git a/config/initializers/handlebars_template_handler.rb b/config/initializers/handlebars_template_handler.rb
diff --git a/lib/let_me_in/handlebars_config.rb b/lib/let_me_in/handlebars_config.rb
diff --git a/spec/dummy/app/assets/javascripts/application.js b/spec/dummy/app/assets/javascripts/application.js
@@ -9,6 +9,6 @@
 //= require_tree ./lib
 //= require_tree ./../templates
 
-if ((typeof Backbone) != "undefined") {
+$(document).ready(function() {
   Backbone.history.start({pushState: true}); 
-}
+});