From 5b264a867aefa0b6e5ed509f9706724844924701 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Tue, 29 Aug 2017 16:05:01 -0700
Subject: [PATCH] fix wallet login (and share code with snapshot login)

---
 scripts/system/commerce/wallet.js        | 10 ++--------
 scripts/system/libraries/accountUtils.js | 16 ++++++++++++++++
 scripts/system/snapshot.js               | 13 +++----------
 3 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 scripts/system/libraries/accountUtils.js

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 4b758f0add..7f24e7f634 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -14,7 +14,7 @@
 /*global XXX */
 
 (function () { // BEGIN LOCAL_SCOPE
-
+    Script.include("/~/system/libraries/accountUtils.js");
 
     // Function Name: onButtonClicked()
     //
@@ -59,13 +59,7 @@
                 tablet.gotoHomeScreen();
                 break;
             case 'walletSetup_loginClicked':
-                if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
-                    || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
-                    Menu.triggerOption("Login / Sign Up");
-                    tablet.gotoHomeScreen();
-                } else {
-                    tablet.loadQMLOnTop("../../../dialogs/TabletLoginDialog.qml");
-                }
+                openLoginWindow();
                 break;
             default:
                 print('Unrecognized message from QML:', JSON.stringify(message));
diff --git a/scripts/system/libraries/accountUtils.js b/scripts/system/libraries/accountUtils.js
new file mode 100644
index 0000000000..6df0aa3a87
--- /dev/null
+++ b/scripts/system/libraries/accountUtils.js
@@ -0,0 +1,16 @@
+//
+//  accountUtils.js
+//  scripts/system/libraries/libraries
+//
+//  Copyright 2017 High Fidelity, Inc.
+//
+
+openLoginWindow = function openLoginWindow() {
+    if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
+        || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
+        Menu.triggerOption("Login / Sign Up");
+    } else {
+        tablet.loadQMLOnTop("../../dialogs/TabletLoginDialog.qml");
+        HMD.openTablet();
+    }
+};        
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index df5ed45fed..e5c60af77b 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -10,7 +10,8 @@
 /* globals Tablet, Script, HMD, Settings, DialogsManager, Menu, Reticle, OverlayWebWindow, Desktop, Account, MyAvatar, Snapshot */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
-(function() { // BEGIN LOCAL_SCOPE
+(function () { // BEGIN LOCAL_SCOPE
+Script.include("/~/system/libraries/accountUtils.js");
 
 var SNAPSHOT_DELAY = 500; // 500ms
 var FINISH_SOUND_DELAY = 350;
@@ -52,15 +53,7 @@ try {
     print('Failed to resolve request api, error: ' + err);
 }
 
-function openLoginWindow() {
-    if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
-        || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
-        Menu.triggerOption("Login / Sign Up");
-    } else {
-        tablet.loadQMLOnTop("../../dialogs/TabletLoginDialog.qml");
-        HMD.openTablet();
-    }
-}
+
 
 function removeFromStoryIDsToMaybeDelete(story_id) {
     storyIDsToMaybeDelete.splice(storyIDsToMaybeDelete.indexOf(story_id), 1);