oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-28 23:37:41 +00:00
Code Wiki Activity

Fixed some hard-coded HTTP protocols. Moved betterttv into ext/ folder. Added support for Emote Menu for Twitch. Added support for non-critical WebSocket calls that wait till the socket is connected.

Browse source
This commit is contained in:
SirStendec 2015-01-19 15:27:10 -05:00
parent 2c3af2d51e
commit 3d3c1f9716
12 changed files with 434 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/main.js
View file

@ -70,12 +70,14 @@ require('./ember/room');
require('./ember/line');
require('./ember/chatview');
require('./ember/viewers');
//require('./ember/teams');
require('./tracking');
require('./debug');
require('./betterttv');
require('./ext/betterttv');
require('./ext/emote_menu');
require('./featurefriday');
@ -113,11 +115,11 @@ FFZ.prototype.initialize = function(increment, delay) {
return;
}
this.setup(delay);
this.setup_ember(delay);
}
FFZ.prototype.setup = function(delay) {
FFZ.prototype.setup_ember = function(delay) {
var start = (window.performance && performance.now) ? performance.now() : Date.now();
this.log("Found Twitch application after " + (delay||0) + " ms in \"" + location + "\". Initializing FrankerFaceZ version " + FFZ.version_info);
@ -129,40 +131,28 @@ FFZ.prototype.setup = function(delay) {
localStorage.removeItem(key);
}
// Store the capitalization of our own name.
var user = this.get_user();
if ( user && user.name )
FFZ.capitalization[user.login] = [user.name, Date.now()];
// Initialize all the modules.
try {
this.ws_create();
this.setup_emoticons();
this.setup_badges();
this.ws_create();
this.setup_emoticons();
this.setup_badges();
this.setup_piwik();
this.setup_piwik();
this.setup_router();
this.setup_room();
this.setup_line();
this.setup_chatview();
this.setup_viewers();
this.setup_router();
this.setup_room();
this.setup_line();
this.setup_chatview();
this.setup_viewers();
this.setup_css();
this.setup_menu();
//this.setup_teams();
this.find_bttv(10);
this.setup_css();
this.setup_menu();
this.check_ff();
this.find_bttv(10);
this.find_emote_menu(10);
} catch(err) {
this.log("An error occurred while starting FrankerFaceZ: " + err);
return;
}
if ( window.console && console.time )
console.timeEnd("FrankerFaceZ Initialization");
this.check_ff();
var end = (window.performance && performance.now) ? performance.now() : Date.now(),
duration = end - start;