From 0e27ad767ce36c88d12d1c94523ffbd3459f9a51 Mon Sep 17 00:00:00 2001 From: Liv Date: Thu, 8 Jun 2017 13:07:01 -0700 Subject: [PATCH] Move chat app to be included as part of the default scripts --- scripts/defaultScripts.js | 3 ++- .../marketplace/chat/Chat.js => scripts/system/chat.js | 2 +- .../marketplace/chat => scripts/system/html}/ChatPage.html | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename unpublishedScripts/marketplace/chat/Chat.js => scripts/system/chat.js (99%) rename {unpublishedScripts/marketplace/chat => scripts/system/html}/ChatPage.html (100%) diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 81ce72d901..fa6300270c 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -29,7 +29,8 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/notifications.js", "system/dialTone.js", "system/firstPersonHMD.js", - "system/tablet-ui/tabletUI.js" + "system/tablet-ui/tabletUI.js", + "system/chat.js" ]; var DEFAULT_SCRIPTS_SEPARATE = [ "system/controllers/controllerScripts.js" diff --git a/unpublishedScripts/marketplace/chat/Chat.js b/scripts/system/chat.js similarity index 99% rename from unpublishedScripts/marketplace/chat/Chat.js rename to scripts/system/chat.js index 33bfcfeb4d..be6600a874 100644 --- a/unpublishedScripts/marketplace/chat/Chat.js +++ b/scripts/system/chat.js @@ -9,7 +9,7 @@ (function() { - var webPageURL = "ChatPage.html"; // URL of tablet web page. + var webPageURL = Script.resolvePath("html/ChatPage.html");; // URL of tablet web page. var randomizeWebPageURL = true; // Set to true for debugging. var lastWebPageURL = ""; // Last random URL of tablet web page. var onChatPage = false; // True when chat web page is opened. diff --git a/unpublishedScripts/marketplace/chat/ChatPage.html b/scripts/system/html/ChatPage.html similarity index 100% rename from unpublishedScripts/marketplace/chat/ChatPage.html rename to scripts/system/html/ChatPage.html