[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ojan at chromium.org
ojan at chromium.org
Sun Feb 20 23:28:05 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit c60e7f8377f6a845e5d4ca1254015360d36ed209
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 20 20:32:22 2011 +0000
2011-01-20 Ojan Vafai <ojan at chromium.org>
Reviewed by Adam Barth.
fix goofup in http://trac.webkit.org/changeset/76082
https://bugs.webkit.org/show_bug.cgi?id=52830
We were showing the revision number of the patch at the bottom
of the diff and expanding from the bottom of the diff would fail.
Also, removed an unused variable and scoped queries appropriatly
to the file_diff they should have been operating on.
* PrettyPatch/PrettyPatch.rb:
* code-review.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76271 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 8d3e473..5eb210a 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-20 Ojan Vafai <ojan at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ fix goofup in http://trac.webkit.org/changeset/76082
+ https://bugs.webkit.org/show_bug.cgi?id=52830
+
+ We were showing the revision number of the patch at the bottom
+ of the diff and expanding from the bottom of the diff would fail.
+
+ Also, removed an unused variable and scoped queries appropriatly
+ to the file_diff they should have been operating on.
+
+ * PrettyPatch/PrettyPatch.rb:
+ * code-review.js:
+
2011-01-19 Ojan Vafai <ojan at chromium.org>
Reviewed by Adam Barth.
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 61774b2..16935bb 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -408,12 +408,16 @@ body {
top: -11%;
}
+.revision {
+ display: none;
+}
+
.clear_float {
clear: both;
}
</style>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-<script src="code-review.js?version=25"></script>
+<script src="code-review.js?version=26"></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 8e85d3f..10b522c 100644
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -369,18 +369,18 @@
var expand_bar_index = 0;
if (!$(first_line).hasClass('add') && !$(first_line).hasClass('remove'))
- $('h1', file_diff).after(expandBarHtml(file_name, BELOW))
+ $('h1', file_diff).after(expandBarHtml(BELOW))
- $('br').replaceWith(expandBarHtml(file_name));
+ $('br', file_diff).replaceWith(expandBarHtml());
var last_line = file_diff.querySelector('.LineContainer:last-of-type');
// Some patches for new files somehow end up with an empty context line at the end
// with a from line number of 0. Don't show expand links in that case either.
if (!$(last_line).hasClass('add') && !$(last_line).hasClass('remove') && fromLineNumber(last_line) != 0)
- $(file_diff).append(expandBarHtml(file_name, ABOVE));
+ $('.revision', file_diff).before(expandBarHtml(ABOVE));
}
- function expandBarHtml(file_name, opt_direction) {
+ function expandBarHtml(opt_direction) {
var html = '<div class="ExpandBar">' +
'<div class="ExpandArea Expand' + ABOVE + '"></div>' +
'<div class="ExpandLinkContainer LinkContainer"><span class="ExpandText">expand: </span>';
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list