[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ojan at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 15a6a4ef0ff304979fc3bb87f83fc6c9efdc73b2
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 00:20:07 2011 +0000

    2011-01-12  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Mihai Parparita.
    
            fix assorted bugs with expansion lines
            https://bugs.webkit.org/show_bug.cgi?id=52326
    
            -Clicking "all" would collapse whitespace in the expanded lines.
            -Converted the remaining line creation code to using the DOM.
    
            * PrettyPatch/PrettyPatch.rb:
            * code-review.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 91789dd..33ed7db 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,5 +1,18 @@
 2011-01-12  Ojan Vafai  <ojan at chromium.org>
 
+        Reviewed by Mihai Parparita.
+
+        fix assorted bugs with expansion lines
+        https://bugs.webkit.org/show_bug.cgi?id=52326
+
+        -Clicking "all" would collapse whitespace in the expanded lines.
+        -Converted the remaining line creation code to using the DOM.
+
+        * PrettyPatch/PrettyPatch.rb:
+        * code-review.js:
+
+2011-01-12  Ojan Vafai  <ojan at chromium.org>
+
         Reviewed by Adam Barth.
 
         review tool formatted diff doesn't match the uploaded diff
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 6c8cb3c..c73eb97 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -317,7 +317,7 @@ body {
   border-right-color: #69F;
 }
 
-.ExpandArea {
+.ExpandArea, .ExpandLinkContainer {
   margin: 0;
   white-space: pre-wrap;
 }
diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 696a08a..81ef64e 100644
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -569,7 +569,8 @@
     for (var i = 0; i < end_line_num - start_line_num; i++) {
       // FIXME: from line numbers are wrong
       var line_number = start_from_line_num + i + 1;
-      var contents = patched_file_contents[file_name][start_line_num + i];
+      var contents = $('<span class="text"></span>');
+      contents.text(patched_file_contents[file_name][start_line_num + i]);
       var line = is_side_by_side ? sideBySideExpansionLine(line_number, contents) : unifiedExpansionLine(line_number, contents);
       fragment.appendChild(line[0]);
     }
@@ -879,7 +880,7 @@
 
   function convertExpansionLine(diff_type, line) {
     var convert_function = diff_type == 'sidebyside' ? sideBySideExpansionLine : unifiedExpansionLine;
-    var contents = textContentsFor(line);
+    var contents = $('.text', line);
     var line_number = fromLineNumber(line);
     var new_line = convert_function(line_number, contents);
     $(line).replaceWith(new_line);

-- 
WebKit Debian packaging