[Jifty-commit] r6101 - wifty/trunk/lib/Wifty

[Jifty commits]

Author: ruz
Date: Fri Dec 12 11:37:01 2008
New Revision: 6101

Modified:
   wifty/trunk/lib/Wifty/View.pm

Log:
* use new *diff* methods

Modified: wifty/trunk/lib/Wifty/View.pm
==============================================================================
--- wifty/trunk/lib/Wifty/View.pm	(original)
+++ wifty/trunk/lib/Wifty/View.pm	Fri Dec 12 11:37:01 2008
@@ -249,20 +249,14 @@
 
 private template 'diff' => sub {
     my ($from, $to) = get(qw(from to));
-    if ( $to && !($from && $from->id) ) {
-        $from = $to->previous;
+    if ( $to && $to->id ) {
+        pre {{ class is 'diff' } outs_raw( $to->diff_from( $from ) ) };
     }
-    elsif ( !($to && $to->id) && $from ) {
-        $to = $from->next;
+    elsif ( $from && $from->id ) {
+        pre {{ class is 'diff' } outs_raw( $from->diff_to( $to ) ) };
+    } else {
+        die "illegal arguments for diff";
     }
-
-    use Text::Diff ();
-    my $diff = Text::Diff::diff(
-        \( $from? $from->content : '' ),
-        \( $to ? $to->content : '' ),
-        { STYLE => 'Text::Diff::HTML' }
-    );
-    pre {{ class is 'diff' } outs_raw($diff) };
 };
 
 private template 'diff/with_nav' => sub {