diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index a9f433a38b..b169a644bb 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -41,7 +41,7 @@ function calcSpawnInfo() { // ctor WebTablet = function (url, width, dpi, location, clientOnly) { - print(url); + var _this = this; var ASPECT = 4.0 / 3.0; var WIDTH = width || DEFAULT_WIDTH; @@ -54,7 +54,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) { var spawnInfo = calcSpawnInfo(); var tabletEntityPosition = spawnInfo.position; var tabletEntityRotation = spawnInfo.rotation; - + var tabletProperties = { name: "WebTablet Tablet", type: "Model", @@ -75,7 +75,7 @@ WebTablet = function (url, width, dpi, location, clientOnly) { tabletProperties.position = spawnInfo.position; tabletProperties.rotation = spawnInfo.rotation; } - this.tabletURL = url; + this.tabletEntityID = Entities.addEntity(tabletProperties, clientOnly); var WEB_ENTITY_Z_OFFSET = -0.01; diff --git a/scripts/system/marketplaces/marketplace.js b/scripts/system/marketplaces/marketplace.js index 4cfac86501..f365ca5d4c 100644 --- a/scripts/system/marketplaces/marketplace.js +++ b/scripts/system/marketplaces/marketplace.js @@ -62,15 +62,14 @@ function hideTablet(tablet) { Settings.setValue(persistenceKey, ""); } function clearOldTablet() { // If there was a tablet from previous domain or session, kill it and let it be recreated - //var tablet = WebTablet.unpickle(Settings.getValue(persistenceKey, "")); - //hideTablet(tablet); + } function hideMarketplace() { if (marketplaceWindow.visible) { marketplaceWindow.setVisible(false); marketplaceWindow.setURL("about:blank"); } else if (marketplaceWebTablet) { - //hideTablet(marketplaceWebTablet); + } marketplaceVisible = false; } @@ -91,9 +90,7 @@ var browseExamplesButton = tablet.addButton({ }); function updateButtonState(visible) { - //browseExamplesButton.writeProperty('buttonState', visible ? 0 : 1); - //browseExamplesButton.writeProperty('defaultState', visible ? 0 : 1); - //browseExamplesButton.writeProperty('hoverState', visible ? 2 : 3); + } function onMarketplaceWindowVisibilityChanged() { updateButtonState(marketplaceWindow.visible); diff --git a/scripts/system/mod.js b/scripts/system/mod.js index 4574861455..a3b4974f8d 100644 --- a/scripts/system/mod.js +++ b/scripts/system/mod.js @@ -64,9 +64,7 @@ function buttonClicked(){ isShowingOverlays = true; } - //button.writeProperty('buttonState', isShowingOverlays ? 0 : 1); - //button.writeProperty('defaultState', isShowingOverlays ? 0 : 1); - //button.writeProperty('hoverState', isShowingOverlays ? 2 : 3); + } button.clicked.connect(buttonClicked); diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js index 236b3c1793..06a148be2f 100644 --- a/scripts/system/snapshot.js +++ b/scripts/system/snapshot.js @@ -148,7 +148,7 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) { // If we ARE taking an animated snapshot, we've already re-enabled the HUD by this point. if (pathAnimatedSnapshot === "") { // show hud - //toolBar.writeProperty("visible", true); + Reticle.visible = reticleVisible; // show overlays if they were on if (resetOverlays) {