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

3.5.309. I'm silly and forgot to account for the player controls being shifted up when conversations are on the bottom of the screen. (Also, sub count fixes.) Closes #12

Browse source
This commit is contained in:
SirStendec 2016-10-03 20:08:44 -04:00
parent 97ea944f43
commit e3cf6cb777
5 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
changelog.html
View file

@ -1,3 +1,13 @@
<div class="list-header">3.5.309 <time datetime="2016-10-03">(2016-10-03)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Properly position the Theater Mode metadata bar when whispers are at the bottom of the screen.</li>
</ul>
<div class="list-header">3.5.308 <time datetime="2016-10-03">(2016-10-03)</time></div>
<ul class="chat-menu-content menu-side-padding">
<li>Fixed: Dashboard subscriber count should hopefully now be accurate and include Twitch Prime subscriptions.</li>
</ul>
<div class="list-header">3.5.307 <time datetime="2016-10-03">(2016-10-03)</time></div> <div class="list-header">3.5.307 <time datetime="2016-10-03">(2016-10-03)</time></div>
<ul class="chat-menu-content menu-side-padding"> <ul class="chat-menu-content menu-side-padding">
<li>Added: Option to only allow tab-completing usernames when the tab completion was started via an at sign.</li> <li>Added: Option to only allow tab-completing usernames when the tab completion was started via an at sign.</li>

4
src/ember/layout.js
View file

@ -317,7 +317,9 @@ FFZ.prototype.setup_layout = function() {
'body.ffz-sidebar-swap .cn-bar-fixed { left: 0 !important }' + 'body.ffz-sidebar-swap .cn-bar-fixed { left: 0 !important }' +
'.ffz-theater-stats .app-main.theatre .cn-metabar__more {' + '.ffz-theater-stats .app-main.theatre .cn-metabar__more {' +
'max-width: calc(100% - 300px);' + 'max-width: calc(100% - 300px);' +
'bottom: ' + (theatre_video_bottom + 55) + 'px !important}'; 'bottom: ' + (theatre_video_bottom + 55) + 'px !important}' +
'.ffz-theater-stats:not(.ffz-theatre-conversations):not(.ffz-top-conversations) .app-main.theatre .cn-metabar__more {' +
'bottom: ' + (theatre_video_bottom + 90) + 'px !important}';
} else { } else {
out += 'top: 0; right: ' + width + 'px}' + out += 'top: 0; right: ' + width + 'px}' +

2
src/main.js
View file

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

10
src/ui/sub_count.js
View file

@ -18,9 +18,9 @@ FFZ.prototype._update_subscribers = function() {
var user = this.get_user(), f = this, var user = this.get_user(), f = this,
match = this.is_dashboard ? location.pathname.match(/\/([^\/]+)/) : undefined, match = this.is_dashboard ? location.pathname.match(/\/([^\/]+)/) : undefined,
id = this.is_dashboard && match && match[1]; channel_id = this.is_dashboard && match && match[1];
if ( this.has_bttv || ! id || id !== user.login ) { if ( this.has_bttv || ! channel_id || channel_id !== user.login ) {
var el = document.querySelector("#ffz-sub-display"); var el = document.querySelector("#ffz-sub-display");
if ( el ) if ( el )
el.parentElement.removeChild(el); el.parentElement.removeChild(el);
@ -31,8 +31,8 @@ FFZ.prototype._update_subscribers = function() {
// context of the web user. // context of the web user.
// Get the count! // Get the count!
jQuery.getJSON("/" + id + "/dashboard/revenue/summary_data").done(function(data) { utils.api.get("/api/channels/" + channel_id + "/subscriber_count").done(function(data) {
var el, sub_count = data && data.data && data.data.total_subscriptions; var el, sub_count = data && data.count;
if ( typeof sub_count === "string" ) if ( typeof sub_count === "string" )
sub_count = parseInt(sub_count.replace(/[,\.]/g, "")); sub_count = parseInt(sub_count.replace(/[,\.]/g, ""));
@ -77,7 +77,7 @@ FFZ.prototype._update_subscribers = function() {
el = document.createElement('span'); el = document.createElement('span');
stat.appendChild(el); stat.appendChild(el);
utils.api.get("chat/" + id + "/badges", null, {version: 3}) utils.api.get("chat/" + channel_id + "/badges", null, {version: 3})
.done(function(data) { .done(function(data) {
if ( data.subscriber && data.subscriber.image ) { if ( data.subscriber && data.subscriber.image ) {
stat.innerHTML = ''; stat.innerHTML = '';

9
style.css
View file

@ -302,7 +302,6 @@ body.ffz-bttv-dark .ffz-ui-toggle.blue.live:hover svg.svg-emoticons path { fill:
color: #aaa; color: #aaa;
position: fixed; position: fixed;
bottom: 55px;
left: 10px; left: 10px;
width: auto; width: auto;
@ -311,6 +310,14 @@ body.ffz-bttv-dark .ffz-ui-toggle.blue.live:hover svg.svg-emoticons path { fill:
padding: 10px; padding: 10px;
} }
.ffz-theater-stats .app-main.theatre .cn-metabar__more {
bottom: 55px;
}
.ffz-theater-stats:not(.ffz-theatre-conversations):not(.ffz-top-conversations) .app-main.theatre .cn-metabar__more {
bottom: 95px;
}
.ffz-theater-stats .app-main.theatre .cn-metabar__more span, .ffz-theater-stats .app-main.theatre .cn-metabar__more span,
.ffz-theater-stats .app-main.theatre .cn-metabar__more div { flex-grow: 0 !important } .ffz-theater-stats .app-main.theatre .cn-metabar__more div { flex-grow: 0 !important }