diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift index 6a2d4f43c297a0419e8a6d545f1facccfc080e22..aedf09a7c623b8b38681eff9173a123cac17cf8b 100644 --- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift +++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift @@ -47,6 +47,9 @@ class WebViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + + //webviewの生成 + self.setWebView() // naviBarButton 設定 if self.showNotification { @@ -172,7 +175,6 @@ class WebViewController: UIViewController { // WidgetからWebView ロード処理 func widgetLoadWebView(url: String) { - setWebView() loadWebView(url: url) } @@ -212,7 +214,6 @@ class WebViewController: UIViewController { if isInit { // 画面ロード DispatchQueue.main.async { - self.setWebView() self.loadWebView(url: self.loadURL) self.initLoadComp = true } @@ -302,6 +303,11 @@ class WebViewController: UIViewController { if let url = change![NSKeyValueChangeKey.newKey] as? URL { let urlString: String = url.absoluteString self.nowURL = urlString + + if urlString != loadURL { + mainWebView.allowsBackForwardNavigationGestures = true + } + DispatchQueue.main.async { // token チェック self.updateSession(isInit: false) @@ -381,7 +387,11 @@ class WebViewController: UIViewController { } } if viewReload { - setWebView() + //履歴をリセットする + mainWebView.allowsBackForwardNavigationGestures = false + if mainWebView.canGoBack { + mainWebView.go(to: mainWebView.backForwardList.backList.first!) + } loadWebView(url: self.loadURL) } }