From 98cbbdf7f1fac34b45f261584813538c60b047e0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Feb 2014 11:45:25 +0000
Subject: [PATCH] Reverts r12855.

git-svn-id: http://svn.redmine.org/redmine/trunk@12856 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application_controller.rb | 4 ----
 app/views/common/error.js.erb             | 1 -
 2 files changed, 5 deletions(-)
 delete mode 100644 app/views/common/error.js.erb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8060c9e96..b297aa738 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -431,10 +431,6 @@ class ApplicationController < ActionController::Base
       format.html {
         render :template => 'common/error', :layout => use_layout, :status => @status
       }
-      format.js {
-        # Can't use an error status here, browsers wouldn't execute the JS response
-        render :template => 'common/error', :layout => false, :status => 200
-      }
       format.any { head @status }
     end
   end
diff --git a/app/views/common/error.js.erb b/app/views/common/error.js.erb
deleted file mode 100644
index 81d377fe6..000000000
--- a/app/views/common/error.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-alert("<%= raw escape_javascript @message %> (<%= raw escape_javascript @status.to_s %>)");