diff --git a/Gemfile b/Gemfile index 742f4bef8a..b6a8f58817 100644 --- a/Gemfile +++ b/Gemfile @@ -51,6 +51,7 @@ group :assets do gem 'turbo-sprockets-rails3' gem 'foundation-icons-sass-rails' gem 'momentjs-rails' + gem 'angular-rails-templates' end gem "foundation-rails" gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3" diff --git a/Gemfile.lock b/Gemfile.lock index 82f4d97ba8..0edc4e4190 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,6 +162,9 @@ GEM acts_as_list (0.1.4) addressable (2.3.3) andand (1.3.3) + angular-rails-templates (0.0.7) + railties (>= 3.1) + sprockets angularjs-rails (1.2.13) ansi (1.4.2) arel (3.0.3) @@ -498,6 +501,7 @@ PLATFORMS DEPENDENCIES andand + angular-rails-templates angularjs-rails awesome_print aws-sdk diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee index 1292f2f9bd..c60ca3bb9f 100644 --- a/app/assets/javascripts/darkswarm/all.js.coffee +++ b/app/assets/javascripts/darkswarm/all.js.coffee @@ -11,6 +11,7 @@ #= require ../shared/ng-infinite-scroll.min.js #= require ../shared/angular-local-storage.js #= require ../search/jquery.backstretch.js +#= require_tree ../../templates #= require angular-backstretch.js #= require angular-flash.min.js #= require moment diff --git a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee index 7ffd7892dd..13c5dfc536 100644 --- a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.controller "HubNodeCtrl", ($scope, Navigation, $location, $anchorScroll) -> +Darkswarm.controller "HubNodeCtrl", ($scope, Navigation, $location, $anchorScroll, $templateCache) -> $scope.toggle = -> Navigation.navigate $scope.hub.path diff --git a/app/assets/javascripts/darkswarm/darkswarm.js.coffee b/app/assets/javascripts/darkswarm/darkswarm.js.coffee index 1af2f22ad2..9382f70d46 100644 --- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee +++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee @@ -1,4 +1,11 @@ -window.Darkswarm = angular.module("Darkswarm", ["ngResource", 'mm.foundation', 'angularLocalStorage', 'pasvaz.bindonce', 'infinite-scroll', 'angular-flash.service', 'backstretch']).config ($httpProvider, $tooltipProvider) -> +window.Darkswarm = angular.module("Darkswarm", ["ngResource", + 'mm.foundation', + 'angularLocalStorage', + 'pasvaz.bindonce', + 'infinite-scroll', + 'angular-flash.service', + 'templates', + 'backstretch']).config ($httpProvider, $tooltipProvider) -> $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'