diff --git a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift index 374f0497..68c3b5fc 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift @@ -129,32 +129,30 @@ extension WebView : WKUIDelegate { return } /* - //TODO: Check and remove the comment + //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 */ - if !webView.isLoading { - webView.evaluateJavaScript("document.readyState", completionHandler: { (complete, error) in - if complete == nil { - return - } - webView.evaluateJavaScript("document.body.scrollHeight", completionHandler: { [weak self] (result, error) in - guard let self = self else { - return - } - let scrollHeight = self.webView?.scrollView.contentSize.height ?? 44.0 - if let height = result as? CGFloat, - height < scrollHeight { - 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) - }) - }) - } + webView.evaluateJavaScript("document.readyState", completionHandler: { (complete, error) in + if complete == nil { + return + } + webView.evaluateJavaScript("document.body.scrollHeight", completionHandler: { [weak self] (result, error) in + guard let self = self else { + return + } + let scrollHeight = self.webView?.scrollView.contentSize.height ?? 44.0 + if let height = result as? CGFloat, + height < scrollHeight { + 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) + }) + }) }