diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb index f08a1816..cb4b37ff 100644 --- a/lib/gollum/app.rb +++ b/lib/gollum/app.rb @@ -294,7 +294,6 @@ module Precious commit[:message] = "Deleted #{filepath}" wiki.delete_file(filepath, commit) end - redirect_to('/pages') end diff --git a/lib/gollum/public/gollum/javascript/gollum.js.erb b/lib/gollum/public/gollum/javascript/gollum.js.erb index 678b6400..61ef6991 100755 --- a/lib/gollum/public/gollum/javascript/gollum.js.erb +++ b/lib/gollum/public/gollum/javascript/gollum.js.erb @@ -58,6 +58,22 @@ $(document).ready(function() { e.preventDefault(); } ); + $('.delete-file').click( function(e) { + var ok = confirm($(this).data('confirm')); + if ( ok ) { + var element = $(this); + $.post('<%=delete_path %>' + $(this).data('file-path'), + {}, + function (result) { + // page successfully deleted, stay on page but remove element from DOM + element.closest("li").remove(); + }); + } + // Don't navigate on cancel. + e.preventDefault(); + } ); + + var nodeSelector = { node1: null, node2: null, diff --git a/lib/gollum/views/pages.rb b/lib/gollum/views/pages.rb index 6759bc60..49745a1c 100644 --- a/lib/gollum/views/pages.rb +++ b/lib/gollum/views/pages.rb @@ -31,7 +31,7 @@ module Precious def delete_file(url) - %Q(
) + %Q(
) end def files_folders