Changeset 23769 for trunk/wp-includes/pluggable.php

Timestamp:

03/21/2013 03:54:11 PM (12 years ago)

Author:

westi

Message:

Revisions: UI Update.

• Refines the UI to make it clearer and easier to use
• Introduces weighted tickmarks
• Fixes comparison bugs.

See #23497 props adamsilverstein

File:

• trunk/wp-includes/pluggable.php (modified) (1 diff)

trunk/wp-includes/pluggable.php

@@ -1745 +1745 @@
 }
 endif;
+
+if ( !function_exists( 'wp_text_diff_with_count' ) ) :
+/**
+ * Displays a human readable HTML representation of the difference between two strings.
+ * similar to wp_text_diff, but tracks and returns could of lines added and removed
+ *
+ * @since 3.6
+ * @see wp_parse_args() Used to change defaults to user defined settings.
+ * @uses Text_Diff
+ * @uses WP_Text_Diff_Renderer_Table
+ *
+ * @param string $left_string "old" (left) version of string
+ * @param string $right_string "new" (right) version of string
+ * @param string|array $args Optional. Change 'title', 'title_left', and 'title_right' defaults.
+ * @return array contains html, linesadded & linesdeletd, empty string if strings are equivalent.
+ */
+function wp_text_diff_with_count( $left_string, $right_string, $args = null ) {
+    $defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
+    $args = wp_parse_args( $args, $defaults );
+
+    if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
+            require( ABSPATH . WPINC . '/wp-diff.php' );
+
+    $left_string  = normalize_whitespace( $left_string );
+    $right_string = normalize_whitespace( $right_string );
+
+    $left_lines  = explode( "\n", $left_string );
+    $right_lines = explode( "\n", $right_string) ;
+
+    $text_diff = new Text_Diff($left_lines, $right_lines  );
+    $linesadded = $text_diff->countAddedLines();
+    $linesdeleted = $text_diff->countDeletedLines();
+
+    $renderer  = new WP_Text_Diff_Renderer_Table();
+    $diff = $renderer->render( $text_diff );
+
+    if ( !$diff )
+            return '';
+
+        $r  = "<table class='diff'>\n";
+
+    if ( ! empty( $args[ 'show_split_view' ] ) ) {
+        $r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
+    } else {
+        $r .= "<col class='content' />";
+    }
+
+    if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+        $r .= "<thead>";
+    if ( $args['title'] )
+        $r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+    if ( $args['title_left'] || $args['title_right'] ) {
+        $r .= "<tr class='diff-sub-title'>\n";
+        $r .= "\t<td></td><th>$args[title_left]</th>\n";
+        $r .= "\t<td></td><th>$args[title_right]</th>\n";
+        $r .= "</tr>\n";
+    }
+    if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+        $r .= "</thead>\n";
+
+    $r .= "<tbody>\n$diff\n</tbody>\n";
+    $r .= "</table>";
+
+    return array( 'html' => $r, 'linesadded' => $linesadded, 'linesdeleted' => $linesdeleted );
+    }
+    endif;