mirror of https://github.com/calzoneman/sync.git
Fix the wrong files being merged
This commit is contained in:
Calvin Montgomery
parent
d27a8efcb1
commit
6046ea2480
|
|
@ -132,7 +132,7 @@ Callbacks = {
|
|||
$("#needpw").remove();
|
||||
},
|
||||
|
||||
chatCooldown: function (time) {
|
||||
cooldown: function (time) {
|
||||
time = time + 200;
|
||||
$("#chatline").css("color", "#ff0000");
|
||||
if (CHATTHROTTLE && $("#chatline").data("throttle_timer")) {
|
||||
|
|
@ -189,21 +189,17 @@ Callbacks = {
|
|||
setMotd: function(data) {
|
||||
CHANNEL.motd = data.html;
|
||||
CHANNEL.motd_text = data.motd;
|
||||
if ($("#motdwrap").find(".motdeditor").length > 0) {
|
||||
$("#motdwrap .motdeditor").val(CHANNEL.motd_text);
|
||||
} else {
|
||||
$("#motd").html(CHANNEL.motd);
|
||||
}
|
||||
$("#motdtext").val(CHANNEL.motd_text);
|
||||
if(data.motd != "") {
|
||||
$("#cs-motdtext").val(CHANNEL.motd_text);
|
||||
if (data.motd != "") {
|
||||
$("#motdwrap").show();
|
||||
$("#motd").show();
|
||||
$("#togglemotd").find(".glyphicon-plus")
|
||||
.removeClass("glyphicon-plus")
|
||||
.addClass("glyphicon-minus");
|
||||
}
|
||||
else
|
||||
} else {
|
||||
$("#motdwrap").hide();
|
||||
}
|
||||
},
|
||||
|
||||
chatFilters: function(entries) {
|
||||
|
|
@ -360,9 +356,13 @@ Callbacks = {
|
|||
},
|
||||
|
||||
channelRankFail: function (data) {
|
||||
if ($("#cs-chanranks").is(":visible")) {
|
||||
makeAlert("Error", data.msg, "alert-danger")
|
||||
.removeClass().addClass("vertical-spacer")
|
||||
.insertAfter($("#cs-chanranks form"));
|
||||
} else {
|
||||
Callbacks.noflood({ action: "/rank", msg: data.msg });
|
||||
}
|
||||
},
|
||||
|
||||
readChanLog: function (data) {
|
||||
|
|
@ -1110,7 +1110,8 @@ try {
|
|||
io.transports.splice(i, 1);
|
||||
}
|
||||
}
|
||||
if (ALLOW_SSL && (location.protocol === "https:" || USEROPTS.secure_connection)) {
|
||||
|
||||
if (IO_URL === IO_URLS["ipv4-ssl"] || IO_URL === IO_URLS["ipv6-ssl"]) {
|
||||
socket = io.connect(IO_URL, { secure: true });
|
||||
} else {
|
||||
socket = io.connect(IO_URL);
|
||||
|
|
|
|||
|
|
@ -1094,15 +1094,17 @@ var GoogleDocsPlayer = function (data) {
|
|||
self.videoLength = data.seconds;
|
||||
self.paused = false;
|
||||
var wmode = USEROPTS.wmode_transparent ? "transparent" : "opaque";
|
||||
self.player = $("<object/>", data.object)[0];
|
||||
$(self.player).attr("data", data.object.data);
|
||||
var meta = data.meta;
|
||||
self.player = $("<object/>", meta.object)[0];
|
||||
$(self.player).attr("data", meta.object.data);
|
||||
$(self.player).attr("width", VWIDTH)
|
||||
.attr("height", VHEIGHT);
|
||||
data.params.forEach(function (p) {
|
||||
meta.params.forEach(function (p) {
|
||||
$("<param/>", p).appendTo(self.player);
|
||||
});
|
||||
removeOld($(self.player));
|
||||
self.setVolume(VOLUME);
|
||||
resizeStuff();
|
||||
};
|
||||
|
||||
self.load = function (data) {
|
||||
|
|
|
|||
|
|
@ -493,7 +493,7 @@ if (location.protocol === "https:") {
|
|||
function chanrankSubmit(rank) {
|
||||
var name = $("#cs-chanranks-name").val();
|
||||
socket.emit("setChannelRank", {
|
||||
user: name,
|
||||
name: name,
|
||||
rank: rank
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -238,7 +238,8 @@ function addUserDropdown(entry) {
|
|||
.click(function () {
|
||||
var reason = prompt("Enter kick reason (optional)");
|
||||
socket.emit("chatMsg", {
|
||||
msg: "/kick " + name + " " + reason
|
||||
msg: "/kick " + name + " " + reason,
|
||||
meta: {}
|
||||
});
|
||||
})
|
||||
.appendTo(btngroup);
|
||||
|
|
@ -250,33 +251,27 @@ function addUserDropdown(entry) {
|
|||
.text("Mute")
|
||||
.click(function () {
|
||||
socket.emit("chatMsg", {
|
||||
msg: "/mute " + name
|
||||
msg: "/mute " + name,
|
||||
meta: {}
|
||||
});
|
||||
mute.hide();
|
||||
smute.hide();
|
||||
unmute.show();
|
||||
})
|
||||
.appendTo(btngroup);
|
||||
var smute = $("<button/>").addClass("btn btn-xs btn-default")
|
||||
.text("Shadow Mute")
|
||||
.click(function () {
|
||||
socket.emit("chatMsg", {
|
||||
msg: "/smute " + name
|
||||
msg: "/smute " + name,
|
||||
meta: {}
|
||||
});
|
||||
mute.hide();
|
||||
smute.hide();
|
||||
unmute.show();
|
||||
})
|
||||
.appendTo(btngroup);
|
||||
var unmute = $("<button/>").addClass("btn btn-xs btn-default")
|
||||
.text("Unmute")
|
||||
.click(function () {
|
||||
socket.emit("chatMsg", {
|
||||
msg: "/unmute " + name
|
||||
msg: "/unmute " + name,
|
||||
meta: {}
|
||||
});
|
||||
unmute.hide();
|
||||
mute.show();
|
||||
smute.show();
|
||||
})
|
||||
.appendTo(btngroup);
|
||||
if (meta.muted) {
|
||||
|
|
@ -294,7 +289,8 @@ function addUserDropdown(entry) {
|
|||
.click(function () {
|
||||
var reason = prompt("Enter ban reason (optional)");
|
||||
socket.emit("chatMsg", {
|
||||
msg: "/ban " + name + " " + reason
|
||||
msg: "/ban " + name + " " + reason,
|
||||
meta: {}
|
||||
});
|
||||
})
|
||||
.appendTo(btngroup);
|
||||
|
|
@ -303,7 +299,8 @@ function addUserDropdown(entry) {
|
|||
.click(function () {
|
||||
var reason = prompt("Enter ban reason (optional)");
|
||||
socket.emit("chatMsg", {
|
||||
msg: "/ipban " + name + " " + reason
|
||||
msg: "/ipban " + name + " " + reason,
|
||||
meta: {}
|
||||
});
|
||||
})
|
||||
.appendTo(btngroup);
|
||||
|
|
@ -590,6 +587,7 @@ function showUserOptions() {
|
|||
$("#us-layout").val(USEROPTS.layout);
|
||||
$("#us-no-channelcss").prop("checked", USEROPTS.ignore_channelcss);
|
||||
$("#us-no-channeljs").prop("checked", USEROPTS.ignore_channeljs);
|
||||
/*
|
||||
if (!ALLOW_SSL) {
|
||||
$("#us-ssl").prop("checked", false);
|
||||
$("#us-ssl").attr("disabled", true);
|
||||
|
|
@ -599,6 +597,24 @@ function showUserOptions() {
|
|||
$("#us-ssl").attr("disabled", false);
|
||||
$("#us-ssl").attr("title", "");
|
||||
}
|
||||
*/
|
||||
var conninfo = "<strong>Connection Information: </strong>" +
|
||||
"Connected to <code>" + IO_URL + "</code> (";
|
||||
if (IO_URL === IO_URLS["ipv6-ssl"] || IO_URL === IO_URLS["ipv6-nossl"]) {
|
||||
conninfo += "IPv6, ";
|
||||
} else {
|
||||
conninfo += "IPv4, ";
|
||||
}
|
||||
|
||||
if (IO_URL === IO_URLS["ipv4-ssl"] || IO_URL === IO_URLS["ipv6-ssl"]) {
|
||||
conninfo += "SSL)";
|
||||
} else {
|
||||
conninfo += "no SSL)";
|
||||
}
|
||||
|
||||
conninfo += ". SSL is enabled by default if it is supported by the server.";
|
||||
$("#us-conninfo").html(conninfo);
|
||||
|
||||
|
||||
$("#us-synch").prop("checked", USEROPTS.synch);
|
||||
$("#us-synch-accuracy").val(USEROPTS.sync_accuracy);
|
||||
|
|
@ -711,7 +727,8 @@ function applyOpts() {
|
|||
btn.click(function() {
|
||||
if($("#chatline").val().trim()) {
|
||||
socket.emit("chatMsg", {
|
||||
msg: $("#chatline").val()
|
||||
msg: $("#chatline").val(),
|
||||
meta: {}
|
||||
});
|
||||
$("#chatline").val("");
|
||||
}
|
||||
|
|
@ -852,6 +869,7 @@ function handleModPermissions() {
|
|||
$("#cs-afk_timeout").val(CHANNEL.opts.afk_timeout);
|
||||
$("#cs-allow_voteskip").prop("checked", CHANNEL.opts.allow_voteskip);
|
||||
$("#cs-voteskip_ratio").val(CHANNEL.opts.voteskip_ratio);
|
||||
$("#cs-allow_dupes").val(CHANNEL.opts.allow_dupes);
|
||||
(function() {
|
||||
if(typeof CHANNEL.opts.maxlength != "number") {
|
||||
$("#cs-maxlength").val("");
|
||||
|
|
@ -2033,7 +2051,7 @@ function formatCSModList() {
|
|||
if (r.rank !== entry.rank) {
|
||||
a.click(function () {
|
||||
socket.emit("setChannelRank", {
|
||||
user: entry.name,
|
||||
name: entry.name,
|
||||
rank: r.rank
|
||||
});
|
||||
});
|
||||
|
|
@ -2142,11 +2160,11 @@ function checkEntitiesInStr(str) {
|
|||
">": ">",
|
||||
'"': """,
|
||||
"'": "'",
|
||||
"\\(": "(",
|
||||
"\\)": ")"
|
||||
"(": "(",
|
||||
")": ")"
|
||||
};
|
||||
|
||||
var m = str.match(/([&<>"']|\\\(|\\\))/);
|
||||
var m = str.match(/([&<>"'\(\)])/);
|
||||
if (m && m[1] in entities) {
|
||||
return { src: m[1], replace: entities[m[1]] };
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue