moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #95, Fix #96

This commit is contained in:
calzoneman 2013-05-06 11:24:55 -05:00
parent f9efad01ea
commit d102ca8815
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
channel.js
View File

@ -135,6 +135,7 @@ Channel.prototype.loadDump = function() {
this.filters[i].active = f.active; this.filters[i].active = f.active;
} }
} }
this.broadcastChatFilters();
} }
if(data.motd) { if(data.motd) {
this.motd = data.motd; this.motd = data.motd;
@ -889,7 +890,7 @@ Channel.prototype.jumpTo = function(pos) {
var old = this.position; var old = this.position;
if(this.media && this.media.temp && old != pos) { if(this.media && this.media.temp && old != pos) {
this.dequeue({pos: old, removeonly: true}); this.dequeue({pos: old, removeonly: true});
if(pos > old) { if(pos > old && pos > 0) {
pos--; pos--;
} }
} }

1
www/assets/css/ytsync.css
View File

@ -97,6 +97,7 @@ html, body {
#messagebuffer { #messagebuffer {
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden;
height: 347px; height: 347px;
border: 1px solid #aaaaaa; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAa border: 1px solid #aaaaaa; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAa
border-left: 0; border-left: 0;

5
www/assets/js/callbacks.js
View File

@ -91,7 +91,10 @@ function initCallbacks() {
$("#opt_allow_voteskip").prop("checked", opts.allow_voteskip); $("#opt_allow_voteskip").prop("checked", opts.allow_voteskip);
$("#opt_voteskip_ratio").val(opts.voteskip_ratio); $("#opt_voteskip_ratio").val(opts.voteskip_ratio);
if(opts.customjs.trim() != "") { if(opts.customjs.trim() != "") {
$.getScript(opts.customjs); if(opts.customjs != CUSTOMJS) {
$.getScript(opts.customjs);
CUSTOMJS = opts.customjs;
}
} }
CHANNELOPTS = opts; CHANNELOPTS = opts;

1
www/assets/js/client.js
View File

@ -30,6 +30,7 @@ var VHEIGHT = "377";
var IGNORED = []; var IGNORED = [];
var KICKED = false; var KICKED = false;
var CHANNEL = ""; var CHANNEL = "";
var CUSTOMJS = "";
var uname = readCookie("sync_uname"); var uname = readCookie("sync_uname");
var session = readCookie("sync_session"); var session = readCookie("sync_session");