From b8f5a9d22f79239f9c643847fb8ba523417fd011 Mon Sep 17 00:00:00 2001
From: elisa-lj11 <elisa.lj11@gmail.com>
Date: Wed, 10 Aug 2016 10:26:58 -0700
Subject: [PATCH] CR changes

---
 interface/resources/qml/Browser.qml           |  6 +--
 .../resources/qml/MarketplaceComboBox.qml     | 42 +++++++++++++++++++
 interface/resources/qml/QmlWindow.qml         |  2 +-
 .../resources/qml/controls-uit/WebView.qml    | 38 -----------------
 4 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
index 2be0ca176d..3693b9dfea 100644
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@@ -218,9 +218,9 @@ ScrollingWindow {
             onIconChanged: {
                 console.log("New icon: " + icon)
             }
-			Component.onCompleted: {
-				desktop.initWebviewProfileHandlers(webview.profile)
-			}
+	        Component.onCompleted: {
+		        desktop.initWebviewProfileHandlers(webview.profile)
+	        }
 			
 
             //profile: desktop.browserProfile
diff --git a/interface/resources/qml/MarketplaceComboBox.qml b/interface/resources/qml/MarketplaceComboBox.qml
index d0c55c9fe7..e7981cabec 100644
--- a/interface/resources/qml/MarketplaceComboBox.qml
+++ b/interface/resources/qml/MarketplaceComboBox.qml
@@ -20,12 +20,14 @@ import "controls-uit" as Controls
 import "styles"
 import "styles-uit"
 
+
 Rectangle {
     HifiConstants { id: hifi }
     id: marketplaceComboBox
     anchors.fill: parent
     color: hifi.colors.baseGrayShadow
     property var currentUrl: "https://metaverse.highfidelity.com/marketplace"
+
     Controls.WebView {
         id: webview
         url: currentUrl
@@ -33,6 +35,46 @@ Rectangle {
         width: parent.width
         height: parent.height - 40
         focus: true
+
+        Timer {
+            id: zipTimer
+            running: false
+            repeat: false
+            interval: 1500
+            property var handler;
+            onTriggered: handler();
+        }
+
+        property var autoCancel: 'var element = $("a.btn.cancel");
+                                  element.click();'
+
+        onNewViewRequested: {
+            console.log("new view requested url");
+            var component = Qt.createComponent("Browser.qml");
+            var newWindow = component.createObject(desktop);
+            request.openIn(newWindow.webView);
+            if (File.testUrl(desktop.currentUrl)) {
+                zipTimer.handler = function() {
+                    newWindow.destroy();
+                    runJavaScript(autoCancel);
+                }
+                zipTimer.start();
+            }
+        }
+
+        property var simpleDownload: 'var element = $("a.download-file");
+                                      element.removeClass("download-file");
+                                      element.removeAttr("download");'
+
+        onLinkHovered: {
+            desktop.currentUrl = hoveredUrl
+            console.log("my url in WebView: " + desktop.currentUrl)
+            if (File.testUrl(desktop.currentUrl)) {
+                runJavaScript(simpleDownload, function(){console.log("ran the JS");});
+            }
+
+        }
+
     }
 
     Controls.ComboBox {
diff --git a/interface/resources/qml/QmlWindow.qml b/interface/resources/qml/QmlWindow.qml
index 908c1b1a77..ac6ae31c7f 100644
--- a/interface/resources/qml/QmlWindow.qml
+++ b/interface/resources/qml/QmlWindow.qml
@@ -1,5 +1,5 @@
 
-import QtQuick 2.5
+import QtQuick 2.3
 import QtQuick.Controls 1.4
 import QtWebChannel 1.0
 import QtWebEngine 1.1
diff --git a/interface/resources/qml/controls-uit/WebView.qml b/interface/resources/qml/controls-uit/WebView.qml
index bb08e5e389..8069ee79fb 100644
--- a/interface/resources/qml/controls-uit/WebView.qml
+++ b/interface/resources/qml/controls-uit/WebView.qml
@@ -62,44 +62,6 @@ WebEngineView {
         }
     }
 
-    Timer {
-        id: zipTimer
-        running: false
-        repeat: false
-        interval: 1500
-        property var handler;
-        onTriggered: handler();
-    }
-
-    property var autoCancel: 'var element = $("a.btn.cancel");
-                              element.click();'
-
-    onNewViewRequested: {
-        console.log("new view requested url");
-        var component = Qt.createComponent("../Browser.qml");
-        var newWindow = component.createObject(desktop);
-        request.openIn(newWindow.webView);
-        if (File.testUrl(desktop.currentUrl)) {
-            zipTimer.handler = function() {
-                newWindow.destroy();
-                runJavaScript(autoCancel);
-            }
-            zipTimer.start();
-        }
-    }
-
-    property var simpleDownload: 'var element = $("a.download-file");
-                                  element.removeClass("download-file");
-                                  element.removeAttr("download");'
-
-    onLinkHovered: {
-        desktop.currentUrl = hoveredUrl
-        console.log("my url in WebView: " + desktop.currentUrl)
-        if (File.testUrl(desktop.currentUrl)) {
-            runJavaScript(simpleDownload, function(){console.log("ran the JS");});
-        }
-
-    }
 
     // This breaks the webchannel used for passing messages.  Fixed in Qt 5.6
     // See https://bugreports.qt.io/browse/QTBUG-49521