bookmarkable compare urls

This commit is contained in:
rick
2010-08-12 09:09:33 -07:00
parent 8c09e26fc1
commit 6649dd4812
3 changed files with 26 additions and 10 deletions
+18 -6
View File
@@ -87,12 +87,24 @@ module Precious
end
post '/compare/:name' do
@name = params[:name]
@versions = params[:versions]
wiki = Gollum::Wiki.new($path)
@page = wiki.page(@name)
diffs = wiki.repo.diff(@versions[1], @versions[0], @page.path)
@diff = diffs.first
@versions = params[:versions] || []
if @versions.size < 2
redirect "/history/#{params[:name]}"
else
redirect "/compare/%s/%s...%s" % [
params[:name],
@versions.last,
@versions.first]
end
end
get '/compare/:name/:version_list' do
@name = params[:name]
@versions = params[:version_list].split(/\.{2,3}/)
wiki = Gollum::Wiki.new($path)
@page = wiki.page(@name)
diffs = wiki.repo.diff(@versions.first, @versions.last, @page.path)
@diff = diffs.first
mustache :compare
end
@@ -205,7 +205,8 @@ $(function(){
$('ul.inline-tabs').tabs()
var selectedRevisions = []
var selectedRevisions = [];
var baseCompareUrl = null
$('form#history input[type=checkbox]').change(function() {
var id = $(this).val()
@@ -225,7 +226,10 @@ $(function(){
$('form#history input[type=submit]').attr('disabled', true)
if (selectedRevisions.length == 2) {
$('form#history input[type=submit]').attr('disabled', false)
if(!baseCompareUrl) baseCompareUrl = $('form#history').attr('action')
var compareUrl = baseCompareUrl + "/" + selectedRevisions[1] + '...' + selectedRevisions[0]
//$('form#history').attr('action', compareUrl)
$('form#history input[type=submit]').attr('disabled', false).attr('method', 'get')
var on = false
$('form#history tr.commit').each(function() {
if (on) { $(this).addClass("selected") }
+2 -2
View File
@@ -12,11 +12,11 @@ module Precious
end
def before
@versions[1][0..6]
@versions[0][0..6]
end
def after
@versions[0][0..6]
@versions[1][0..6]
end
def lines