編集画面でコンフリクトした場合もjsdifflibの差分表示に対応。

[fswiki/fswiki.git] / plugin / core / EditPage.pm

diff --git a/plugin/core/EditPage.pm b/plugin/core/EditPage.pm
index 4cc6f5e..5a37e28 100644 (file)
--- a/plugin/core/EditPage.pm
+++ b/plugin/core/EditPage.pm
@@ -53,7 +53,7 @@ sub do_action {
                        }
                }
                if($wiki->page_exists($pagename) && $cgi->param("lastmodified") != $time){
-                       $buf .= "<p><span class=\"error\">¥Ú¡¼¥¸¤Ï´û¤ËÊ̤Υ桼¥¶¤Ë¤è¤Ã¤Æ¹¹¿·¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</span></p>";
+                       $buf .= "<p><span class=\"error\">¥Ú¡¼¥¸¤Ï´û¤ËÊ̤Υ桼¥¶¤Ë¤è¤Ã¤Æ¹¹¿·¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ¿·ÈǤȤκ¹Ê¬¤ò³Îǧ¤·¤ÆºÆÅÙÊÔ½¸¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£</span></p>";
                        
                        my $mode = $wiki->get_edit_format();
                        my $orig_source = undef;
@@ -66,19 +66,8 @@ sub do_action {
                        $your_source =~ s/\r\n/\n/g;
                        $your_source =~ s/\r/\n/g;
                        
-                       my $diff = plugin::core::Diff::_get_diff_html($orig_source, $your_source);
-                       $diff =~ s/\n/<br>/g;
-                       
-                       $buf .= qq|
-                               <ul>
-                                 <li>Äɲ䵤줿Éôʬ¤Ï<ins class="diff">¤³¤Î¤è¤¦¤Ë</ins>ɽ¼¨¤µ¤ì¤Þ¤¹¡£</li>
-                                 <li>ºï½ü¤µ¤ì¤¿Éôʬ¤Ï<del class="diff">¤³¤Î¤è¤¦¤Ë</del>ɽ¼¨¤µ¤ì¤Þ¤¹¡£</li>
-                               </ul>
-                               <p>
-                                 ºÇ¿·ÈǤȤκ¹Ê¬¤ò³Îǧ¤·¤ÆºÆÅÙÊÔ½¸¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡§
-                               </p>
-                               <div class="diff">$diff</div>
-                       |;
+                       my $diff = plugin::core::Diff::_get_diff_html($wiki, $orig_source, $your_source);
+                       $buf .= $diff."<br>";
                        
                        $content = $orig_source;
                        
@@ -133,19 +122,11 @@ sub do_action {
                $your_source =~ s/\r\n/\n/g;
                $your_source =~ s/\r/\n/g;
                
-               $buf .= qq|
-                       <ul>
-                         <li>Äɲ䵤줿Éôʬ¤Ï<ins class="diff">¤³¤Î¤è¤¦¤Ë</ins>ɽ¼¨¤µ¤ì¤Þ¤¹¡£</li>
-                         <li>ºï½ü¤µ¤ì¤¿Éôʬ¤Ï<del class="diff">¤³¤Î¤è¤¦¤Ë</del>ɽ¼¨¤µ¤ì¤Þ¤¹¡£</li>
-                       </ul>
-               |;
-                       
                if($orig_source eq $your_source){
                        $buf .= '<p class="error">º¹Ê¬¤Ï¤¢¤ê¤Þ¤»¤ó¡£</p>';
                } else {
-                       my $diff = plugin::core::Diff::_get_diff_html($your_source, $orig_source);
-                       $diff =~ s/\n/<br>/g;
-                       $buf .= qq|<div class="diff">$diff</div>|;
+                       my $diff = plugin::core::Diff::_get_diff_html($wiki, $your_source, $orig_source);
+                       $buf .= $diff."<br>";
                }
                
        #--------------------------------------------------------------------------