oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-17 10:16:57 +00:00
Code Wiki Activity

3.5.477. Fix Channel Title on Top. Fix gray mode from the Twitch chat menu settings. Fix layout width calculations to be font-size aware. Fix Followed Since display on Following and Followers. Fix AutoMod. Fix settings on Chrome Canary. Darken associates' agreement. Closes #149. Closes #147. Closes #144.

Browse source
This commit is contained in:
SirStendec 2017-04-28 16:59:49 -04:00
parent efaf46ee75
commit 557f56ee55
12 changed files with 120 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ember/layout.js
View file

@ -178,11 +178,16 @@ FFZ.prototype.setup_layout = function() {
}
var Layout = utils.ember_lookup('service:layout'),
LS = function(x) { return x },
f = this;
if ( ! Layout )
return this.log("Unable to locate the Ember service:layout");
try {
LS = window.require("web-client/utilities/layout-scaling").scalePixelValue;
} catch(err) { }
this.log("Hooking the Ember service:layout");
Layout.reopen({
@ -230,17 +235,17 @@ FFZ.prototype.setup_layout = function() {
}.property("ffzExtraHeight", "windowWidth", "rightColumnWidth", "fullSizePlayerDimensions", "windowHeight"),
contentWidth: function() {
var left_width = this.get('isSocialColumnEnabled') ? (
var left_width = this.get('isSocialColumnEnabled') ? LS(
f.settings.socialbar_hide ? 0 :
this.get('isSocialColumnCollapsed') ? 50 : 240
) : (
) : LS(
this.get('ffzMinimizeNavigation') ? 10 :
this.get('isLeftColumnClosed') ? 50 : 240
),
right_width = ! f.has_bttv && this.get('portraitMode') ? 0 : this.get("isRightColumnClosed") ? 0 : this.get("rightColumnWidth");
return this.get("windowWidth") - left_width - right_width - 60;
return this.get("windowWidth") - left_width - right_width - LS(60);
}.property("windowWidth", 'ffzMinimizeNavigation', "portraitMode", "isRightColumnClosed", "isLeftColumnClosed", "rightColumnWidth", "isSocialColumnCollapsed", "isSocialColumnEnabled"),

6
src/ember/line.js
View file

@ -875,7 +875,7 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
buildModIconsHTML: function() {
var user = this.get('msgObject.from'),
is_tb = this.get('msgObject.twitchBotRejected'),
is_tb = this.get('msgObject.autoModRejected'),
is_pinned_cheer = this.get('msgObject.is_pinned_cheer'),
room_id = this.get('msgObject.room'),
@ -1332,10 +1332,10 @@ FFZ.prototype._modify_chat_subline = function(component, is_whisper) {
);
else if ( cl.contains('tb-reject') )
this.actions.clickedTwitchBotResponse.call(this, this.get('msgObject.tags.id'), 'no');
this.actions.clickedAutoModResponse.call(this, this.get('msgObject.tags.id'), 'no');
else if ( cl.contains('tb-allow') )
this.actions.clickedTwitchBotResponse.call(this, this.get('msgObject.tags.id'), 'yes');
this.actions.clickedAutoModResponse.call(this, this.get('msgObject.tags.id'), 'yes');
else if ( ! from )
return;