diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-10-28 15:04:17 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-10-28 15:04:17 +0000 |
| commit | 9a3d743ae57fae6765d6d95c2d46851f4136e105 (patch) | |
| tree | ebd33b7ba54f42e453983ae94fad34a51124127a | |
| parent | 0af6f347580dd7c331f16aa50904d010fad19e23 (diff) | |
| download | redmine-9a3d743ae57fae6765d6d95c2d46851f4136e105.tar.gz redmine-9a3d743ae57fae6765d6d95c2d46851f4136e105.zip | |
Some slight improvements in AJAX errors handling.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@874 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/application.rb | 4 | ||||
| -rw-r--r-- | app/views/repositories/_dir_list_content.rhtml | 2 | ||||
| -rw-r--r-- | public/javascripts/context_menu.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 7d4a8950f..991b3fff7 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -124,12 +124,12 @@ class ApplicationController < ActionController::Base def render_403 @project = nil - render :template => "common/403", :layout => true, :status => 403 + render :template => "common/403", :layout => !request.xhr?, :status => 403 return false end def render_404 - render :template => "common/404", :layout => true, :status => 404 + render :template => "common/404", :layout => !request.xhr?, :status => 404 return false end diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml index 3dfe4319b..0d84da387 100644 --- a/app/views/repositories/_dir_list_content.rhtml +++ b/app/views/repositories/_dir_list_content.rhtml @@ -6,7 +6,7 @@ <%= if entry.is_dir? link_to_remote h(entry.name), {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id}, - :update => tr_id, + :update => { :success => tr_id }, :position => :after, :success => "scmEntryLoaded('#{tr_id}')", :condition => "scmEntryClick('#{tr_id}')" diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js index a6e39c512..2e8108616 100644 --- a/public/javascripts/context_menu.js +++ b/public/javascripts/context_menu.js @@ -39,6 +39,6 @@ ContextMenu.prototype = { this.selection = tr; var id = tr.id.substring(6, tr.id.length); /* TODO: do not hard code path */ - new Ajax.Updater('context-menu', '../../issues/context_menu/' + id, {asynchronous:true, evalScripts:true, onComplete:function(request){Effect.Appear('context-menu', {duration: 0.20})}}) + new Ajax.Updater({success:'context-menu'}, '../../issues/context_menu/' + id, {asynchronous:true, evalScripts:true, onComplete:function(request){Effect.Appear('context-menu', {duration: 0.20})}}) } } |