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

Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate

This commit is contained in:
Brent Simmons 2020-01-25 15:13:37 -08:00
parent 6204e47682 b62f80e0ea
commit dcbcae185e
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Article/WebViewController.swift
View File

@ -423,7 +423,7 @@ extension WebViewController: UIScrollViewDelegate {
@objc func scrollPositionDidChange() { @objc func scrollPositionDidChange() {
webView?.evaluateJavaScript("window.scrollY") { (scrollY, _) in webView?.evaluateJavaScript("window.scrollY") { (scrollY, _) in
self.restoreWindowScrollY = scrollY as! Int self.restoreWindowScrollY = scrollY as? Int ?? 0
} }
} }

8
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -867,9 +867,7 @@ private extension MasterFeedViewController {
return return
} }
coordinator.expand(node) coordinator.expand(node)
applyChanges(animated: true) { [weak self] in applyChanges(animated: true)
self?.reloadNode(node)
}
} }
func collapse(_ cell: MasterFeedTableViewCell) { func collapse(_ cell: MasterFeedTableViewCell) {
@ -877,9 +875,7 @@ private extension MasterFeedViewController {
return return
} }
coordinator.collapse(node) coordinator.collapse(node)
applyChanges(animated: true) { [weak self] in applyChanges(animated: true)
self?.reloadNode(node)
}
} }
func makeFeedContextMenu(node: Node, indexPath: IndexPath, includeDeleteRename: Bool) -> UIContextMenuConfiguration { func makeFeedContextMenu(node: Node, indexPath: IndexPath, includeDeleteRename: Bool) -> UIContextMenuConfiguration {