jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused mobile mode code (#3206).

Browse Source 
Mobile mode was removed in 31e36cf.
This commit is contained in:
evazion
2018-03-14 17:09:01 -05:00
parent 44c604521e
commit 8a012d4c91
4 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/application_controller.rb
View File

@@ -172,7 +172,6 @@ class ApplicationController < ActionController::Base
def reset_current_user def reset_current_user
CurrentUser.user = nil CurrentUser.user = nil
CurrentUser.ip_addr = nil CurrentUser.ip_addr = nil
CurrentUser.mobile_mode = false
end end
def set_started_at_session def set_started_at_session

9
app/logical/current_user.rb
View File

@@ -11,7 +11,6 @@ class CurrentUser
ensure ensure
self.user = old_user self.user = old_user
self.ip_addr = old_ip_addr self.ip_addr = old_ip_addr
self.mobile_mode = false
end end
end end
@@ -49,14 +48,6 @@ class CurrentUser
Thread.current[:current_ip_addr] Thread.current[:current_ip_addr]
end end
def self.mobile_mode=(mode)
Thread.current[:mobile_mode] = mode
end
def self.mobile_mode?
Thread.current[:mobile_mode]
end
def self.id def self.id
if user.nil? if user.nil?
nil nil

12
app/models/post.rb
View File

@@ -236,9 +236,7 @@ class Post < ApplicationRecord
end end
def file_url_for(user) def file_url_for(user)
if CurrentUser.mobile_mode? if user.default_image_size == "large" && image_width > Danbooru.config.large_image_width
large_file_url
elsif user.default_image_size == "large" && image_width > Danbooru.config.large_image_width
large_file_url large_file_url
else else
file_url file_url
@@ -246,9 +244,7 @@ class Post < ApplicationRecord
end end
def file_path_for(user) def file_path_for(user)
if CurrentUser.mobile_mode? if user.default_image_size == "large" && image_width > Danbooru.config.large_image_width
large_file_path
elsif user.default_image_size == "large" && image_width > Danbooru.config.large_image_width
large_file_path large_file_path
else else
file_path file_path
@@ -362,7 +358,7 @@ class Post < ApplicationRecord
end end
def image_width_for(user) def image_width_for(user)
if CurrentUser.mobile_mode? || user.default_image_size == "large" if user.default_image_size == "large"
large_image_width large_image_width
else else
image_width image_width
@@ -370,7 +366,7 @@ class Post < ApplicationRecord
end end
def image_height_for(user) def image_height_for(user)
if CurrentUser.mobile_mode? || user.default_image_size == "large" if user.default_image_size == "large"
large_image_height large_image_height
else else
image_height image_height

1
app/views/layouts/default.html.erb
View File

@@ -23,7 +23,6 @@
<meta name="default-image-size" content="<%= CurrentUser.user.default_image_size %>"> <meta name="default-image-size" content="<%= CurrentUser.user.default_image_size %>">
<meta name="enable-auto-complete" content="<%= CurrentUser.user.enable_auto_complete %>"> <meta name="enable-auto-complete" content="<%= CurrentUser.user.enable_auto_complete %>">
<meta name="style-usernames" content="<%= CurrentUser.user.style_usernames? %>"> <meta name="style-usernames" content="<%= CurrentUser.user.style_usernames? %>">
<meta name="mobile-mode" content="<%= CurrentUser.mobile_mode? %>">
<meta name="last-forum-read-at" content="<%= CurrentUser.user.last_forum_read_at %>"> <meta name="last-forum-read-at" content="<%= CurrentUser.user.last_forum_read_at %>">
<meta name="disable-labeled-saved-searches" content="<%= CurrentUser.disable_categorized_saved_searches? %>"> <meta name="disable-labeled-saved-searches" content="<%= CurrentUser.disable_categorized_saved_searches? %>">
<%= content_tag(:meta, nil, name: "disable-mobile-gestures", content: CurrentUser.disable_mobile_gestures?) %> <%= content_tag(:meta, nil, name: "disable-mobile-gestures", content: CurrentUser.disable_mobile_gestures?) %>