FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #428 from da2x/patch-1 

Keep origin protocol when converting to feed URI
This commit is contained in:
Brent Simmons 2018-09-04 13:27:31 -07:00 committed by GitHub
parent b78406073c 4916077fb1
commit b762aba891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Safari Extension/netnewswire-subscribe-to-feed.js
View File

@ -65,13 +65,9 @@ function subscribeToFeed(theFeed) {
// in the PageLoadEnd.js so we can be more confident it's a // in the PageLoadEnd.js so we can be more confident it's a
// good feed: URL. // good feed: URL.
var feedURL = theFeed.href; var feedURL = theFeed.href;
if (feedURL.match(/^http[s]?:\/\//)) if (!feedURL.startsWith('feed:'))
{ {
feedURL = feedURL.replace(/^http[s]?:\/\//, "feed://"); feedURL = 'feed:' + feedURL;
}
else if (feedURL.match(/^feed:/) == false)
{
feedURL = "feed:" + feedURL;
} }
safari.extension.dispatchMessage("subscribeToFeed", { "url": feedURL }); safari.extension.dispatchMessage("subscribeToFeed", { "url": feedURL });