diff --git a/examples/notifications.js b/examples/notifications.js index 27192ed789..0c2a06c878 100644 --- a/examples/notifications.js +++ b/examples/notifications.js @@ -14,32 +14,28 @@ // This script generates notifications created via a number of ways, such as: // keystroke: // -// "q" returns number of users currently online (for debug purposes) - // CTRL/s for snapshot. // CTRL/m for mic mute and unmute. // System generated notifications: -// Displays users online at startup. // If Screen is resized. -// Triggers notification if @MyUserName is mentioned in chat. -// Announces existing user logging out. -// Announces new user logging in. // If mic is muted for any reason. // // To add a new System notification type: // // 1. Set the Event Connector at the bottom of the script. // example: -// GlobalServices.incomingMessage.connect(onIncomingMessage); +// AudioDevice.muteToggled.connect(onMuteStateChanged); // // 2. Create a new function to produce a text string, do not include new line returns. // example: -// function onIncomingMessage(user, message) { -// //do stuff here; -// var text = "This is a notification"; -// var wrappedText = wordWrap(text); -// createNotification(wrappedText, NotificationType.SNAPSHOT); +// function onMuteStateChanged() { +// var muteState, +// muteString; +// +// muteState = AudioDevice.getMuted() ? "muted" : "unmuted"; +// muteString = "Microphone is now " + muteState; +// createNotification(muteString, NotificationType.MUTE_TOGGLE); // } // // This new function must call wordWrap(text) if the length of message is longer than 42 chars or unknown. @@ -54,11 +50,12 @@ // 2. Declare a text string. // 3. Call createNotifications(text, NotificationType) parsing the text. // example: -// var welcome; -// if (key.text == "q") { //queries number of users online -// var welcome = "There are " + GlobalServices.onlineUsers.length + " users online now."; -// createNotification(welcome, NotificationType.USERS_ONLINE); -// } +// if (key.text === "s") { +// if (ctrlIsPressed === true) { +// noteString = "Snapshot taken."; +// createNotification(noteString, NotificationType.SNAPSHOT); +// } +// } Script.include("./libraries/globals.js"); Script.include("./libraries/soundArray.js"); @@ -81,8 +78,6 @@ var frame = 0; var ourWidth = Window.innerWidth; var ourHeight = Window.innerHeight; var text = "placeholder"; -var last_users = GlobalServices.onlineUsers; -var users = []; var ctrlIsPressed = false; var ready = true; var MENU_NAME = 'Tools > Notifications'; @@ -93,19 +88,11 @@ var PLAY_NOTIFICATION_SOUNDS_TYPE_SETTING_PRE = "play_notification_sounds_type_" var NotificationType = { UNKNOWN: 0, - USER_JOINS: 1, - USER_LEAVES: 2, - MUTE_TOGGLE: 3, - CHAT_MENTION: 4, - USERS_ONLINE: 5, - SNAPSHOT: 6, - WINDOW_RESIZE: 7, + MUTE_TOGGLE: 1, + SNAPSHOT: 2, + WINDOW_RESIZE: 3, properties: [ - { text: "User Join" }, - { text: "User Leave" }, { text: "Mute Toggle" }, - { text: "Chat Mention" }, - { text: "Users Online" }, { text: "Snapshot" }, { text: "Window Resize" } ], @@ -476,15 +463,9 @@ var STARTUP_TIMEOUT = 500, // ms startingUp = true, startupTimer = null; -// This reports the number of users online at startup -function reportUsers() { - createNotification("Welcome! There are " + GlobalServices.onlineUsers.length + " users online now.", NotificationType.USERS_ONLINE); -} - function finishStartup() { startingUp = false; Script.clearTimeout(startupTimer); - reportUsers(); } function isStartingUp() { @@ -498,42 +479,6 @@ function isStartingUp() { return startingUp; } -// Triggers notification if a user logs on or off -function onOnlineUsersChanged(users) { - var i; - - if (!isStartingUp()) { // Skip user notifications at startup. - for (i = 0; i < users.length; i += 1) { - if (last_users.indexOf(users[i]) === -1.0) { - createNotification(users[i] + " has joined", NotificationType.USER_JOINS); - } - } - - for (i = 0; i < last_users.length; i += 1) { - if (users.indexOf(last_users[i]) === -1.0) { - createNotification(last_users[i] + " has left", NotificationType.USER_LEAVES); - } - } - } - - last_users = users; -} - -// Triggers notification if @MyUserName is mentioned in chat and returns the message to the notification. -function onIncomingMessage(user, message) { - var myMessage, - alertMe, - thisAlert; - - myMessage = message; - alertMe = "@" + GlobalServices.myUsername; - thisAlert = user + ": " + myMessage; - - if (myMessage.indexOf(alertMe) > -1.0) { - CreateNotification(wordWrap(thisAlert), NotificationType.CHAT_MENTION); - } -} - // Triggers mic mute notification function onMuteStateChanged() { var muteState, @@ -573,20 +518,12 @@ function keyReleaseEvent(key) { // Triggers notification on specific key driven events function keyPressEvent(key) { - var numUsers, - welcome, - noteString; + var noteString; if (key.key === 16777249) { ctrlIsPressed = true; } - if (key.text === "q") { //queries number of users online - numUsers = GlobalServices.onlineUsers.length; - welcome = "There are " + numUsers + " users online now."; - createNotification(welcome, NotificationType.USERS_ONLINE); - } - if (key.text === "s") { if (ctrlIsPressed === true) { noteString = "Snapshot taken."; @@ -641,8 +578,6 @@ function menuItemEvent(menuItem) { AudioDevice.muteToggled.connect(onMuteStateChanged); Controller.keyPressEvent.connect(keyPressEvent); Controller.mousePressEvent.connect(mousePressEvent); -GlobalServices.onlineUsersChanged.connect(onOnlineUsersChanged); -GlobalServices.incomingMessage.connect(onIncomingMessage); Controller.keyReleaseEvent.connect(keyReleaseEvent); Script.update.connect(update); Script.scriptEnding.connect(scriptEnding);