Merge pull request #445 from vincode-io/default-to-tabs

Default to tabs
This commit is contained in:
Brent Simmons 2018-09-07 12:09:55 -07:00 committed by GitHub
commit ffa4afafee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 11 deletions

View File

@ -214,6 +214,7 @@
D511EEB4202422BB00712EC3 /* xcconfig */,
);
sourceTree = "<group>";
usesTabs = 1;
};
848934F71F62484F00CEBD24 /* Products */ = {
isa = PBXGroup;

View File

@ -104,6 +104,7 @@
D511EEE520242DFB00712EC3 /* xcconfig */,
);
sourceTree = "<group>";
usesTabs = 1;
};
844BEE5C1F0AB3C8004AB7CD /* Products */ = {
isa = PBXGroup;

View File

@ -193,6 +193,7 @@
D511EEE620242E0800712EC3 /* xcconfig */,
);
sourceTree = "<group>";
usesTabs = 1;
};
844BEE381F0AB3AA004AB7CD /* Products */ = {
isa = PBXGroup;

View File

@ -1140,6 +1140,7 @@
84C37F9820DD8D0400CA8CF5 /* RSWeb.xcodeproj */,
);
sourceTree = "<group>";
usesTabs = 1;
};
849C64611ED37A5D003D8FC0 /* Products */ = {
isa = PBXGroup;

View File

@ -34,7 +34,7 @@ class HTMLFeedFinder {
for oneBodyLink in bodyLinks {
if linkMightBeFeed(oneBodyLink) {
let normalizedURL = oneBodyLink.urlString.rs_normalizedURL()
let normalizedURL = oneBodyLink.urlString.rs_normalizedURL()
let oneFeedSpecifier = FeedSpecifier(title: oneBodyLink.text, urlString: normalizedURL, source: .HTMLLink)
addFeedSpecifier(oneFeedSpecifier)
}

View File

@ -400,16 +400,16 @@ class ArticleRenderer {
return ""
}
// If the author's name is the same as the feed, then we don't want to display it.
// This code assumes that multiple authors would never match the feed name so that
// if there feed owner has an article co-author all authors are given the byline.
if authors.count == 1, let author = authors.first {
if author.name == article.feed?.nameForDisplay {
return ""
}
}
var byline = ""
// If the author's name is the same as the feed, then we don't want to display it.
// This code assumes that multiple authors would never match the feed name so that
// if there feed owner has an article co-author all authors are given the byline.
if authors.count == 1, let author = authors.first {
if author.name == article.feed?.nameForDisplay {
return ""
}
}
var byline = ""
var isFirstAuthor = true
for author in authors {