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.362. Fix player positioning CSS. Fix subscriber badges on sub notices. Fix Twitch Feed integration. Dark theme tweaks.

Browse source
This commit is contained in:
SirStendec 2016-11-03 21:44:44 -04:00
parent e1538fe672
commit ff6f23b07e
9 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/badges.js
View file

@ -453,7 +453,7 @@ FFZ.prototype.get_twitch_badges = function(badge_tag, room_id) {
for(var badge in badge_tag) {
var version = badge_tag[badge];
if ( ! badge_tag.hasOwnProperty(badge) || ! version )
if ( ! badge_tag.hasOwnProperty(badge) || version === undefined || version === null )
continue;
var versions = channel[badge] || globals[badge],

12
src/ember/feed-card.js
View file

@ -21,16 +21,16 @@ var FFZ = window.FrankerFaceZ,
FFZ.prototype.setup_feed_cards = function() {
this.update_views('component:channel-feed/card', this.modify_feed_card);
this.update_views('component:channel-feed/comment', this.modify_feed_comment);
this.update_views('component:twitch-feed/story-card', this.modify_feed_card);
this.update_views('component:twitch-feed/comment', this.modify_feed_comment);
this.rerender_feed_cards();
}
FFZ.prototype.rerender_feed_cards = function(for_set) {
var FeedCard = utils.ember_resolve('component:channel-feed/card'),
FeedComment = utils.ember_resolve('component:channel-feed/comment'),
var FeedCard = utils.ember_resolve('component:twitch-feed/story-card'),
FeedComment = utils.ember_resolve('component:twitch-feed/comment'),
views = utils.ember_views();
if ( ! FeedCard )
@ -44,7 +44,7 @@ FFZ.prototype.rerender_feed_cards = function(for_set) {
this.modify_feed_card(view);
view.ffz_init(for_set);
} catch(err) {
this.error("setup component:channel-feed/card ffzInit", err)
this.error("setup component:twitch-feed/story-card ffzInit", err)
}
}
@ -54,7 +54,7 @@ FFZ.prototype.rerender_feed_cards = function(for_set) {
this.modify_feed_comment(view);
view.ffz_init(for_set);
} catch(err) {
this.error("setup component:channel-feed/comment ffzInit", err);
this.error("setup component:twitch-feed/comment ffzInit", err);
}
}
}

14
src/ember/layout.js
View file

@ -254,11 +254,11 @@ FFZ.prototype.setup_layout = function() {
var size = this.get('fullSizePlayerDimensions');
return '<style>' +
'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) #player,' +
'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) .js-player,' +
'.dynamic-player, .dynamic-player object, .dynamic-player video {' +
'width:' + size.width + 'px !important;' +
'height:' + size.height + 'px !important}' +
'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) #player,' +
'.ffz-small-player:not(.ffz-bttv)[data-current-path^="user."] .app-main:not(.theatre) .js-player,' +
'.dynamic-target-player, .dynamic-target-player object, .dynamic-target-player video {' +
'width:' + size.width + 'px !important;' +
'height:' + size.targetHeight + 'px !important}' +
@ -286,7 +286,7 @@ FFZ.prototype.setup_layout = function() {
var window_height = this.get('windowHeight'),
window_width = this.get('windowWidth'),
width = this.get('rightColumnWidth'),
out = 'body.ffz-small-player #player .dynamic-player {' +
out = 'body.ffz-small-player .js-player .dynamic-player {' +
'position: fixed;' +
'z-index: 9;' +
'box-shadow: 0 0 20px 0 black;';
@ -338,14 +338,14 @@ FFZ.prototype.setup_layout = function() {
'height:' + chat_height + 'px}' +
'body[data-current-path^="user."] .app-main.theatre #left_col .warp,' +
'body[data-current-path^="user."] .app-main.theatre #left_col,' +
'body[data-current-path^="user."] .app-main.theatre .cn-content #player,' +
'body[data-current-path^="user."] .app-main.theatre #player,' +
'body[data-current-path^="user."] .app-main.theatre #main_col{' +
'top:' + theatre_video_top + 'px;' +
'height:' + theatre_video_height + 'px !important}' +
'body[data-current-path^="user."] .app-main.theatre #right_col{' +
'top:' + theatre_chat_top + 'px;' +
'height:' + theatre_chat_height + 'px}' +
'.app-main.theatre .cn-content #player {' +
'.app-main.theatre #player {' +
'right: 0 !important}' +
'body.ffz-minimal-channel-bar:not(.ffz-channel-bar-bottom) .cn-bar-fixed {' +
'top: ' + (video_top - 40) + 'px}' +
@ -374,9 +374,9 @@ FFZ.prototype.setup_layout = function() {
'body.ffz-sidebar-swap .theatre #main_col:not(.expandRight),' +
'body.ffz-sidebar-swap #main_col:not(.expandRight){' +
'margin-left:' + width + 'px}' +
'body:not(.ffz-sidebar-swap) .app-main.theatre #main_col:not(.expandRight) .cn-content #player {' +
'body:not(.ffz-sidebar-swap) .app-main.theatre #main_col:not(.expandRight) #player {' +
'right: ' + width + 'px !important}' +
'body.ffz-sidebar-swap .app-main.theatre #main_col:not(.expandRight) .cn-content #player {' +
'body.ffz-sidebar-swap .app-main.theatre #main_col:not(.expandRight) #player {' +
'right: 0 !important;' +
'left:' + width + 'px !important}' +
'body:not(.ffz-sidebar-swap) #main_col:not(.expandRight) .cn-bar-fixed {' +

4
src/ember/room.js
View file

@ -1943,9 +1943,9 @@ FFZ.prototype._modify_room = function(room) {
msg.tags.badges.subscriber = ( months >= 24 && sub_version[24] ) ? 24 :
(months >= 12 && sub_version[12] ) ? 12 :
(months >= 6 && sub_version[6] ) ? 6 :
(months >= 3 && sub_version[3] ) ? 3 : 1;
(months >= 3 && sub_version[3] ) ? 3 : 0;
} else
msg.tags.badges.subscriber = 1;
msg.tags.badges.subscriber = 0;
msg.tags.subscriber = true;
if ( msg.labels && msg.labels.indexOf("subscriber") === -1 )

2
src/main.js
View file

@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
// Version
var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 361,
major: 3, minor: 5, revision: 362,
toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
}