Some slight improvements in AJAX errors handling.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@874 e93f8b46-1217-0410-a6f0-8f06a7374b81
pull/351/head
Jean-Philippe Lang 17 years ago
parent 0af6f34758
commit 9a3d743ae5
  1. 4
      app/controllers/application.rb
  2. 2
      app/views/repositories/_dir_list_content.rhtml
  3. 2
      public/javascripts/context_menu.js

@ -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

@ -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}')"

@ -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})}})
}
}

Loading…
Cancel
Save