buzzert/Attractor
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update for iOS 17.

Browse Source
This commit is contained in:
James Magahern
2024-07-29 19:21:51 -07:00
parent 6dccb25b3e
commit a0056af8b1
8 changed files with 97 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
App/Browser View/BrowserViewController+WebKitDelegate.swift
View File

@@ -10,10 +10,10 @@ import WebKit
extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
{
func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
tab.loadError = nil
currentTab.loadError = nil
// Check to make sure we have connected to the web content process
if !tab.bridge.webContentProcessConnected {
if !currentTab.bridge.webContentProcessConnected {
// This means we started loading a page but the web content process hasn't loaded, which means
// scripts are not getting blocked.
@@ -37,8 +37,8 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
}
// Reset tracking this
tab.allowedScriptOrigins.removeAll()
tab.blockedScriptOrigins.removeAll()
currentTab.allowedScriptOrigins.removeAll()
currentTab.blockedScriptOrigins.removeAll()
updateScriptBlockerButton()
// Blur url bar if applicable
@@ -48,7 +48,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
if let url = webView.url {
// Start requesting favicon
tab.updateFaviconForURL(url)
currentTab.updateFaviconForURL(url)
}
}
@@ -56,7 +56,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
// We got rugged!!!!!! Update the favicon again.
if let url = webView.url {
// Start requesting favicon
tab.updateFaviconForURL(url)
currentTab.updateFaviconForURL(url)
}
}
@@ -90,7 +90,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
return
}
var allowJavaScript = tab.javaScriptEnabled
var allowJavaScript = currentTab.javaScriptEnabled
if !allowJavaScript, let host = navigationAction.request.url?.host {
// Check origin policy
allowJavaScript = policyManager.scriptPolicy(forOrigin: host).allowsEmbeddedJavaScript()
@@ -101,7 +101,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
if let url = navigationAction.request.url,
let redirectedURL = Settings.shared.redirectRule(for: url)
{
tab.beginLoadingURL(redirectedURL)
currentTab.beginLoadingURL(redirectedURL)
decisionHandler(.cancel, preferences)
} else {
decisionHandler(.allow, preferences)
@@ -109,14 +109,14 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
}
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
if webView == tab.webView {
tab.loadError = error
if webView == currentTab.webView {
currentTab.loadError = error
}
}
func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {
if webView == tab.webView {
tab.loadError = error
if webView == currentTab.webView {
currentTab.loadError = error
}
}
@@ -127,7 +127,7 @@ extension BrowserViewController: WKNavigationDelegate, WKUIDelegate
let newTab = tabController.createNewTab(url: nil, webViewConfiguration: configuration)
newTab.webView.load(navigationAction.request)
self.tab = newTab
self.currentTab = newTab
return newTab.webView
}