diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-17 14:01:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 14:01:23 -0600 |
| commit | 45f18b8f494153fd63871d60782da992e847ec16 (patch) | |
| tree | 82b4be5028ec4c8e066c69bdf068ac786104508f /app/controllers | |
| parent | 2a386ad88dad4a076f19dbd1b085ea561868deec (diff) | |
| parent | 585758a373df05127b0d544ac5971ef67f053e83 (diff) | |
Merge pull request #218 from glitch-soc/themed-prefetching
Themed preloading
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 | ||||
| -rw-r--r-- | app/controllers/home_controller.rb | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a213302cb..f5dbe837e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -13,6 +13,7 @@ class ApplicationController < ActionController::Base helper_method :current_account helper_method :current_session helper_method :current_theme + helper_method :theme_data helper_method :single_user_mode? rescue_from ActionController::RoutingError, with: :not_found @@ -88,6 +89,10 @@ class ApplicationController < ActionController::Base current_user.setting_theme end + def theme_data + Themes.instance.get(current_theme) + end + def cache_collection(raw, klass) return raw unless klass.respond_to?(:with_includes) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index ad7f09f34..21dde20ce 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -6,7 +6,6 @@ class HomeController < ApplicationController def index @body_classes = 'app-body' - @frontend = (params[:frontend] and Rails.configuration.x.available_frontends.include? params[:frontend] + '.js') ? params[:frontend] : 'mastodon' end private |