From bf51ba7195312aab9bdbb60bfc5bf70167425814 Mon Sep 17 00:00:00 2001 From: Faye Li Date: Fri, 27 Jan 2017 11:34:38 -0800 Subject: [PATCH] button brings up add/remove friends page --- scripts/system/html/users.html | 8 ++++++++ scripts/system/users.js | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/scripts/system/html/users.html b/scripts/system/html/users.html index 5986f9ce16..947642331c 100644 --- a/scripts/system/html/users.html +++ b/scripts/system/html/users.html @@ -100,6 +100,7 @@
+
@@ -190,6 +191,13 @@ // Send a ready event to hifi var eventObject = {"type": "ready"}; EventBridge.emitWebEvent(JSON.stringify(eventObject)); + + // Click listener mangage friends button + $("#friends-button").click(function() { + // Send a manage friends event to hifi + eventObject = {"type": "manage-friends"}; + EventBridge.emitWebEvent(JSON.stringify(eventObject)); + }); }); diff --git a/scripts/system/users.js b/scripts/system/users.js index 0c10b1384d..7930892395 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -12,9 +12,12 @@ (function() { // BEGIN LOCAL_SCOPE var USERS_URL = "https://hifi-content.s3.amazonaws.com/faye/tablet-dev/users.html"; + var FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends"; + var FRIENDS_WINDOW_WIDTH = 290; + var FRIENDS_WINDOW_HEIGHT = 500; + var FRIENDS_WINDOW_TITLE = "Add/Remove Friends"; var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var button = tablet.addButton({ - // TODO: work with Alan to make new icon art icon: "icons/tablet-icons/people-i.svg", text: "Users" }); @@ -37,7 +40,19 @@ }; print("sending username: " + myUsername); tablet.emitScriptEvent(JSON.stringify(object)); - } + } + if (event.type === "manage-friends") { + // open a web overlay to metaverse friends page + var friendsWindow = new OverlayWebWindow({ + title: FRIENDS_WINDOW_TITLE, + width: FRIENDS_WINDOW_WIDTH, + height: FRIENDS_WINDOW_HEIGHT, + visible: false + }); + friendsWindow.setURL(FRIENDS_WINDOW_URL); + friendsWindow.setVisible(true); + friendsWindow.raise(); + } } button.clicked.connect(onClicked);