From f7a44ae8dd64b1f92b602876904d54ca5033bdac Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 26 Apr 2018 21:31:53 -0500
Subject: [PATCH] Fix redirect in "disable responsive mode" link.

---
 app/assets/javascripts/common.js    | 7 ++++---
 app/controllers/users_controller.rb | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/common.js b/app/assets/javascripts/common.js
index cbec48d0b..4a8a2ac07 100644
--- a/app/assets/javascripts/common.js
+++ b/app/assets/javascripts/common.js
@@ -29,13 +29,14 @@ $(function() {
     e.preventDefault();
   });
 
-  $("#desktop-version-link a").click(function() {
-    $.ajax("/users/" + Danbooru.meta("current-user-id"), {
+  $("#desktop-version-link a").click(function(e) {
+    e.preventDefault();
+    $.ajax("/users/" + Danbooru.meta("current-user-id") + ".json", {
       method: "PUT",
       data: {
         "user[disable_responsive_mode]": "true"
       }
-    }).success(function() {
+    }).then(function() {
       location.reload();
     });
   });
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2c99c6bef..ddb900cdd 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -68,7 +68,9 @@ class UsersController < ApplicationController
     else
       flash[:notice] = "Settings updated"
     end
-    respond_with(@user, location: edit_user_path(@user))
+    respond_with(@user) do |format|
+      format.html { redirect_back fallback_location: edit_user_path(@user) }
+    end
   end
 
   private