From 5f0555fa81195af5c001147eb1f9a72c98d0c4aa Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Thu, 25 Aug 2005 18:15:10 +0000 Subject: [PATCH] Bug 257247 - Live Bookmark Feed Discovery Includes Atom URI that is not a site feed. patch from Phil Ringnalda , r=mconnor, a=asa. --- browser/base/content/browser.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index fe19d77f2244..451aa4ec2a60 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6066,18 +6066,23 @@ var FeedHandler = { var erel = event.target.rel; var etype = event.target.type; var etitle = event.target.title; + const alternateRelRegex = /(^|\s)alternate($|\s)/i; + const rssTitleRegex = /(^|\s)rss($|\s)/i; - // this is a blogger post service URL; so skip it - if (erel && erel == "service.post") + if (!alternateRelRegex.test(erel) || + !etype) return; + etype = etype.replace(/^\s+/, ""); + etype = etype.replace(/\s+$/, ""); + etype = etype.toLowerCase(); + if (etype == "application/rss+xml" || etype == "application/atom+xml" || - etype == "application/x.atom+xml" || - (etitle && - (etitle.indexOf("RSS") != -1 || - etitle.indexOf("Atom") != -1 || - etitle.indexOf("rss") != -1))) + (etype == "text/xml" || + etype == "application/xml" || + etype == "application/rdf+xml") && + rssTitleRegex.test(etitle)) { const targetDoc = event.target.ownerDocument;