diff options
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/common/error.js.erb | 1 |
2 files changed, 0 insertions, 5 deletions
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 %>)"); |