From 232ac74b267342dbdb7ab25d6174fe13c25581f2 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Tue, 30 Aug 2016 14:06:20 -0700
Subject: [PATCH] back to master version

---
 interface/resources/qml/MarketplaceComboBox.qml  | 11 +++++++----
 interface/resources/qml/controls-uit/WebView.qml |  7 -------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/interface/resources/qml/MarketplaceComboBox.qml b/interface/resources/qml/MarketplaceComboBox.qml
index 66d9b92ea2..fec151d755 100644
--- a/interface/resources/qml/MarketplaceComboBox.qml
+++ b/interface/resources/qml/MarketplaceComboBox.qml
@@ -28,7 +28,7 @@ Rectangle {
     color: hifi.colors.baseGrayShadow
     property var currentUrl: "https://metaverse.highfidelity.com/marketplace"
 
-    Controls.WebView {
+    Controls.BaseWebView {
         id: webview
         url: currentUrl
         anchors.top: switchMarketView.bottom
@@ -48,12 +48,15 @@ Rectangle {
         property var autoCancel: 'var element = $("a.btn.cancel");
                                   element.click();'
 
-        newWindowHook: function (component, newWindow) {
+        onNewViewRequested: {
+            var component = Qt.createComponent("Browser.qml");
+            var newWindow = component.createObject(desktop);
+            request.openIn(newWindow.webView);
             if (File.isZippedFbx(desktop.currentUrl)) {
-                runJavaScript(autoCancel);
                 zipTimer.handler = function() {
                     newWindow.destroy();
-                };
+                    runJavaScript(autoCancel);
+                }
                 zipTimer.start();
             }
         }
diff --git a/interface/resources/qml/controls-uit/WebView.qml b/interface/resources/qml/controls-uit/WebView.qml
index 8c46aabcae..faf7f746a2 100644
--- a/interface/resources/qml/controls-uit/WebView.qml
+++ b/interface/resources/qml/controls-uit/WebView.qml
@@ -61,13 +61,6 @@ WebEngineView {
         }
     }
 
-    property var newWindowHook: function (component, newWindow, request) { }; // override if you need to
-    onNewViewRequested:{
-        var component = Qt.createComponent("../Browser.qml");
-        var newWindow = component.createObject(desktop);
-        request.openIn(newWindow.webView)
-        newWindowHook(component, newWindow, request);
-    }
 
     // This breaks the webchannel used for passing messages.  Fixed in Qt 5.6
     // See https://bugreports.qt.io/browse/QTBUG-49521