From dce1c5cdf2276c129e2fc222f659b0dfe2ddcf63 Mon Sep 17 00:00:00 2001 From: "Suresh, Kamlesh" Date: Tue, 25 Aug 2020 19:34:25 -0400 Subject: [PATCH] cleanup --- MVMCoreUI/Atomic/Atoms/Views/WebView.swift | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift index 54805815..3de42935 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift @@ -129,7 +129,6 @@ extension WebView : WKUIDelegate { return } /* - //TODO: Check and remove the comment was using "document.readyState" to check the state, while evaluateJavaScript "document.readyState",only works when webview contains userscrpt.otherwise, it would return WKErrorDomain Code=4 "A JavaScript exception occurred". so webView.isLoading to check load finished state @@ -140,17 +139,16 @@ extension WebView : WKUIDelegate { return } MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in - let scrollHeight = webView.scrollView.contentSize.height guard let self = self else { return } - if let height = result as? CGFloat { - self.webViewHeight?.constant = height - } else { - //if failed to get height from javascript, using scrollview.contensize's height - self.webViewHeight?.constant = scrollHeight - } - self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self) + if let height = result as? CGFloat { + self.webViewHeight?.constant = height + } else { + //if failed to get height from javascript, using scrollview.contensize's height + self.webViewHeight?.constant = webView.scrollView.contentSize.height + } + self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self) }) }) }