Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 03:50:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

record starting href/domainId, not ending

Browse source
This commit is contained in:
howard-stearns 2016-11-22 16:13:08 -08:00
parent 2c9046742e
commit 414371d1fc
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/snapshot.js
View file

@ -99,13 +99,18 @@ function snapshotShared(errorMessage) {
showFeedWindow(); showFeedWindow();
} }
} }
var href, domainId;
function onClicked() { function onClicked() {
// Raising the desktop for the share dialog at end will interact badly with clearOverlayWhenMoving. // Raising the desktop for the share dialog at end will interact badly with clearOverlayWhenMoving.
// Turn it off now, before we start futzing with things (and possibly moving). // Turn it off now, before we start futzing with things (and possibly moving).
clearOverlayWhenMoving = MyAvatar.getClearOverlayWhenMoving(); // Do not use Settings. MyAvatar keeps a separate copy. clearOverlayWhenMoving = MyAvatar.getClearOverlayWhenMoving(); // Do not use Settings. MyAvatar keeps a separate copy.
MyAvatar.setClearOverlayWhenMoving(false); MyAvatar.setClearOverlayWhenMoving(false);
// We will record snapshots based on the starting location. That could change, e.g., when recording a .gif.
// Even the domainId could change (e.g., if the user falls into a teleporter while recording).
href = location.href;
domainId = location.domainId;
// update button states // update button states
resetOverlays = Menu.isOptionChecked("Overlays"); // For completness. Certainly true if the button is visible to be clicke. resetOverlays = Menu.isOptionChecked("Overlays"); // For completness. Certainly true if the button is visible to be clicke.
reticleVisible = Reticle.visible; reticleVisible = Reticle.visible;
@ -168,13 +173,12 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) {
// A Snapshot Review dialog might be left open indefinitely after taking the picture, // A Snapshot Review dialog might be left open indefinitely after taking the picture,
// during which time the user may have moved. So stash that info in the dialog so that // during which time the user may have moved. So stash that info in the dialog so that
// it records the correct href. (We can also stash in .jpegs, but not .gifs.) // it records the correct href. (We can also stash in .jpegs, but not .gifs.)
var href = location.href;
// last element in data array tells dialog whether we can share or not // last element in data array tells dialog whether we can share or not
confirmShare([ confirmShare([
{ localPath: pathAnimatedSnapshot, href: href }, { localPath: pathAnimatedSnapshot, href: href },
{ localPath: pathStillSnapshot, href: href }, { localPath: pathStillSnapshot, href: href },
{ {
canShare: !!isDomainOpen(location.domainId), canShare: !!isDomainOpen(domainId),
openFeedAfterShare: shouldOpenFeedAfterShare() openFeedAfterShare: shouldOpenFeedAfterShare()
} }
]); ]);