Remaking the web view on start and stop animation. URL is now taken f…

…rom the window controller's web address getter.
Rezmason · Mar 24, 2019 · 6a5c8c3 · 6a5c8c3
1 parent 80727a2
commit 6a5c8c3
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/WebSaver/WebSaver.swift b/WebSaver/WebSaver.swift
@@ -13,7 +13,7 @@ let ConfigChanged = Notification.Name.init("ConfigChanged")
 
 class WebSaverView:ScreenSaverView, WKNavigationDelegate {
 
-    var wkWebView:WKWebView!
+    var wkWebView:WKWebView?
     var configChangedObserver:NSObjectProtocol?
 
     override init?(frame: NSRect, isPreview: Bool) {
@@ -55,27 +55,35 @@ class WebSaverView:ScreenSaverView, WKNavigationDelegate {
 
     override func startAnimation() {
         super.startAnimation()
-        wkWebView = WKWebView.init(frame: self.bounds)
+        let webViewConfiguration = WKWebViewConfiguration.init()
+        //webViewConfiguration.suppressesIncrementalRendering = true
+        //webViewConfiguration.websiteDataStore = WKWebsiteDataStore.nonPersistent()
+        let wkWebView = WKWebView.init(frame: self.bounds, configuration: webViewConfiguration)
         wkWebView.navigationDelegate = self
+        self.wkWebView = wkWebView
         updateURL()
     }
 
     override func stopAnimation() {
         super.stopAnimation()
-        wkWebView.stopLoading()
-        wkWebView.removeFromSuperview()
-        wkWebView.navigationDelegate = nil
-        wkWebView = nil
+        if let wkWebView = self.wkWebView {
+            wkWebView.stopLoading()
+            wkWebView.removeFromSuperview()
+            wkWebView.navigationDelegate = nil
+            self.wkWebView = nil
+        }
     }
 
     func updateURL() {
-        wkWebView.stopLoading()
-
-        let urlString = "https://rezmason.github.io/matrix"
-
-        let url = URL(string: urlString)!
-        if (url.scheme == "http" || url.scheme == "https") {
-            wkWebView.load(URLRequest(url: url))
+        if let wkWebView = self.wkWebView {
+            wkWebView.stopLoading()
+
+            let urlString = configWindowController.webAddress
+
+            let url = URL(string: urlString)!
+            if (url.scheme == "http" || url.scheme == "https") {
+                wkWebView.load(URLRequest(url: url))
+            }
         }
     }