oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-27 21:05:53 +00:00
Code Wiki Activity

Attempt to make FrankerFaceZ work with the expected Twitch changes given what I've learned through emails with Twitch staff.

Browse source
This commit is contained in:
SirStendec 2015-01-12 18:18:23 -05:00
parent 2e37e1970c
commit f554bc8f61
5 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
script.js
View file

@ -242,6 +242,8 @@ FFZ.prototype.setup_line = function() {
Line.reopen({
tokenizedMessage: function() {
// Add our own step to the tokenization procedure.
var tokens = f._emoticonize(this, this._super());
f.log("Chat Tokens", tokens);
return f._emoticonize(this, this._super());
}.property("model.message", "isModeratorOrHigher", "controllers.emoticons.emoticons.[]")
@ -308,7 +310,8 @@ FFZ.prototype._emoticonize = function(controller, tokens) {
// with an object telling Twitch's line template how to render the
// emoticon.
_.each(emotes, function(emote) {
var eo = {isEmoticon:true, cls: emote.klass};
//var eo = {isEmoticon:true, cls: emote.klass};
var eo = {emoticonSrc: emote.url, altText: emote.name};
tokens = _.compact(_.flatten(_.map(tokens, function(token) {
if ( _.isObject(token) )
@ -688,13 +691,22 @@ FFZ.prototype.unload_set = function(set_id) {
}
var build_css = function(emote) {
var build_legacy_css = function(emote) {
var margin = emote.margins;
if ( ! margin )
margin = ((emote.height - 18) / -2) + "px 0";
return ".ffz-emote-" + emote.id + ' { background-image: url("' + emote.url + '"); height: ' + emote.height + "px; width: " + emote.width + "px; margin: " + margin + (emote.extra_css ? "; " + emote.extra_css : "") + "}\n";
}
var build_css = function(emote) {
if ( ! emote.margins && ! emote.extra_css )
return "";
return 'img[src="' + emote.url + '"] { ' + (emote.margins ? "margin: " + emote.margins + ";" : "") + (emote.extra_css || "") + " }\n";
}
FFZ.prototype._load_set_json = function(set_id, callback, data) {
// Store our set.
this.emote_sets[set_id] = data;
@ -1120,8 +1132,9 @@ FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, btn) {
continue;
c++;
var s = document.createElement('span');
s.className = 'emoticon ' + emote.klass + ' tooltip';
var s = document.createElement('img');
s.src = emote.url;
//s.className = 'emoticon ' + emote.klass + ' tooltip';
s.title = emote.name;
s.addEventListener('click', this._add_emote.bind(this, view, emote.name));
grid.appendChild(s);

2
script.min.js vendored
View file

File diff suppressed because one or more lines are too long

5
src/ember/line.js
View file

@ -14,6 +14,8 @@ FFZ.prototype.setup_line = function() {
Line.reopen({
tokenizedMessage: function() {
// Add our own step to the tokenization procedure.
var tokens = f._emoticonize(this, this._super());
f.log("Chat Tokens", tokens);
return f._emoticonize(this, this._super());
}.property("model.message", "isModeratorOrHigher", "controllers.emoticons.emoticons.[]")
@ -80,7 +82,8 @@ FFZ.prototype._emoticonize = function(controller, tokens) {
// with an object telling Twitch's line template how to render the
// emoticon.
_.each(emotes, function(emote) {
var eo = {isEmoticon:true, cls: emote.klass};
//var eo = {isEmoticon:true, cls: emote.klass};
var eo = {emoticonSrc: emote.url, altText: emote.name};
tokens = _.compact(_.flatten(_.map(tokens, function(token) {
if ( _.isObject(token) )

11
src/emoticons.js
View file

@ -73,13 +73,22 @@ FFZ.prototype.unload_set = function(set_id) {
}
var build_css = function(emote) {
var build_legacy_css = function(emote) {
var margin = emote.margins;
if ( ! margin )
margin = ((emote.height - 18) / -2) + "px 0";
return ".ffz-emote-" + emote.id + ' { background-image: url("' + emote.url + '"); height: ' + emote.height + "px; width: " + emote.width + "px; margin: " + margin + (emote.extra_css ? "; " + emote.extra_css : "") + "}\n";
}
var build_css = function(emote) {
if ( ! emote.margins && ! emote.extra_css )
return "";
return 'img[src="' + emote.url + '"] { ' + (emote.margins ? "margin: " + emote.margins + ";" : "") + (emote.extra_css || "") + " }\n";
}
FFZ.prototype._load_set_json = function(set_id, callback, data) {
// Store our set.
this.emote_sets[set_id] = data;

5
src/ui/menu.js
View file

@ -106,8 +106,9 @@ FFZ.prototype._emotes_for_sets = function(parent, view, sets, header, btn) {
continue;
c++;
var s = document.createElement('span');
s.className = 'emoticon ' + emote.klass + ' tooltip';
var s = document.createElement('img');
s.src = emote.url;
//s.className = 'emoticon ' + emote.klass + ' tooltip';
s.title = emote.name;
s.addEventListener('click', this._add_emote.bind(this, view, emote.name));
grid.appendChild(s);