From 130c590adc3c337e03f73c301483cb2725e52c80 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 26 Nov 2013 17:04:15 -0800 Subject: [PATCH 1/2] refactor --- app/models/post.rb | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index 9ad7162c8..af041d39e 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -119,17 +119,9 @@ class Post < ActiveRecord::Base def file_url_for(user) if CurrentUser.mobile_mode? - return large_file_url - end - - case user.default_image_size - when "large" - if image_width > Danbooru.config.large_image_width - large_file_url - else - file_url - end - + large_file_url + elsif user.default_image_size == "large" && image_width > Danbooru.config.large_image_width + large_file_url else file_url end @@ -137,17 +129,9 @@ class Post < ActiveRecord::Base def file_path_for(user) if CurrentUser.mobile_mode? - return large_file_path - end - - case user.default_image_size - when "large" - if image_width > Danbooru.config.large_image_width - large_file_path - else - file_path - end - + large_file_path + elsif user.default_image_size == "large" && image_width > Danbooru.config.large_image_width + large_file_path else file_path end @@ -197,28 +181,16 @@ class Post < ActiveRecord::Base end def image_width_for(user) - if CurrentUser.mobile_mode? - return large_image_width - end - - case user.default_image_size - when "large" + if CurrentUser.mobile_mode? || user.default_image_size == "large" large_image_width - else image_width end end def image_height_for(user) - if CurrentUser.mobile_mode? - return large_image_height - end - - case user.default_image_size - when "large" + if CurrentUser.mobile_mode? || user.default_image_size == "large" large_image_height - else image_height end From da12a5e8a57e8f9e8fbc7edb1a3a4738b6a7fdc8 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 26 Nov 2013 17:07:03 -0800 Subject: [PATCH 2/2] fix mobile link --- app/views/posts/partials/index/_related.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/posts/partials/index/_related.html.erb b/app/views/posts/partials/index/_related.html.erb index 92fa24811..499b49d55 100644 --- a/app/views/posts/partials/index/_related.html.erb +++ b/app/views/posts/partials/index/_related.html.erb @@ -11,6 +11,6 @@
  • <%= link_to "Random post", random_posts_path(:tags => params[:tags]) %>
  • -
  • <%= link_to "Mobile version", m_posts_path(:tags => params[:tags]) %>
  • +
  • <%= link_to "Mobile version", mobile_posts_path(:tags => params[:tags]) %>