Skip to content

Cleanup unused global variables #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Smidqe wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Cleanup unused global variables #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
789f7c0
Cleanup unnecessary and unused global variables
Smidqe Nov 23, 2021
df3ffb8
Remove unused game functions
Smidqe Nov 23, 2021
1803096
Remove drag globals, use parent element instead to store
Smidqe Nov 23, 2021
6310525
Readd NOTIFY_TITLE for easier access
Smidqe Nov 23, 2021
c37d260
Use oneliner instead of function for highlitght list initialisation
Smidqe Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions web/js/callbacks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ function videoSeeked(time) {
}
}
function videoPlaying() {
//PLAYING_VID = getLiteralPlayingVidID();
if (controlsVideo()) {
videoGetTime(function (time) {
SEEK_TO = time;
Expand All @@ -48,11 +47,6 @@ function videoPaused() {

socket.on("createPlayer", function (data) {
console.log('createPlayer', data);

if (!INIT_TIME) {
INIT_TIME = data.time;
}

const isNew = ACTIVE.videoid != data.video.videoid;

unfuckPlaylist();
Expand Down
81 changes: 8 additions & 73 deletions web/js/functions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,19 +990,17 @@ function handleACL() {
});
playlist.sortable({
start: function (event, ui) {
PLAYLIST_DRAGFROM = ui.item.index();
PLAYLIST_DRAGSANITY = ui.item.data('plobject').videoid;
ui.item.parent().data('drag', {
Copy link
Copy Markdown
Member

@Atte Atte Sep 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't this just use a local variable? Is there a benefit to storing the stuff in jQuery data?

from: ui.item.index(),
sanityid: ui.item.data('plobject').videoid
});
},
update: function (event, ui) {
PLAYLIST_DRAGTO = ui.item.index();
if (controlsPlaylist()) {
var data = {
from: PLAYLIST_DRAGFROM,
to: PLAYLIST_DRAGTO,
sanityid: PLAYLIST_DRAGSANITY
};
dbg(data);
socket.emit("sortPlaylist", data);
socket.emit("sortPlaylist", {
...ui.item.parent().data('drag'),
to: ui.item.index()
});
}
$(this).sortable('cancel');
},
Expand Down Expand Up @@ -2291,69 +2289,6 @@ function secondsToString(seconds) {

return days + ":" + hours + ":" + minutes + ":" + seconds;
}
function isMainGameOn() {
TIME = new Date();
// Main game runs from 4AM Saturday UTC "to" 10AM Saturday UTC.
if (
TIME.getUTCDay() == 6 && // 6 for Saturday
TIME.getUTCHours() >= 4 &&
TIME.getUTCHours() < 10
) {
return true;
}
return false;
}
function timeToMainGame() {
var WEEK = 604800;
TIME = new Date();
GAME = new Date();
var startDay = 6;
var startHr = 4;
var stopHr = 10;

var dayOffset = 0;
var day = TIME.getUTCDay();
while (day != startDay) {
dayOffset++;
day++;
if (day >= 7) {
day = 0;
}
}

console.log(TIME.getUTCDate() + dayOffset);
GAME.setUTCDate(TIME.getUTCDate() + dayOffset);
GAME.setUTCHours(startHr);
GAME.setUTCMinutes(0);
GAME.setUTCSeconds(-1);

var timeUntilGameStarts = (GAME.getTime() / 1000) - (TIME.getTime() / 1000);
if (timeUntilGameStarts < 0) {
timeUntilGameStarts += WEEK;
}

GAME.setUTCHours(stopHr);

var timeUntilGameStops = (GAME.getTime() / 1000) - (TIME.getTime() / 1000);
if (timeUntilGameStops < 0) {
timeUntilGameStops += WEEK;
}

return {
start: timeUntilGameStarts,
stop: timeUntilGameStops
};
}
/*function isMainGameOn(){
TIME = new Date();
var gameStartsAt = new Date()
// Get days to friday.
var dtf = (5 - TIME.getUTCDay())

var dow = DATE.getUTCDay()

if(dow = DATE.getUTCDay()
}*/
function detectName(nick, msg) {
var list = '';
if (nick) {
Expand Down
26 changes: 1 addition & 25 deletions web/js/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,25 +142,14 @@ var btEvents = (function () {

var PLAYER = false;
var LEADER = false;
var ADMIN = false;
var MOD = false;
var NAME = false;
var TIME = new Date();
var TYPE = -1;
var CHATLIST = {};
var TOGGLEABLES = {};
var IGNORELIST = [];
var CONNECTED = 0;
var PLAYLIST = new LinkedList.Circular();
var ACTIVE = new Video();
var PLAYING_VID;
var HB_DELAY = 5000;
var leaderHeartbeat = false;
var PLAYLIST_DRAGFROM = 0;
var PLAYLIST_DRAGTO = 0;
var PLAYLIST_DRAGSANITY = '';
var LEGACY_PLAYER = false;
var INIT_TIME = 0;
var SEEK_FROM = 0;
var SEEK_TO = 0;
var HISTORY = [];
Expand All @@ -173,7 +162,6 @@ var CHAT_NOTIFY = false;
var VIDEO_TYPE = false;
var MY_FLAIR_ID = 0;
var DRINKS = 0;
var LAST_SEND_TIME = false;
var NOTIFY_TITLE = "Chat!";
var NOTIFY = window.NOTIFY || new Audio(CDN_ORIGIN + "/sounds/notify.wav"); // buffers automatically when created
var DRINK = window.DRINK || new Audio(CDN_ORIGIN + "/sounds/drink.wav"); // buffers automatically when created
Expand All @@ -189,7 +177,6 @@ var VOLUME = false;
var PLAYERS = {};
var IGNORE_GHOST_MESSAGES = false;
var ADMIN_LOG = [];
var HIGHLIGHT_LIST = [];
var ACTIVE_CHAT = 'main';
var MAIN_NOTIFY = false;
var ADMIN_NOTIFY = false;
Expand All @@ -198,18 +185,7 @@ var POLL_TITLE_FORMAT = '';
var POLL_OPTIONS = [];
var DEBUG_DUMPS = [];

(function () {
// This isn't 100% necessary, but it keeps things a bit tidier by not making storedList global
var storedList = localStorage.getItem('highlightList');
if (storedList != null) {
var storedListArray = storedList.split(';');
for (var i in storedListArray) {
if (storedListArray[i].length > 0) {
HIGHLIGHT_LIST.push(storedListArray[i]);
}
}
}
})();
var HIGHLIGHT_LIST = (localStorage.getItem('highlightList') || '').split(';').filter(n => n.length > 0);

try {
const stored = localStorage.getItem('ignoreList');
Expand Down