From aa8a1e1dda801bba4f119bf9ae648fe77c0b492d Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 27 Mar 2017 15:04:33 +1300
Subject: [PATCH] Open snapshot dialog in tablet or window appropriately

---
 scripts/system/html/SnapshotReview.html |  1 -
 scripts/system/snapshot.js              | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/system/html/SnapshotReview.html b/scripts/system/html/SnapshotReview.html
index d37afb180c..68c91b8190 100644
--- a/scripts/system/html/SnapshotReview.html
+++ b/scripts/system/html/SnapshotReview.html
@@ -3,7 +3,6 @@
     <title>Share</title>
     <link rel="stylesheet" type="text/css" href="css/edit-style.css">
     <link rel="stylesheet" type="text/css" href="css/SnapshotReview.css">
-    <script type="text/javascript" src="qrc:///qtwebchannel/qwebchannel.js"></script>
     <script type="text/javascript" src="js/eventBridgeLoader.js"></script>
     <script type="text/javascript" src="js/SnapshotReview.js"></script>
 </head>
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index b9dfc43f9a..8a48aeb0ff 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -40,7 +40,7 @@ var SNAPSHOT_REVIEW_URL = Script.resolvePath("html/SnapshotReview.html");
 
 var outstanding;
 function confirmShare(data) {
-    var dialog = new OverlayWebWindow('Snapshot Review', SNAPSHOT_REVIEW_URL, 800, 520);
+    tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
     function onMessage(message) {
         // Receives message from the html dialog via the qwebchannel EventBridge. This is complicated by the following:
         // 1. Although we can send POJOs, we cannot receive a toplevel object. (Arrays of POJOs are fine, though.)
@@ -51,7 +51,7 @@ function confirmShare(data) {
         var needsLogin = false;
         switch (message) {
         case 'ready':
-            dialog.emitScriptEvent(data); // Send it.
+            tablet.emitScriptEvent(data); // Send it.
             outstanding = 0;
             break;
         case 'openSettings':
@@ -64,8 +64,8 @@ function confirmShare(data) {
             Settings.setValue('openFeedAfterShare', true);
             break;
         default:
-            dialog.webEventReceived.disconnect(onMessage);
-            dialog.close();
+            tablet.webEventReceived.disconnect(onMessage);
+            HMD.closeTablet();
             isLoggedIn = Account.isLoggedIn();
             message.forEach(function (submessage) {
                 if (submessage.share && !isLoggedIn) {
@@ -88,8 +88,8 @@ function confirmShare(data) {
             }
         }
     }
-    dialog.webEventReceived.connect(onMessage);
-    dialog.raise();
+    tablet.webEventReceived.connect(onMessage);
+    HMD.openTablet();
 }
 
 function snapshotShared(errorMessage) {