Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / doc / todo / provide_inline_diffs_in_recentchanges.mdwn

diff --git a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
index ed9dd85fd4e2c44f438c3f589f851ac39a1fe274..3bf1bdc33ea56fea6a59d7955d68be8c6f04db78 100644 (file)
--- a/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
+++ b/doc/todo/provide_inline_diffs_in_recentchanges.mdwn
@@ -11,13 +11,17 @@ It would rock if I could view diffs from the web without going via feeds. I envi
 > > 
 > > Unfortunately it has some issues:
 > > 
 > > 
 > > Unfortunately it has some issues:
 > > 

-> > 1. it assumes the toggle.js code is loaded somehow
-> > 2. if the toggle code isn't loaded the diffs are displayed (which is arguably better than showing nothing since we ship the diff to the UA anyways...)
-> > 3. it will show only if there's a revert URL, which is backwards, but otherwise the display is weird, with each button on its own line
-> > 4. if the diffurl parameter is set in the template, we'd actually see two sets of glasses, which is silly. 
+> > 1. <del>it assumes the toggle.js code is loaded somehow</del> - now loaded manually
+> > 2. <del>if the toggle code isn't loaded the diffs are displayed (which is arguably better than showing nothing since we ship the diff to the UA anyways...)</del> - i actually think that's fine
+> > 3. <del>it will show only if there's a revert URL, which is backwards, but otherwise the display is weird, with each button on its own line</del> fixed!
+> > 4. <del>if the diffurl parameter is set in the template, we'd actually see two sets of glasses, which is silly.</del> - just added a tmp_unless to fix this.

 > >
 > > I feel this should nevertheless be implemented because if we're going to compile all this crap in the page anyways and send it to the client, why not allow the user to show it? I also feel that showing it by default is a lesser evil for non-javascript users.
 > >
 > > -- [[anarcat]] 2012-03-03
 
 > >
 > > I feel this should nevertheless be implemented because if we're going to compile all this crap in the page anyways and send it to the client, why not allow the user to show it? I also feel that showing it by default is a lesser evil for non-javascript users.
 > >
 > > -- [[anarcat]] 2012-03-03
 

+> > > I have pushed a new version of this patch to my branch, which fixes all the above issues. I think this is ready to be merged now. -- [[anarcat]] 2012-07-19
+
+>>>> [[done]] --[[Joey]] 
+

 [[!tag wishlist patch]]
 [[!tag wishlist patch]]