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

Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1

Browse source
This commit is contained in:
Seth Alves 2017-04-15 07:22:16 -07:00
commit db98020974
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/system/html/js/SnapshotReview.js
View file

@ -84,12 +84,14 @@ window.onload = function () {
if (messageOptions.containsGif) { if (messageOptions.containsGif) {
if (messageOptions.processingGif) { if (messageOptions.processingGif) {
imageCount = message.action.length + 1; // "+1" for the GIF that'll finish processing soon imageCount = message.action.length + 1; // "+1" for the GIF that'll finish processing soon
message.action.unshift({ localPath: '../../../resources/icons/loadingDark.gif' }); message.action.unshift({ localPath: messageOptions.loadingGifPath });
message.action.forEach(addImage); message.action.forEach(addImage);
document.getElementById('p0').disabled = true; document.getElementById('p0').disabled = true;
} else { } else {
var gifPath = message.action[0].localPath;
document.getElementById('p0').disabled = false; document.getElementById('p0').disabled = false;
document.getElementById('p0img').src = message.action[0].localPath; document.getElementById('p0img').src = gifPath;
paths[0].localPath = gifPath;
} }
} else { } else {
imageCount = message.action.length; imageCount = message.action.length;

5
scripts/system/snapshot.js
View file

@ -90,12 +90,12 @@ function onMessage(message) {
needsLogin = true; needsLogin = true;
submessage.share = false; submessage.share = false;
shareAfterLogin = true; shareAfterLogin = true;
snapshotToShareAfterLogin = {path: submessage.localPath, href: submessage.href}; snapshotToShareAfterLogin = {path: submessage.localPath, href: submessage.href || href};
} }
if (submessage.share) { if (submessage.share) {
print('sharing', submessage.localPath); print('sharing', submessage.localPath);
outstanding = true; outstanding = true;
Window.shareSnapshot(submessage.localPath, submessage.href); Window.shareSnapshot(submessage.localPath, submessage.href || href);
} else { } else {
print('not sharing', submessage.localPath); print('not sharing', submessage.localPath);
} }
@ -239,6 +239,7 @@ function processingGifStarted(pathStillSnapshot) {
{ {
containsGif: true, containsGif: true,
processingGif: true, processingGif: true,
loadingGifPath: Script.resolvePath(Script.resourcesPath() + 'icons/loadingDark.gif'),
canShare: !!isDomainOpen(domainId), canShare: !!isDomainOpen(domainId),
openFeedAfterShare: shouldOpenFeedAfterShare() openFeedAfterShare: shouldOpenFeedAfterShare()
}]; }];