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

Comments on Confluence doc

Browse source
This commit is contained in:
Zach Fox 2018-09-20 14:34:55 -07:00
parent 87e91a4401
commit 33c04631ea
4 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scripts/system/commerce/wallet.js
View file

@ -543,37 +543,26 @@ function notificationPollCallback(historyArray) {
var message; var message;
if (!ui.notificationInitialCallbackMade) { if (!ui.notificationInitialCallbackMade) {
message = "You have " + notificationCount + " unread wallet " + message = "You have " + notificationCount + " unread wallet " +
"notification" + (notificationCount === 1 ? "" : "s") + "! Open WALLET to see all activity."; "transaction" + (notificationCount === 1 ? "" : "s") + ". Open WALLET to see all activity.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} else { } else {
var currentItemName, senderName;
for (i = 0; i < someoneElsePurchasedArray.length; i++) { for (i = 0; i < someoneElsePurchasedArray.length; i++) {
currentItemName = (someoneElsePurchasedArray[i].message).match('<a href=".*">(.*)</a>')[1]; message = '"' + (someoneElsePurchasedArray[i].message) + '" ' +
message = "Someone purchased your item \"" + currentItemName + "\" from the Marketplace! " +
"Open WALLET to see all activity."; "Open WALLET to see all activity.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
for (i = 0; i < proofIssuedArray.length; i++) { for (i = 0; i < proofIssuedArray.length; i++) {
currentItemName = (proofIssuedArray[i].message).match('<a href=".*">(.*)</a>')[1]; message = '"' + (proofIssuedArray[i].message) + '" ' +
message = "You have been issued a proof for your Marketplace item \"" + currentItemName + "\"! " +
"Open WALLET to see all activity."; "Open WALLET to see all activity.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
for (i = 0; i < moneyReceivedArray.length; i++) { for (i = 0; i < moneyReceivedArray.length; i++) {
senderName = moneyReceivedArray[i].sender_name; message = '"' + (moneyReceivedArray[i].message) + '" ' +
if (senderName === "") {
senderName = "Someone";
}
message = senderName + " sent you " + moneyReceivedArray[i].received_money + " HFC! " +
"Open WALLET to see all activity."; "Open WALLET to see all activity.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
for (i = 0; i < giftReceivedArray.length; i++) { for (i = 0; i < giftReceivedArray.length; i++) {
senderName = giftReceivedArray[i].sender_name; message = '"' + (giftReceivedArray[i].message) + '" ' +
if (senderName === "") {
senderName = "Someone";
}
message = senderName + " sent you a gift! " +
"Open WALLET to see all activity."; "Open WALLET to see all activity.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
@ -602,7 +591,7 @@ function startup() {
onClosed: walletClosed, onClosed: walletClosed,
onMessage: fromQml, onMessage: fromQml,
notificationPollEndpoint: "/api/v1/commerce/history?per_page=10", notificationPollEndpoint: "/api/v1/commerce/history?per_page=10",
notificationPollTimeoutMs: 60000, notificationPollTimeoutMs: 300000,
notificationDataProcessPage: notificationDataProcessPage, notificationDataProcessPage: notificationDataProcessPage,
notificationPollCallback: notificationPollCallback, notificationPollCallback: notificationPollCallback,
notificationPollStopPaginatingConditionMet: isReturnedDataEmpty, notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,

8
scripts/system/marketplaces/marketplaces.js
View file

@ -1040,15 +1040,15 @@ function notificationPollCallback(updatesArray) {
if (updatesArray.length > 0) { if (updatesArray.length > 0) {
var message; var message;
if (!ui.notificationInitialCallbackMade) { if (!ui.notificationInitialCallbackMade) {
message = updatesArray.length + " of your purchased items have updates available! " + message = updatesArray.length + " of your purchased items have updates available. " +
"Open MARKET to update."; "Open MARKET to update.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
ui.notificationPollCaresAboutSince = true; ui.notificationPollCaresAboutSince = true;
} else { } else {
for (var i = 0; i < updatesArray.length; i++) { for (var i = 0; i < updatesArray.length; i++) {
message = "There's an update available for your version of \"" + message = "Update available for \"" +
updatesArray[i].marketplace_item_name + "\"!" + updatesArray[i].marketplace_item_name + "\"." +
"Open MARKET to update."; "Open MARKET to update.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
@ -1077,7 +1077,7 @@ function startup() {
onScreenChanged: onTabletScreenChanged, onScreenChanged: onTabletScreenChanged,
onMessage: onQmlMessageReceived, onMessage: onQmlMessageReceived,
notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10", notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10",
notificationPollTimeoutMs: 60000, notificationPollTimeoutMs: 300000,
notificationDataProcessPage: notificationDataProcessPage, notificationDataProcessPage: notificationDataProcessPage,
notificationPollCallback: notificationPollCallback, notificationPollCallback: notificationPollCallback,
notificationPollStopPaginatingConditionMet: isReturnedDataEmpty, notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,

4
scripts/system/pal.js
View file

@ -846,7 +846,7 @@ function notificationPollCallback(connectionsArray) {
if (!ui.isOpen && ui.notificationInitialCallbackMade) { if (!ui.isOpen && ui.notificationInitialCallbackMade) {
message = user.username + " is available in " + message = user.username + " is available in " +
user.location.root.name + "! Open PEOPLE to join them."; user.location.root.name + ". Open PEOPLE to join them.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
}); });
@ -870,7 +870,7 @@ function notificationPollCallback(connectionsArray) {
if (newOnlineUsers > 0 && !ui.notificationInitialCallbackMade) { if (newOnlineUsers > 0 && !ui.notificationInitialCallbackMade) {
message = newOnlineUsers + " of your connections " + message = newOnlineUsers + " of your connections " +
(newOnlineUsers === 1 ? "is" : "are") + " online! Open PEOPLE to join them."; (newOnlineUsers === 1 ? "is" : "are") + " available online. Open PEOPLE to join them.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
} }

11
scripts/system/tablet-goto.js
View file

@ -57,15 +57,15 @@ function notificationPollCallback(userStoriesArray) {
if (shouldNotifyIndividually) { if (shouldNotifyIndividually) {
message = storedAnnouncements[key].username + " says something is happening in " + message = storedAnnouncements[key].username + " says something is happening in " +
storedAnnouncements[key].place_name + "! Open GOTO to join them."; storedAnnouncements[key].place_name + ". Open GOTO to join them.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
} else if (story.audience === "for_feed") { } else if (story.audience === "for_feed") {
storedFeaturedStories[story.id] = story; storedFeaturedStories[story.id] = story;
if (shouldNotifyIndividually) { if (shouldNotifyIndividually) {
message = storedFeaturedStories[key].username + " has invited you to an event in " + message = storedFeaturedStories[key].username + " invites you to an event in " +
storedFeaturedStories[key].place_name + "! Open GOTO to join them."; storedFeaturedStories[key].place_name + ". Open GOTO to join them.";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
} }
@ -91,8 +91,9 @@ function notificationPollCallback(userStoriesArray) {
ui.messagesWaiting(shouldShowDot && !ui.isOpen); ui.messagesWaiting(shouldShowDot && !ui.isOpen);
if (totalStories > 0 && !ui.isOpen && !ui.notificationInitialCallbackMade) { if (totalStories > 0 && !ui.isOpen && !ui.notificationInitialCallbackMade) {
message = "You have " + totalStories + "event invitations pending! " + message = "There " + (totalStories === 1 ? "is " : "are ") + totalStories + "event" +
"Open GOTO to see them."; (totalStories === 1 ? "" : "s") + " to know about. " +
"Open GOTO to see " + (totalStories === 1 ? "it" : "them") + ".";
ui.notificationDisplayBanner(message); ui.notificationDisplayBanner(message);
} }
} }