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

Merge branch 'master' of github.com:highfidelity/hifi into atp-client

Browse source
This commit is contained in:
Seth Alves 2017-07-05 15:50:57 -07:00
commit 3916e3ec61
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,9 @@ var blastShareText = "Blast to my Connections",
hifiShareText = "Share to Snaps Feed", hifiShareText = "Share to Snaps Feed",
hifiAlreadySharedText = "Already Shared to Snaps Feed", hifiAlreadySharedText = "Already Shared to Snaps Feed",
facebookShareText = "Share to Facebook", facebookShareText = "Share to Facebook",
twitterShareText = "Share to Twitter"; twitterShareText = "Share to Twitter",
shareButtonLabelTextActive = "SHARE:",
shareButtonLabelTextInactive = "SHARE";
function fileExtensionMatches(filePath, extension) { function fileExtensionMatches(filePath, extension) {
return filePath.split('.').pop().toLowerCase() === extension; return filePath.split('.').pop().toLowerCase() === extension;
@ -138,6 +140,8 @@ function selectImageToShare(selectedID, isSelected) {
var imageContainer = document.getElementById(selectedID), var imageContainer = document.getElementById(selectedID),
image = document.getElementById(selectedID + 'img'), image = document.getElementById(selectedID + 'img'),
shareBar = document.getElementById(selectedID + "shareBar"), shareBar = document.getElementById(selectedID + "shareBar"),
showShareButtonsDots = document.getElementById(selectedID + "showShareButtonsDots"),
showShareButtonsLabel = document.getElementById(selectedID + "showShareButtonsLabel"),
shareButtonsDiv = document.getElementById(selectedID + "shareButtonsDiv"), shareButtonsDiv = document.getElementById(selectedID + "shareButtonsDiv"),
shareBarHelp = document.getElementById(selectedID + "shareBarHelp"), shareBarHelp = document.getElementById(selectedID + "shareBarHelp"),
showShareButtonsButtonDiv = document.getElementById(selectedID + "showShareButtonsButtonDiv"), showShareButtonsButtonDiv = document.getElementById(selectedID + "showShareButtonsButtonDiv"),
@ -156,6 +160,9 @@ function selectImageToShare(selectedID, isSelected) {
shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.45)"; shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.45)";
shareBar.style.pointerEvents = "initial"; shareBar.style.pointerEvents = "initial";
showShareButtonsDots.style.visibility = "hidden";
showShareButtonsLabel.innerHTML = shareButtonLabelTextActive;
shareButtonsDiv.style.visibility = "visible"; shareButtonsDiv.style.visibility = "visible";
shareBarHelp.style.visibility = "visible"; shareBarHelp.style.visibility = "visible";
@ -176,6 +183,9 @@ function selectImageToShare(selectedID, isSelected) {
shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.0)"; shareBar.style.backgroundColor = "rgba(0, 0, 0, 0.0)";
shareBar.style.pointerEvents = "none"; shareBar.style.pointerEvents = "none";
showShareButtonsDots.style.visibility = "visible";
showShareButtonsLabel.innerHTML = shareButtonLabelTextInactive;
shareButtonsDiv.style.visibility = "hidden"; shareButtonsDiv.style.visibility = "hidden";
shareBarHelp.style.visibility = "hidden"; shareBarHelp.style.visibility = "hidden";
} }
@ -185,6 +195,7 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
shareBarHelpID = parentID + "shareBarHelp", shareBarHelpID = parentID + "shareBarHelp",
shareButtonsDivID = parentID + "shareButtonsDiv", shareButtonsDivID = parentID + "shareButtonsDiv",
showShareButtonsButtonDivID = parentID + "showShareButtonsButtonDiv", showShareButtonsButtonDivID = parentID + "showShareButtonsButtonDiv",
showShareButtonsDotsID = parentID + "showShareButtonsDots",
showShareButtonsLabelID = parentID + "showShareButtonsLabel", showShareButtonsLabelID = parentID + "showShareButtonsLabel",
blastToConnectionsButtonID = parentID + "blastToConnectionsButton", blastToConnectionsButtonID = parentID + "blastToConnectionsButton",
shareWithEveryoneButtonID = parentID + "shareWithEveryoneButton", shareWithEveryoneButtonID = parentID + "shareWithEveryoneButton",
@ -199,8 +210,8 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
if (canShare) { if (canShare) {
shareBarInnerHTML = '<div class="shareControlsHelp" id="' + shareBarHelpID + '" style="visibility:hidden;' + ((canBlast && blastButtonDisabled || !canBlast && hifiButtonDisabled) ? "background-color:#000;opacity:0.5;" : "") + '"></div>' + shareBarInnerHTML = '<div class="shareControlsHelp" id="' + shareBarHelpID + '" style="visibility:hidden;' + ((canBlast && blastButtonDisabled || !canBlast && hifiButtonDisabled) ? "background-color:#000;opacity:0.5;" : "") + '"></div>' +
'<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' + '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' +
'<label id="' + showShareButtonsLabelID + '">SHARE</label>' + '<label id="' + showShareButtonsLabelID + '">' + shareButtonLabelTextInactive + '</label>' +
'<span class="showShareButtonDots">' + '<span id="' + showShareButtonsDotsID + '" class="showShareButtonDots">' +
'&#xe019;' + '&#xe019;' +
'</div>' + '</div>' +
'</div>' + '</div>' +
@ -217,7 +228,7 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
document.getElementById(parentID + 'img').onclick = function () { selectImageToShare(parentID, true); }; document.getElementById(parentID + 'img').onclick = function () { selectImageToShare(parentID, true); };
} else { } else {
shareBarInnerHTML = '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' + shareBarInnerHTML = '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' +
'<label id="' + showShareButtonsLabelID + '">SHARE</label>' + '<label id="' + showShareButtonsLabelID + '">' + shareButtonLabelTextInactive + '</label>' +
'<span class="showShareButtonDots">' + '<span class="showShareButtonDots">' +
'&#xe019;' + '&#xe019;' +
'</div>' + '</div>' +
@ -230,7 +241,7 @@ function createShareBar(parentID, isLoggedIn, canShare, isGif, blastButtonDisabl
} }
} else { } else {
shareBarInnerHTML = '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' + shareBarInnerHTML = '<div class="showShareButtonsButtonDiv inactive" id="' + showShareButtonsButtonDivID + '" onclick="selectImageToShare(' + parentID + ', true)">' +
'<label id="' + showShareButtonsLabelID + '">SHARE</label>' + '<label id="' + showShareButtonsLabelID + '">' + shareButtonLabelTextInactive + '</label>' +
'<span class="showShareButtonDots">' + '<span class="showShareButtonDots">' +
'&#xe019;' + '&#xe019;' +
'</div>' + '</div>' +