[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 41e6653bf12d624b0f172c837f6911e3e3b790dd
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 11 23:16:23 2011 +0000

    2011-01-11  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Adam Barth.
    
            allow sidebysideifying individual files in the code review tool
            https://bugs.webkit.org/show_bug.cgi?id=52226
    
            * code-review.js:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75559 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 76d0a83..8e3b1dc 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-11  Ojan Vafai  <ojan at chromium.org>
 
+        Reviewed by Adam Barth.
+
+        allow sidebysideifying individual files in the code review tool
+        https://bugs.webkit.org/show_bug.cgi?id=52226
+
+        * code-review.js:
+
+2011-01-11  Ojan Vafai  <ojan at chromium.org>
+
         Reviewed by Mihai Parparita.
 
         fix exception when adding a comment to a side-by-side diff
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 8774e85..1cc150f 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -136,6 +136,23 @@ h1 :hover {
     float: right;
 }
 
+.DiffLinks a {
+    border: 0;
+    font-family: sans-serif;
+    font-size: small;
+    font-style: normal;
+}
+
+.FileDiff .DiffLinks {
+    float: none;
+    width: 100%;
+    height: 0;
+}
+
+.FileDiffLinkContainer {
+    text-align: center;
+}
+
 .DiffSection {
     background-color: white;
     border: solid #ddd;
@@ -305,7 +322,6 @@ body {
 
 .LinkContainer a {
   border: 0;
-  font-style: normal;
 }
 
 .LinkContainer a:after {
@@ -372,7 +388,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=20"></script>
+<script src="code-review.js?version=21"></script>
 EOF
 
     def self.revisionOrDescription(string)
diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 26dc13a..09727d9 100644
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -314,6 +314,8 @@
       var file_name = $(this).children('h1').text();
       files[file_name] = this;
       addExpandLinks(file_name);
+      $('h1', this).before('<div class="FileDiffLinkContainer">' + diffLinksHtml() + '</div>');
+      updateDiffLinkVisibility(this);
     });
   }
 
@@ -385,14 +387,20 @@
   }
 
   function handleSideBySideLinkClick() {
-    $('.FileDiff').each(function() {
-      convertFileDiff('sidebyside', this);
-    });
+    convertDiff('sidebyside', this);
   }
 
   function handleUnifyLinkClick() {
-    $('.FileDiff').each(function() {
-      convertFileDiff('unified', this);
+    convertDiff('unified', this);
+  }
+
+  function convertDiff(difftype, convert_link) {
+    var file_diffs = $(convert_link).parents('.FileDiff');
+    if (!file_diffs.size())
+      file_diffs = $('.FileDiff');
+
+    file_diffs.each(function() {
+      convertFileDiff(difftype, this);
     });
   }
 
@@ -690,15 +698,20 @@
     $('#toolbar').toggleClass('anchored', has_scrollbar);
   }
 
+  function diffLinksHtml(opt_containerClassName) {
+    var containerClassName = opt_containerClassName || '';
+    return '<div class="DiffLinks ' + containerClassName + '">' +
+      '<a href="javascript:" class="unify-link">unified</a>' +
+      '<a href="javascript:" class="side-by-side-link">side-by-side</a>' +
+    '</div>';
+  }
+
   $(document).ready(function() {
     crawlDiff();
     fetchHistory();
     $(document.body).prepend('<div id="message">' +
         '<div class="help">Select line numbers to add a comment.' +
-          '<div class="DiffLinks LinkContainer">' +
-            '<a href="javascript:" class="unify-link">unified</a>' +
-            '<a href="javascript:" class="side-by-side-link">side-by-side</a>' +
-          '</div>' +
+          diffLinksHtml('LinkContainer') +
         '</div>' +
         '<div class="commentStatus"></div>' +
         '</div>');
@@ -750,11 +763,22 @@
     old_line.replaceWith(new_line);
   }
 
+  function updateDiffLinkVisibility(file_diff) {
+    if (diffState(file_diff) == 'unified') {
+      $('.side-by-side-link', file_diff).show();
+      $('.unify-link', file_diff).hide();
+    } else {
+      $('.side-by-side-link', file_diff).hide();
+      $('.unify-link', file_diff).show();
+    }
+  }
+
   function convertFileDiff(diff_type, file_diff) {
     if (diffState(file_diff) == diff_type)
       return;
 
     $(file_diff).attr('data-diffstate', diff_type);
+    updateDiffLinkVisibility(file_diff);
 
     $('.Line', file_diff).each(function() {
       convertLine(diff_type, this);
@@ -798,7 +822,6 @@
   }
 
   // FIXME: Put removed lines to the left of their corresponding added lines.
-  // FIXME: Allow for converting an individual file to side-by-side.
   function sideBySideifyLine(line, from, to, contents, classNames, attributes, id) {
     var from_class = '';
     var to_class = '';

-- 
WebKit Debian packaging