From 0aa7a5c6b5d6b94fca5f2011e837f485edf8e9b6 Mon Sep 17 00:00:00 2001
From: James Timberlake <jtimberlake@Macs-MacBook-Pro.local>
Date: Fri, 30 Mar 2018 00:06:51 -0400
Subject: [PATCH] Added the ability for popups to show on the main webview and
 for the action menu to go back for the previous page

---
 Helium/Helium/Base.lproj/Main.storyboard | 13 +++++++++----
 Helium/Helium/WebViewController.swift    | 22 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Helium/Helium/Base.lproj/Main.storyboard b/Helium/Helium/Base.lproj/Main.storyboard
index 37aff5c..bd25fe0 100644
--- a/Helium/Helium/Base.lproj/Main.storyboard
+++ b/Helium/Helium/Base.lproj/Main.storyboard
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -43,7 +45,7 @@
                                 <action selector="openFilePress:" target="Voe-Tx-rLC" id="0N6-YY-4Wb"/>
                             </connections>
                         </menuItem>
-                        <menuItem title="Actions" hidden="YES" id="dMs-cI-mzQ">
+                        <menuItem title="Actions" id="dMs-cI-mzQ">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <menu key="submenu" title="Actions" id="bib-Uj-vzu">
                                 <items>
@@ -200,6 +202,9 @@
                         <windowPositionMask key="initialPositionMask" rightStrut="YES" topStrut="YES"/>
                         <rect key="contentRect" x="1101" y="707" width="480" height="275"/>
                         <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+                        <connections>
+                            <outlet property="delegate" destination="B8D-0N-5wS" id="0GO-6d-m3m"/>
+                        </connections>
                     </window>
                     <connections>
                         <segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/>
diff --git a/Helium/Helium/WebViewController.swift b/Helium/Helium/WebViewController.swift
index 4a3c37c..672dec2 100644
--- a/Helium/Helium/WebViewController.swift
+++ b/Helium/Helium/WebViewController.swift
@@ -22,7 +22,9 @@ class WebViewController: NSViewController, WKNavigationDelegate {
         view.addSubview(webView)
         webView.frame = view.bounds
         webView.autoresizingMask = [NSView.AutoresizingMask.height, NSView.AutoresizingMask.width]
-        
+        webView.configuration.preferences.javaScriptEnabled = true
+        webView.configuration.preferences.javaEnabled = true
+        webView.configuration.preferences.javaScriptCanOpenWindowsAutomatically = true
         // Allow plug-ins such as silverlight
         webView.configuration.preferences.plugInsEnabled = true
         
@@ -31,7 +33,8 @@ class WebViewController: NSViewController, WKNavigationDelegate {
 
         // Setup magic URLs
         webView.navigationDelegate = self
-        
+        webView.uiDelegate = self as! WKUIDelegate
+    
         // Allow zooming
         webView.allowsMagnification = true
         
@@ -40,7 +43,7 @@ class WebViewController: NSViewController, WKNavigationDelegate {
         
         // Listen for load progress
         webView.addObserver(self, forKeyPath: "estimatedProgress", options: NSKeyValueObservingOptions.new, context: nil)
-        
+    
         clear()
     }
     
@@ -166,6 +169,7 @@ class WebViewController: NSViewController, WKNavigationDelegate {
     }
     
     func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
+        
     }
     
     // Redirect Hulu and YouTube to pop-out videos
@@ -338,3 +342,15 @@ extension String {
         }
     }
 }
+
+extension WebViewController: WKUIDelegate {
+
+    public func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
+        
+        webView.url
+        webView.load(navigationAction.request)
+        
+        return nil;
+    }
+    
+}