renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make progress on fixing adding feeds.

Browse Source
This commit is contained in:
Brent Simmons
2017-10-21 15:56:01 -07:00
parent 4118e4a2d5
commit 71e8a9131d
4 changed files with 77 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Evergreen/MainWindow/AddFeed/AddFeedWindowController.swift
View File

@@ -94,19 +94,19 @@ class AddFeedWindowController : NSWindowController {
@IBAction func addFeed(_ sender: AnyObject) {
// let urlString = urlTextField.stringValue
// let normalizedURLString = (urlString as NSString).rs_normalizedURL()
//
// if normalizedURLString.isEmpty {
// cancelSheet()
// return;
// }
// guard let url = URL(string: normalizedURLString) else {
// cancelSheet()
// return
// }
let urlString = urlTextField.stringValue
let normalizedURLString = (urlString as NSString).rs_normalizedURL()
// delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: selectedContainer()!)
if normalizedURLString.isEmpty {
cancelSheet()
return;
}
guard let url = URL(string: normalizedURLString) else {
cancelSheet()
return
}
delegate?.addFeedWindowController(self, userEnteredURL: url, userEnteredTitle: userEnteredTitle, container: selectedContainer()!)
}
@IBAction func localShowFeedList(_ sender: AnyObject) {
@@ -136,9 +136,9 @@ private extension AddFeedWindowController {
}
func selectedFolder() -> Folder? {
func selectedContainer() -> Container? {
return folderPopupButton.selectedItem?.representedObject as? Folder
return folderPopupButton.selectedItem?.representedObject as? Container
}
func createFolderPopupMenu() -> NSMenu {