[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 24680eeab0e22437a888624af59c82b8c950e78e
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 15 23:33:58 2010 +0000

    2010-12-15  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Adam Barth.
    
            fix goofups from r74142 and r74130
            https://bugs.webkit.org/show_bug.cgi?id=51146
    
            Accidentally shrank the inline comment boxes and made
            the toolbar not show up when there were image diffs.
    
            * PrettyPatch/PrettyPatch.rb:
            * code-review.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index 75fa576..778692b 100644
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-15  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        fix goofups from r74142 and r74130
+        https://bugs.webkit.org/show_bug.cgi?id=51146
+
+        Accidentally shrank the inline comment boxes and made
+        the toolbar not show up when there were image diffs.
+
+        * PrettyPatch/PrettyPatch.rb:
+        * code-review.js:
+
 2010-12-14  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/BugsSite/PrettyPatch/PrettyPatch.rb b/BugsSite/PrettyPatch/PrettyPatch.rb
index 7247c73..fbd4a6c 100644
--- a/BugsSite/PrettyPatch/PrettyPatch.rb
+++ b/BugsSite/PrettyPatch/PrettyPatch.rb
@@ -207,10 +207,17 @@ h1 :hover {
   position: relative;
 }
 
+.comment textarea {
+  height: 6em;
+}
+
+.overallComments textarea {
+  height: 2em;
+}
+
 .comment textarea, .overallComments textarea {
   display: block;
   width: 100%;
-  height: 2em;
 }
 
 .overallComments .open {
@@ -351,7 +358,7 @@ body {
 }
 </style>
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> 
-<script src="code-review.js?version=14"></script> 
+<script src="code-review.js?version=15"></script> 
 EOF
 
     def self.revisionOrDescription(string)
diff --git a/BugsSite/code-review.js b/BugsSite/code-review.js
index db77b5f..3d345bd 100644
--- a/BugsSite/code-review.js
+++ b/BugsSite/code-review.js
@@ -287,13 +287,18 @@
       return;
 
     var file_diff = files[file_name];
-    $('.context', file_diff).detach();
-
-    var expand_bar_index = 0;
 
     // Don't show the links to expand upwards/downwards if the patch starts/ends without context
     // lines, i.e. starts/ends with add/remove lines.
     var first_line = file_diff.querySelector('.Line');
+
+    // If there is no element with a "Line" class, then this is an image diff.
+    if (!first_line)
+      return;
+
+    $('.context', file_diff).detach();
+
+    var expand_bar_index = 0;
     if (!$(first_line).hasClass('add') && !$(first_line).hasClass('remove'))
       $('h1', file_diff).after(expandBarHtml(file_name, BELOW))
 

-- 
WebKit Debian packaging