diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
index 51658814df..9e58a0aa98 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
@@ -240,7 +240,7 @@ Flickable {
}
}
- Connections {
+ Connections {
target: Camera
onModeUpdated: {
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-a.svg b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-a.svg
deleted file mode 100644
index 8529825138..0000000000
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-a.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
\ No newline at end of file
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-i.svg b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-i.svg
deleted file mode 100644
index 3127fe22da..0000000000
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/images/icons/avimoji-i.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
index 4153e09a5c..5013775828 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
@@ -15,14 +15,14 @@
// #region dependencies
// Custom module for handling entities
-var EntityMaker = Script.require("./resources/modules/entityMaker.js?" + Date.now());
+var EntityMaker = Script.require("./resources/modules/entityMaker.js");
// Add nice smoothing functions to the animations
-var EasingFunctions = Script.require("./resources/modules/easing.js?");
+var EasingFunctions = Script.require("./resources/modules/easing.js");
// The information needed to properly use the sprite sheets and get the general information
// about the emojis
-var emojiList = Script.require("./resources/modules/emojiList.js?" + Date.now());
-var customEmojiList = Script.require("./resources/modules/customEmojiList.js?" + Date.now());
+var emojiList = Script.require("./resources/modules/emojiList.js");
+var customEmojiList = Script.require("./resources/modules/customEmojiList.js");
var imageURLBase = Script.resolvePath("./resources/images/emojis/1024px/");
@@ -95,6 +95,7 @@ function startTimeoutDelete() {
// This is called to start the shrink animation and also where the deleting happens when that is done
maybePlayPop("off");
selectedEmojiFilename = null;
+ defaultTimeout = false;
}, TOTAL_EMOJI_DURATION_MS - POP_ANIMATION_OUT_DURATION_MS);
}
@@ -104,11 +105,7 @@ var COUNT_DOWN_INTERVAL_MS = 100;
function beginCountDownTimer() {
_this._avimojiQMLWindow.sendToQml({
"source": "simplifiedEmoji.js",
- "method": "beginCountdownTimer",
- "data": {
- "interval": COUNT_DOWN_INTERVAL_MS,
- "duration": TOTAL_EMOJI_DURATION_MS
- }
+ "method": "beginCountdownTimer"
});
}
@@ -118,14 +115,12 @@ function clearCountDownTimerHandler() {
if (_this._avimojiQMLWindow) {
_this._avimojiQMLWindow.sendToQml({
"source": "simplifiedEmoji.js",
- "method": "clearCountdownTimer",
- "data": {}
+ "method": "clearCountdownTimer"
});
}
}
-
function resetEmojis() {
pruneOldAvimojis();
maybeClearPop();
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconBackground.svg b/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconBackground.svg
deleted file mode 100644
index 390694fa3e..0000000000
--- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconBackground.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconStroke.svg b/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconStroke.svg
deleted file mode 100644
index 1e4cbd025f..0000000000
--- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/images/iconStroke.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 4fb072968c..0ca336e7f4 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -118,17 +118,13 @@ function handleAvatarNametagMode(newAvatarNametagMode) {
nametag.handleAvatarNametagMode(newAvatarNametagMode);
}
-function handleEmoteIndicatorVisible(newEmoteIndicatorVisible) {
- emote.handleEmoteIndicatorVisible(newEmoteIndicatorVisible);
-}
-
var SETTINGS_APP_MESSAGE_SOURCE = "SettingsApp.qml";
function onMessageFromSettingsApp(message) {
if (message.source !== SETTINGS_APP_MESSAGE_SOURCE) {
return;
}
- console.log("\n \n MESSAGE FROM SETTINGS APP: ", JSON.stringify(message));
+
switch (message.method) {
/*
MILAD NOTE:
@@ -136,13 +132,8 @@ function onMessageFromSettingsApp(message) {
nametag.
*/
case "handleAvatarNametagMode":
- console.log("Got to handle avatar nametag mode");
handleAvatarNametagMode(message.avatarNametagMode);
break;
- case "handleEmoteIndicatorVisible":
- console.log("Got to handle emote indicator visible");
- handleEmoteIndicatorVisible(message.emoteIndicatorVisible);
- break;
default:
console.log("Unrecognized message from " + SETTINGS_APP_MESSAGE_SOURCE + ": " + JSON.stringify(message));
break;
@@ -392,7 +383,6 @@ function onMessageFromTopBar(message) {
if (message.source !== TOP_BAR_MESSAGE_SOURCE) {
return;
}
- console.log("\n\n MESSAGE FROM TOP BAR! ", JSON.stringify(message));
switch (message.method) {
case "toggleAvatarApp":
toggleAvatarApp();
@@ -589,7 +579,6 @@ function modifyLODSettings() {
function restoreLODSettings() {
- print("RESTORING LOD SETTINGS");
LODManager.automaticLODAdjust = oldAutomaticLODAdjust;
LODManager.lodAngleDeg = oldLODAngleDeg;
}
@@ -650,11 +639,9 @@ function startup() {
function shutdown() {
- print("SHUTTING DOWN SIMPLIFIED UI");
restoreLODSettings();
if (!keepExistingUIAndScriptsSetting) {
- console.log("The Simplified UI script has been shut down. If you notice any strangeness with user interface, please restart this application.");
if (!HMD.active) {
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);