Skip to content

Commit

Permalink
Upgrade packages.
Browse files Browse the repository at this point in the history
  • Loading branch information
@roncli
roncli committed Jul 2, 2019
1 parent e079853 commit cfd070c
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"url": "http://www.roncli.com"
},
"dependencies": {
"body-parser": "1.18.3",
"express": "4.16.4",
"body-parser": "1.19.0",
"express": "4.17.1",
"express-ws": "4.0.0",
"google-spreadsheet": "2.0.6",
"jquery": "3.3.1",
"jsdom": "13.1.0",
"google-spreadsheet": "2.0.7",
"jquery": "3.4.1",
"jsdom": "15.1.1",
"node-database": "roncli/node-database#v1.1.0",
"obs-websocket-js": "1.2.0",
"obs-websocket-js": "3.0.0",
"request": "2.88.0",
"spotify-web-api-node": "4.0.0",
"steam-api": "1.1.3"
Expand Down
2 changes: 1 addition & 1 deletion public/js/ctm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ class CTM {

switch (data.type) {
case "obs-scene":
CTM.obs.setCurrentScene({"scene-name": data.scene});
CTM.obs.send("SetCurrentScene", {"scene-name": data.scene});
break;
case "scene":
[].forEach.call(document.getElementsByClassName("scene"), (el) => {
Expand Down
14 changes: 7 additions & 7 deletions public/js/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ class Index {

switch (data.type) {
case "obs-scene":
Index.obs.setCurrentScene({"scene-name": data.scene});
Index.obs.send("SetCurrentScene", {"scene-name": data.scene});
break;
case "scene":
[].forEach.call(document.getElementsByClassName("scene"), (el) => {
Expand All @@ -627,7 +627,7 @@ class Index {
Index.countdown = true;
Spotify.playPlaylist("spotify:user:1211227601:playlist:6vC594uhppzSoqqmxhXy0A", true);
}, 15000);
Index.obs.setCurrentScene({"scene-name": "roncli Gaming - Bumper"});
Index.obs.send("SetCurrentScene", {"scene-name": "roncli Gaming - Bumper"});
break;
case "brb":
document.querySelector("#intro .upNext").classList.remove("hidden");
Expand All @@ -646,7 +646,7 @@ class Index {
} catch (err) {
Spotify.playPlaylist("spotify:user:1211227601:playlist:6vC594uhppzSoqqmxhXy0A", false);
}
Index.obs.setCurrentScene({"scene-name": "roncli Gaming - Bumper"});
Index.obs.send("SetCurrentScene", {"scene-name": "roncli Gaming - Bumper"});
break;
case "thanks":
document.querySelector("#intro .upNext").classList.add("hidden");
Expand All @@ -665,11 +665,11 @@ class Index {
} catch (err) {
Spotify.playPlaylist("spotify:user:1211227601:playlist:6vC594uhppzSoqqmxhXy0A", false);
}
Index.obs.setCurrentScene({"scene-name": "roncli Gaming - Bumper"});
Index.obs.send("SetCurrentScene", {"scene-name": "roncli Gaming - Bumper"});
break;
case "fullscreen":
Index.goFullscreen();
Index.obs.setCurrentScene({"scene-name": "roncli Gaming - Full Screen"});
Index.obs.send("SetCurrentScene", {"scene-name": "roncli Gaming - Full Screen"});
break;
case "scene":
document.getElementById("scene").classList.remove("hidden");
Expand All @@ -683,7 +683,7 @@ class Index {
document.getElementById("screen").classList.add("green-screen");
}, 1000);
Spotify.setSpotifyVolume(50);
Index.obs.setCurrentScene({"scene-name": data.scene});
Index.obs.send("SetCurrentScene", {"scene-name": data.scene});
break;
}
break;
Expand Down Expand Up @@ -763,7 +763,7 @@ class Index {
statusText.innerText = "00:00:00";

Index.goFullscreen();
Index.obs.setCurrentScene({"scene-name": "roncli Gaming - Full Screen"});
Index.obs.send("SetCurrentScene", {"scene-name": "roncli Gaming - Full Screen"});
return;
}

Expand Down
8 changes: 4 additions & 4 deletions public/js/observatory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ class Observatory {

switch (data.type) {
case "obs-scene":
Observatory.obs.setCurrentScene({"scene-name": data.scene});
Observatory.obs.send("SetCurrentScene", {"scene-name": data.scene});
break;
case "scene":
switch (data.scene) {
Expand All @@ -1453,7 +1453,7 @@ class Observatory {

Spotify.playPlaylist("spotify:user:1211227601:playlist:3ld3qI0evdqsr66HoaE0Zp", false);
Spotify.setSpotifyVolume(100);
Observatory.obs.setCurrentScene({"scene-name": "The Observatory - Bumper"});
Observatory.obs.send("SetCurrentScene", {"scene-name": "The Observatory - Bumper"});

if (Observatory.carouselTimeout) {
clearTimeout(Observatory.carouselTimeout);
Expand All @@ -1472,7 +1472,7 @@ class Observatory {
document.getElementById("tournament-subevent").innerText = data.title;

Spotify.setSpotifyVolume(40);
Observatory.obs.setCurrentScene({"scene-name": "The Observatory - Tournament"});
Observatory.obs.send("SetCurrentScene", {"scene-name": "The Observatory - Tournament"});

if (Observatory.carouselTimeout) {
clearTimeout(Observatory.carouselTimeout);
Expand All @@ -1490,7 +1490,7 @@ class Observatory {
document.getElementById("countdown").innerText = "Thanks for watching!";

Spotify.setSpotifyVolume(100);
Observatory.obs.setCurrentScene({"scene-name": "The Observatory - Bumper"});
Observatory.obs.send("SetCurrentScene", {"scene-name": "The Observatory - Bumper"});

if (Observatory.carouselTimeout) {
clearTimeout(Observatory.carouselTimeout);
Expand Down
2 changes: 1 addition & 1 deletion public/js/observatorystatus.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class ObservatoryStatus {

switch (data.type) {
case "obs-scene":
ObservatoryStatus.obs.setCurrentScene({"scene-name": data.scene});
ObservatoryStatus.obs.send("SetCurrentScene", {"scene-name": data.scene});
break;
case "scene":
switch (data.scene) {
Expand Down

0 comments on commit cfd070c

Please sign in to comment.