[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:30:12 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 89140b201c1b725feda9cdb5996383d7f66e6915
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 21 00:04:53 2011 +0000
2011-01-20 Ojan Vafai <ojan at chromium.org>
Reviewed by Adam Barth.
handle cases where PrettyPatch.rb doesn't linkify filenames
https://bugs.webkit.org/show_bug.cgi?id=52834
* code-review.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76302 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 5eb210a..3e16960 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -2,6 +2,15 @@
Reviewed by Adam Barth.
+ handle cases where PrettyPatch.rb doesn't linkify filenames
+ https://bugs.webkit.org/show_bug.cgi?id=52834
+
+ * code-review.js:
+
+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
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 16935bb..203f213 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -417,7 +417,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=26"></script>
+<script src="code-review.js?version=27"></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 10b522c..ffa251d 100644
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -325,30 +325,34 @@
var header = $(this).children('h1');
var url_hash = '#L' + firstLine(this);
- var file_link = $('a', header)[0];
- file_link.target = "_blank";
- file_link.href += url_hash;
-
var file_name = header.text();
files[file_name] = this;
addExpandLinks(file_name);
- addFileDiffLinks(file_name, url_hash);
+
+ var diff_links = $('<div class="FileDiffLinkContainer LinkContainer">' +
+ diffLinksHtml() +
+ '</div>');
+
+ var file_link = $('a', header)[0];
+ // If the base directory in the file path does not match a WebKit top level directory,
+ // then PrettyPatch.rb doesn't linkify the header.
+ if (file_link) {
+ file_link.target = "_blank";
+ file_link.href += url_hash;
+ diff_links.append(tracLinks(file_name, url_hash));
+ }
+
+ $('h1', this).after(diff_links);
+ updateDiffLinkVisibility(this);
});
}
- function addFileDiffLinks(file_name, url_hash) {
- var diff_links = $('<div class="FileDiffLinkContainer LinkContainer">' +
- diffLinksHtml() +
- '</div>');
-
+ function tracLinks(file_name, url_hash) {
var trac_links = $('<a target="_blank">annotate</a><a target="_blank">revision log</a>');
trac_links[0].href = 'http://trac.webkit.org/browser/trunk/' + file_name + '?annotate=blame' + url_hash;
trac_links[1].href = 'http://trac.webkit.org/log/trunk/' + file_name;
- diff_links.append(trac_links);
-
- $('h1', files[file_name]).after(diff_links);
- updateDiffLinkVisibility(files[file_name]);
+ return trac_links;
}
function addExpandLinks(file_name) {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list