Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 416457 - Wrong favicon displayed on Wikipedia page, r+sr=Neil

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@246156 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Callek%gmail.com
2008-02-21 06:06:09 +00:00
parent 6b4bc4c7cc
commit 7ba876bdbd
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/suite/browser/pageinfo/feeds.js
View File

@@ -56,9 +56,9 @@ function initFeedTab()
continue;
var rel = link.rel && link.rel.toLowerCase();
var isFeed = /\bfeed\b/i.test(rel);
if (!isFeed && /\balternate\b/.test(rel) &&
!/\bstylesheet\b/.test(rel)) {
var isFeed = /(?:^|\s)feed(?:\s|$)/i.test(rel);
if (!isFeed && /(?:^|\s)alternate(?:\s|$)/i.test(rel) &&
!/(?:^|\s)stylesheet(?:\s|$)/i.test(rel)) {
var feed = { title: link.title, href: link.href, type: link.type };
if (isValidFeed(feed, gDocument.nodePrincipal, isFeed)) {
var type = feed.type;

4
mozilla/suite/browser/pageinfo/pageInfo.js
View File

@@ -541,9 +541,9 @@ function grabAll(elem)
if (elem.rel)
{
var rel = elem.rel;
if (/\bicon\b/i.test(rel))
if (/(?:^|\s)icon(?:\s|$)/i.test(rel))
addImage(elem.href, gStrings.mediaLink, "", elem, false);
else if (/\bstylesheet\b/i.test(rel))
else if (/(?:^|\s)stylesheet(?:\s|$)/i.test(rel))
gLinkView.addRow([elem.rel, elem.href, gStrings.linkStylesheet, elem.target]);
else
gLinkView.addRow([elem.rel, elem.href, gStrings.linkRel, elem.target]);

8
mozilla/suite/browser/tabbrowser.xml
View File

@@ -886,12 +886,12 @@
return;
var rel = event.originalTarget.rel;
var isIcon = /\bicon\b/i.test(rel) &&
var isIcon = /(?:^|\s)icon(?:\s|$)/i.test(rel) &&
this.mPrefs.getBoolPref("browser.chrome.site_icons");
var isFeed = /\bfeed\b/i.test(rel);
if (!isFeed && /\balternate\b/i.test(rel) &&
!/\bstylesheet\b/i.test(rel)) {
var isFeed = /(?:^|\s)feed(?:\s|$)/i.test(rel);
if (!isFeed && /(?:^|\s)alternate(?:\s|$)/i.test(rel) &&
!/(?:^|\s)stylesheet(?:\s|$)/i.test(rel)) {
switch (event.originalTarget.type.toLowerCase()
.replace(/^\s+|\s*(?:;.*)?$/g, "")) {
case "text/xml":