Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13869 from zfox23/MS17738_fixBlastIcon

Browse source 
Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review
This commit is contained in:
John Conklin II 2018-08-23 17:40:24 -07:00 committed by GitHub
commit bc90d1a439
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/system/snapshot.js
View file

@ -352,7 +352,7 @@ function fillImageDataFromPrevious() {
containsGif: previousAnimatedSnapPath !== "", containsGif: previousAnimatedSnapPath !== "",
processingGif: false, processingGif: false,
shouldUpload: false, shouldUpload: false,
canBlast: location.domainID === Settings.getValue("previousSnapshotDomainID"), canBlast: snapshotDomainID === Settings.getValue("previousSnapshotDomainID"),
isLoggedIn: isLoggedIn isLoggedIn: isLoggedIn
}; };
imageData = []; imageData = [];
@ -427,7 +427,7 @@ function snapshotUploaded(isError, reply) {
} }
isUploadingPrintableStill = false; isUploadingPrintableStill = false;
} }
var href, domainID; var href, snapshotDomainID;
function takeSnapshot() { function takeSnapshot() {
tablet.emitScriptEvent(JSON.stringify({ tablet.emitScriptEvent(JSON.stringify({
type: "snapshot", type: "snapshot",
@ -452,8 +452,8 @@ function takeSnapshot() {
// Even the domainID could change (e.g., if the user falls into a teleporter while recording). // Even the domainID could change (e.g., if the user falls into a teleporter while recording).
href = location.href; href = location.href;
Settings.setValue("previousSnapshotHref", href); Settings.setValue("previousSnapshotHref", href);
domainID = location.domainID; snapshotDomainID = location.domainID;
Settings.setValue("previousSnapshotDomainID", domainID); Settings.setValue("previousSnapshotDomainID", snapshotDomainID);
maybeDeleteSnapshotStories(); maybeDeleteSnapshotStories();
@ -551,7 +551,7 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
HMD.openTablet(); HMD.openTablet();
isDomainOpen(domainID, function (canShare) { isDomainOpen(snapshotDomainID, function (canShare) {
snapshotOptions = { snapshotOptions = {
containsGif: false, containsGif: false,
processingGif: false, processingGif: false,
@ -594,7 +594,7 @@ function processingGifStarted(pathStillSnapshot) {
HMD.openTablet(); HMD.openTablet();
isDomainOpen(domainID, function (canShare) { isDomainOpen(snapshotDomainID, function (canShare) {
snapshotOptions = { snapshotOptions = {
containsGif: true, containsGif: true,
processingGif: true, processingGif: true,
@ -622,7 +622,7 @@ function processingGifCompleted(pathAnimatedSnapshot) {
Settings.setValue("previousAnimatedSnapPath", pathAnimatedSnapshot); Settings.setValue("previousAnimatedSnapPath", pathAnimatedSnapshot);
isDomainOpen(domainID, function (canShare) { isDomainOpen(snapshotDomainID, function (canShare) {
snapshotOptions = { snapshotOptions = {
containsGif: true, containsGif: true,
processingGif: false, processingGif: false,