2010-12-15 Ojan Vafai <ojan@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: https://svn.webkit.org/repository/webkit/trunk@74150 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/BugsSite/ChangeLog b/BugsSite/ChangeLog
index 75fa576a7280cfc1a2aa5f0200a89d9d4b77e4d5..778692b91abe7897b7b56bd364bf4a269667f033 100644 (file)
--- a/BugsSite/ChangeLog
+++ b/BugsSite/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-15  Ojan Vafai  <ojan@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@chromium.org>
 
         Reviewed by Adam Barth.

diff --git a/BugsSite/PrettyPatch/PrettyPatch.rb b/BugsSite/PrettyPatch/PrettyPatch.rb
index 7247c73bc4cd1be6a0e010b13f8173c2e0df1d61..fbd4a6c51ca6c6c8e7cb39757100348a0cfcf393 100644 (file)
--- 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 db77b5fdbd95f89ec922960081dd3c831157d66f..3d345bd3bdf959aed8bbce88b48070e1f9e48525 100644 (file)
--- 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))