Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

open login if user tries to share and is not logged in, rather than

Browse source 
messaging user that they cannot share
This commit is contained in:
howard-stearns 2016-08-18 14:20:53 -07:00
parent 4492c4e64e
commit aab3b83ad9
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/system/snapshot.js
View file

@ -32,6 +32,12 @@ var outstanding;
function confirmShare(data) { function confirmShare(data) {
var dialog = new OverlayWebWindow('Snapshot Review', Script.resolvePath("html/ShareSnapshot.html"), 800, 470); var dialog = new OverlayWebWindow('Snapshot Review', Script.resolvePath("html/ShareSnapshot.html"), 800, 470);
function onMessage(message) { 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.)
// 2. Although we currently use a single image, we would like to take snapshot, a selfie, a 360 etc. all at the
// same time, show the user all of them, and have the user deselect any that they do not want to share.
// So we'll ultimately be receiving a set of objects, perhaps with different post processing for each.
var isLoggedIn, needsLogin = false;
switch (message) { switch (message) {
case 'ready': case 'ready':
dialog.emitScriptEvent(data); // Send it. dialog.emitScriptEvent(data); // Send it.
@ -50,16 +56,26 @@ function confirmShare(data) {
dialog.webEventReceived.disconnect(onMessage); // I'm not certain that this is necessary. If it is, what do we do on normal close? dialog.webEventReceived.disconnect(onMessage); // I'm not certain that this is necessary. If it is, what do we do on normal close?
dialog.close(); dialog.close();
dialog.deleteLater(); dialog.deleteLater();
isLoggedIn = Account.isLoggedIn();
message.forEach(function (submessage) { message.forEach(function (submessage) {
if (submessage.share && !isLoggedIn) {
needsLogin = true;
submessage.share = false;
}
if (submessage.share) { if (submessage.share) {
print('sharing', submessage.localPath); print('sharing', submessage.localPath);
outstanding++; outstanding++;
Window.shareSnapshot(submessage.localPath); Window.shareSnapshot(submessage.localPath);
} else {
print('not sharing', submessage.localPath);
} }
}); });
if (!outstanding && shouldOpenFeedAfterShare()) { if (!outstanding && shouldOpenFeedAfterShare()) {
showFeedWindow(); showFeedWindow();
} }
if (needsLogin) { // after the possible feed, so that the login is on top
Account.checkAndSignalForAccessToken();
}
} }
} }
dialog.webEventReceived.connect(onMessage); dialog.webEventReceived.connect(onMessage);
@ -124,7 +140,7 @@ function resetButtons(path, notify) {
{ localPath: path }, { localPath: path },
{ {
canShare: Boolean(Window.location.placename), canShare: Boolean(Window.location.placename),
isLoggedIn: Account.isLoggedIn(), isLoggedIn: true, // Just have the dialog act as though we are. To be removed at both ends later.
openFeedAfterShare: shouldOpenFeedAfterShare() openFeedAfterShare: shouldOpenFeedAfterShare()
} }
]); ]);