From e48a3027f6108888bd1122f31d3b4fb439b19bca Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Wed, 29 Jun 2022 15:58:16 -0700 Subject: [PATCH] use resourceURL for locating bundled web reader web resources --- .../OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift | 5 +---- apple/OmnivoreKit/Sources/Views/BundleFinder.swift | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift index 4766b8924..f2a0869ea 100644 --- a/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift +++ b/apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift @@ -322,10 +322,7 @@ import WebKit ) .styledContent -// webView.loadFileURL(ViewsPackage.bundleURL, allowingReadAccessTo: ViewsPackage.bundleURL) - // macOS isn't loading the resources at the baseURL here for some reason - // maybe it needs the `allowingReadAccessTo` permission? - webView.loadHTMLString(htmlString, baseURL: ViewsPackage.bundleURL) + webView.loadHTMLString(htmlString, baseURL: ViewsPackage.resourceURL) } } diff --git a/apple/OmnivoreKit/Sources/Views/BundleFinder.swift b/apple/OmnivoreKit/Sources/Views/BundleFinder.swift index 883b67bb4..f9954e97f 100644 --- a/apple/OmnivoreKit/Sources/Views/BundleFinder.swift +++ b/apple/OmnivoreKit/Sources/Views/BundleFinder.swift @@ -5,4 +5,8 @@ public enum ViewsPackage { public static var bundleURL: URL { Bundle.module.bundleURL } + + public static var resourceURL: URL { + Bundle.module.resourceURL ?? bundleURL + } }