From e06a445959a2fbe4ad281ccf1a9ba905fc06ab11 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 8 Dec 2016 17:00:50 -0800 Subject: [PATCH] remove some cruft --- scripts/system/tablet-ui/tablet-ui.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/scripts/system/tablet-ui/tablet-ui.js b/scripts/system/tablet-ui/tablet-ui.js index f604c90b1d..1a031c04eb 100644 --- a/scripts/system/tablet-ui/tablet-ui.js +++ b/scripts/system/tablet-ui/tablet-ui.js @@ -23,8 +23,7 @@ function showTabletUI() { tabletShown = true; print("show tablet-ui"); - // var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system"); - UIWebTablet = new WebTablet("qml/desktop/TabletUI.qml", null, null, tabletLocation); + UIWebTablet = new WebTablet("qml/hifi/tablet/Tablet.qml", null, null, tabletLocation); HMD.tabletID = UIWebTablet.webEntityID; var setUpTabletUI = function() { @@ -35,13 +34,6 @@ return; } print("HERE got root", root); - var buttons = Toolbars.getToolbarButtons("com.highfidelity.interface.toolbar.system"); - print("HERE got buttons: ", buttons.length); - for (var i = 0; i < buttons.length; i++) { - print("HERE hooking up button: ", buttons[i].objectName); - Toolbars.hookUpButtonClone("com.highfidelity.interface.toolbar.system", root, buttons[i]); - } - // UserActivityLogger.openedTabletUI(); } Script.setTimeout(setUpTabletUI, 100); @@ -54,7 +46,6 @@ if (UIWebTablet.onClose) { UIWebTablet.onClose(); } - Toolbars.destroyButtonClones("com.highfidelity.interface.toolbar.system"); tabletLocation = UIWebTablet.getLocation(); UIWebTablet.destroy();