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

Delete global appDelegate variable.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-30 22:42:20 -08:00
parent 9e3b659710
commit 2fed6d3cb3
6 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Mac/Scriptability/NSApplication+Scriptability.swift
View File

@@ -26,10 +26,14 @@ extension NSApplication: ScriptingObjectContainer {
return "application"
}
private var scriptingAppDelegate: AppDelegate {
NSApplication.shared.delegate as! AppDelegate
}
@objc(currentArticle)
func currentArticle() -> ScriptableArticle? {
var scriptableArticle: ScriptableArticle?
if let currentArticle = appDelegate.scriptingCurrentArticle {
if let currentArticle = scriptingAppDelegate.scriptingCurrentArticle {
if let feed = currentArticle.feed {
let scriptableFeed = ScriptableFeed(feed, container: self)
scriptableArticle = ScriptableArticle(currentArticle, container: scriptableFeed)
@@ -40,7 +44,7 @@ extension NSApplication: ScriptingObjectContainer {
@objc(selectedArticles)
func selectedArticles() -> NSArray {
let articles = appDelegate.scriptingSelectedArticles
let articles = scriptingAppDelegate.scriptingSelectedArticles
let scriptableArticles: [ScriptableArticle] = articles.compactMap { article in
if let feed = article.feed, let account = feed.account {
let scriptableFeed = ScriptableFeed(feed, container: ScriptableAccount(account))