Changeset 878

Timestamp:

12/26/07 17:44:08 (4 years ago)

Author:

bogdanpasoi@…

Message:

Inline diff functionality.

Location:

trunk

Files:

• common/diff.php (added)
• www/controllers/textblock.php (modified) (1 diff)
• www/static/css/screen.css (modified) (1 diff)
• www/views/textblock_diff.php (modified) (1 diff)

trunk/www/controllers/textblock.php

@@ -91 +91 @@
     log_assert_valid(textblock_validate($revto));
 
-    $diff_title = string_diff(array($revfrom['title'], $revto['title']));
-    $diff_content = string_diff(array($revfrom['text'], $revto['text']));
+    $diff_title = diff_inline(array($revfrom['title'], $revto['title']));
+    $diff_content = diff_inline(array($revfrom['text'], $revto['text']));
 
     $view = array();

trunk/www/static/css/screen.css

@@ -703 +703 @@
 }
 
+.diff del {
+    background-color: #EE9999;
+    text-decoration: none;
+}
+
+.diff ins {
+    background-color: #99EE99;
+    text-decoration: none;
+}
+
 
 /* Wiki text block */

trunk/www/views/textblock_diff.php

@@ -18 +18 @@
             echo '<span class="'.$op['type'].'">';
             foreach ($op['lines'] as $line) {
-                echo str_replace('  ', '&nbsp;&nbsp;', htmlentities($line));
-                echo '<br/>';
+                $output = "";
+                if (!is_array($line)) {
+                    $output = htmlentities($line);
+                } else {
+                    // line contains inline diff
+                    foreach ($line as $chunk) {
+                        if ($chunk['type'] != 'normal') {
+                            $output .= '<'.$chunk['type'].'>';
+                        }
+                        $output .= htmlentities($chunk['string']); 
+                        if ($chunk['type'] != 'normal') {
+                            $output .= '</'.$chunk['type'].'>';
+                        }
+                    }
+                }
+
+                // make sure we display whitespace correctly
+                $output = str_replace('  ', '&nbsp;&nbsp;', $output);
+                echo $output.'<br/>';
             }
             echo '</span>';