From 137f795f2951b083e762daf44cabdd2a3b7276db Mon Sep 17 00:00:00 2001
From: elisa-lj11 <elisa.lj11@gmail.com>
Date: Tue, 23 Aug 2016 11:22:01 -0700
Subject: [PATCH] Made clara marketplace its own .js

---
 scripts/defaultScripts.js     |  2 +-
 scripts/system/marketplace.js | 78 -----------------------------------
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 scripts/system/marketplace.js

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index dc252afcf1..0d76498e84 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -15,7 +15,7 @@ Script.load("system/users.js");
 Script.load("system/mute.js");
 Script.load("system/goto.js");
 Script.load("system/hmd.js");
-Script.load("system/marketplace.js");
+Script.load("system/marketplaces/marketplace.js");
 Script.load("system/edit.js");
 Script.load("system/mod.js");
 Script.load("system/selectAudioDevice.js");
diff --git a/scripts/system/marketplace.js b/scripts/system/marketplace.js
deleted file mode 100644
index 01aa4c76ce..0000000000
--- a/scripts/system/marketplace.js
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-//  marketplace.js
-//
-//  Created by Eric Levin on 8 Jan 2016
-//  Copyright 2016 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-var toolIconUrl = Script.resolvePath("assets/images/tools/");
-var qml = Script.resolvePath("../../resources/qml/MarketplaceComboBox.qml")
-
-var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace";
-
-var marketplaceWindow = new OverlayWindow({
-    title: "Marketplace",
-    source: qml,
-    width: 900,
-    height: 700,
-    toolWindow: false,
-    visible: false,
-});
-
-var toolHeight = 50;
-var toolWidth = 50;
-var TOOLBAR_MARGIN_Y = 0;
-
-
-function showMarketplace(marketplaceID) {
-    var url = MARKETPLACE_URL;
-    if (marketplaceID) {
-        url = url + "/items/" + marketplaceID;
-    }
-    marketplaceWindow.setVisible(true);
-
-    UserActivityLogger.openedMarketplace();
-}
-
-function hideMarketplace() {
-    marketplaceWindow.setVisible(false);
-}
-
-function toggleMarketplace() {
-    if (marketplaceWindow.visible) {
-        hideMarketplace();
-    } else {
-        showMarketplace();
-    }
-}
-
-var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system");
-
-var browseExamplesButton = toolBar.addButton({
-    imageURL: toolIconUrl + "market.svg",
-    objectName: "marketplace",
-    buttonState: 1,
-    defaultState: 1,
-    hoverState: 3,
-    alpha: 0.9
-});
-
-function onExamplesWindowVisibilityChanged() {
-    browseExamplesButton.writeProperty('buttonState', marketplaceWindow.visible ? 0 : 1);
-    browseExamplesButton.writeProperty('defaultState', marketplaceWindow.visible ? 0 : 1);
-    browseExamplesButton.writeProperty('hoverState', marketplaceWindow.visible ? 2 : 3);
-}
-function onClick() {
-    toggleMarketplace();
-}
-browseExamplesButton.clicked.connect(onClick);
-marketplaceWindow.visibleChanged.connect(onExamplesWindowVisibilityChanged);
-
-Script.scriptEnding.connect(function () {
-    toolBar.removeButton("marketplace");
-    browseExamplesButton.clicked.disconnect(onClick);
-    marketplaceWindow.visibleChanged.disconnect(onExamplesWindowVisibilityChanged);
-});