2011-01-11 Ojan Vafai <ojan@chromium.org>

        Reviewed by Mihai Parparita.

        maintain word diffs when converting to side-by-side and back
        https://bugs.webkit.org/show_bug.cgi?id=52244

        Using textContent would lose the spans use to make the word-diff highlighting.
        Just move the span element itself.

        * code-review.js:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75538 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index e23f99569b6b66105ab88a6e3904951b2f5d8147..4c4e5bdb575e979b5e5a86747baa9088c93f7019 100644 (file)
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-11  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        maintain word diffs when converting to side-by-side and back
+        https://bugs.webkit.org/show_bug.cgi?id=52244
+
+        Using textContent would lose the spans use to make the word-diff highlighting.
+        Just move the span element itself.
+
+        * code-review.js:
+
 2011-01-11  Ojan Vafai  <ojan@chromium.org>
 
         Reviewed by Adam Barth.

diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 0da1a14a82c4536f9502d2aee1d756dc44d44a22..cad12e3c23a299c29acb9d718c2654aeb26c988d 100644 (file)
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -509,8 +509,8 @@
         '</span><span class="to ' + lineNumberClassName + '">' + (to || '&nbsp;') +
         '</span> <span class="text"></span>' +
         '</div>');
-    // Use text instead of innerHTML to avoid evaluting HTML.
-    $('.text', line).text(contents);
+
+    $('.text', line).replaceWith(contents);
     return line;
   }
 
@@ -545,8 +545,7 @@
         '</div>' +
         '</div>');
 
-    // Use text instead of innerHTML to avoid evaluting HTML.
-    $('.text', line_side).text(contents);
+    $('.text', line_side).replaceWith(contents);
     return line_side;
   }
 
@@ -770,7 +769,7 @@
     var convert_function = diff_type == 'sidebyside' ? sideBySideifyLine : unifyLine;
     var from = fromLineNumber(line);
     var to = toLineNumber(line);
-    var contents = textContentsFor(line);
+    var contents = $('.text', line);
     var classNames = classNamesForMovingLine(line);
     var attributes = attributesForMovingLine(line);
     var id = line.id;