Fix OfflineWebView rules not being applied

samuelmeuli · May 16, 2020 · 645c7d1 · 645c7d1
1 parent f25d95d
commit 645c7d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/QLPlugin/Views/PreviewVCs/WebPreviewVC.swift b/QLPlugin/Views/PreviewVCs/WebPreviewVC.swift
@@ -14,7 +14,7 @@ class WebPreviewVC: NSViewController, PreviewVC {
  withExtension: "css"
  )
 
- @IBOutlet private var webView: WKWebView!
+ @IBOutlet private var webView: OfflineWebView!
 
  required convenience init(
  html: String,

diff --git a/QLPlugin/Views/Views/OfflineWebView.swift b/QLPlugin/Views/Views/OfflineWebView.swift
@@ -34,7 +34,9 @@ let blockRules = """
 
 /// `WKWebView` which only allows the loading of local resources
 class OfflineWebView: WKWebView {
- override init(frame: CGRect, configuration: WKWebViewConfiguration) {
+ required init?(coder decoder: NSCoder) {
+ super.init(coder: decoder)
+
  WKContentRuleListStore.default().compileContentRuleList(
  forIdentifier: "ContentBlockingRules",
  encodedContentRuleList: blockRules
@@ -47,7 +49,7 @@ class OfflineWebView: WKWebView {
  error.localizedDescription
  )
  } else if let contentRuleList = contentRuleList {
- configuration.userContentController.add(contentRuleList)
+ self.configuration.userContentController.add(contentRuleList)
  } else {
  os_log(
  "Error adding WKWebView content rule list: Content rule list is not defined",
@@ -56,10 +58,5 @@ class OfflineWebView: WKWebView {
  )
  }
  }
- super.init(frame: frame, configuration: configuration)
- }
-
- required init?(coder decoder: NSCoder) {
- super.init(coder: decoder)
  }
 }