github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 09:08:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: add ability to clear previously set mobile_view with mobile_view=auto

Browse Source
This commit is contained in:
Jeff Wong
2019-02-22 10:43:40 -08:00
parent 24b3494660
commit 8be7878656
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/lib/mobile.js.es6
View File

@ -23,6 +23,9 @@ const Mobile = {
if (window.location.search.match(/mobile_view=0/)) { if (window.location.search.match(/mobile_view=0/)) {
localStorage.mobileView = false; localStorage.mobileView = false;
} }
if (window.location.search.match(/mobile_view=auto/)) {
localStorage.removeItem("mobileView");
}
if (localStorage.mobileView) { if (localStorage.mobileView) {
var savedValue = localStorage.mobileView === "true"; var savedValue = localStorage.mobileView === "true";
if (savedValue !== this.mobileView) { if (savedValue !== this.mobileView) {

1
lib/mobile_detection.rb
View File

@ -8,6 +8,7 @@ module MobileDetection
return false unless SiteSetting.enable_mobile_theme return false unless SiteSetting.enable_mobile_theme
session[:mobile_view] = params[:mobile_view] if params && params.has_key?(:mobile_view) session[:mobile_view] = params[:mobile_view] if params && params.has_key?(:mobile_view)
session[:mobile_view] = nil if params && params.has_key?(:mobile_view) && params[:mobile_view] == 'auto'
if session && session[:mobile_view] if session && session[:mobile_view]
session[:mobile_view] == '1' session[:mobile_view] == '1'

18
spec/helpers/application_helper_spec.rb
View File

@ -80,6 +80,24 @@ describe ApplicationHelper do
expect(helper.mobile_view?).to eq(false) expect(helper.mobile_view?).to eq(false)
end end
context "mobile_view session is cleared" do
before do
params[:mobile_view] = 'auto'
end
it "is false if user agent is not mobile" do
session[:mobile_view] = '1'
controller.request.stubs(:user_agent).returns('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36')
expect(helper.mobile_view?).to be_falsey
end
it "is true for iPhone" do
session[:mobile_view] = '0'
controller.request.stubs(:user_agent).returns('Mozilla/5.0 (iPhone; CPU iPhone OS 9_2_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13D15 Safari/601.1')
expect(helper.mobile_view?).to eq(true)
end
end
context "mobile_view is not set" do context "mobile_view is not set" do
it "is false if user agent is not mobile" do it "is false if user agent is not mobile" do
controller.request.stubs(:user_agent).returns('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36') controller.request.stubs(:user_agent).returns('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36')