From fefa9f42384d020aceb786295a79748ce8d02993 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Wed, 7 Aug 2013 17:00:53 -0400 Subject: [PATCH] Fix line endings --- www/assets/css/ytsync.css | 682 +++++------ www/assets/js/callbacks.js | 2236 ++++++++++++++++++------------------ 2 files changed, 1459 insertions(+), 1459 deletions(-) diff --git a/www/assets/css/ytsync.css b/www/assets/css/ytsync.css index d152fc3e..44e3d812 100644 --- a/www/assets/css/ytsync.css +++ b/www/assets/css/ytsync.css @@ -1,341 +1,341 @@ -html, body { - height: 100%; -} - -.wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -90px; -} - -#footer, .push { - margin: 90px 0 0 0; - height: 30px; - clear: both; -} - -#welcome { - font-size: 10pt; - color: #ffffff; -} - -#usercountwrap, #userlist, #messagebuffer, #videowrap { - background-color: #ffffff; -} - -#librarywrap, #userplaylistwrap, #playlist_controls { - display: none; -} - -.videolist { - list-style: none outside none; - margin-left: 0; - max-height: 500px; - overflow-y: scroll; -} - -.qe_btn { - height: 20px; - font-family: Monospace; - padding: 0 5px 0 5px; - margin: auto; - overflow: hidden; -} - -.qe_buttons { - float: left; -} - -.qe_title { - float: left; -} - -.qe_time { - font-family: Monospace; - float: right; -} - -.qe_clear { - clear: both; -} - -#userpl_list { - list-style: none outside none; - margin-left: 0; - max-height: 500px; - overflow-y: scroll; -} - -#userpl_list li { - clear: both; - margin: 2px 0 0 auto; - padding: 2px; - font-size: 8pt; -} - -#usercountwrap, #currenttitle { - border: 1px solid #aaaaaa; - border-bottom: none; - margin: 0; -} - -#usercount { - margin: 0; -} - -.pointer { - cursor: pointer; -} - -#leftpane-inner div.span12, #rightpane-inner div.span12, -#leftpane-inner ul, #rightpane-inner ul, -#channelsettingswrap div.span12 { - margin-left: 0; -} - -#queue { - margin-bottom: 0; -} - -.queue_sortable li { - cursor: row-resize; -} - -.queue_entry { - background-color: #ffffff; - margin: 2px 0 0 auto; - padding: 2px; - font-size: 8pt; - border: 1px solid #aaaaaa; // [](/w21) -} - -.queue_temp { - background-image: url(../img/stripe-diagonal.png); -} - -.queue_active { - background-color: #d9edf7; - border-color: #bce8f1; -} - -#plmeta { - border: 1px solid #aaaaaa; - border-top: 0; - background-color: #ffffff; - padding: 3px; - margin: 0; - font-size: 12pt; -} - -#plcount { - float: left; -} - -#pllength { - float: right; -} - -#userlist { - overflow-y: scroll; - overflow-x: hidden; - height: 347px; - float: left; - width: 150px; - border: 1px solid #aaaaaa; // [](/z13) - border-left: none; -} - -#messagebuffer { - overflow-y: scroll; - overflow-x: hidden; - height: 347px; - border: 1px solid #aaaaaa; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAa - border-left: 0; -} - -#channeldata td { - max-width: 200px; -} - -#messagebuffer div, #messagebuffer code, #filteredit code, -#channeldata td, #currenttitle { - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ -} - -#filteredit td { - max-width: 200px; -} - -.userlist_siteadmin { - color: #cc0000; - font-weight: bold; -} - -.userlist_owner { - color: #0000cc; - font-weight: bold; -} - -.userlist_op { - color: #00aa00; -} - -.userlist_guest { - color: #888888; -} - -.action { - font-style: italic; - color: #888888; -} - -.server-whisper { - font-style: italic; - color: #888888; - font-size: 8pt; -} - -.spoiler { - color: #000000; - background-color: #000000; -} - -.spoiler:hover { - color: #ffffff; -} - -.greentext { - color: #789922; /* Color value directly from 4chan */ -} - -.shout { - color: #ff0000; - font-weight: bold; - font-size: 18pt; -} - -.mono { - font-family: Monospace; -} - -.server-msg-disconnect { - border: 1px solid #ff0000; - margin: 5px; - padding: 5px; - color: #ff0000; -} - -.server-msg-reconnect { - border: 1px solid #009900; - margin: 5px; - padding: 5px; - color: #009900; -} - -.poll-notify { - color: #0000aa; - font-weight: bold; - font-size: 14pt; -} - -.option button { - margin-right: 15px; -} - -.nick-highlight { - background-color: #ddffdd; -} - -.nick-hover { - background-color: #ffff99; -} - -.drink { - margin: 10px 10px; - padding: 10px 0px; - border: 2px solid #0000cc; -} - -#drinkbar { - margin-left: 0; - background-color: #000000; - color: #ffffff; - text-align: center; -} - -#motdtext, #csstext, #jstext { - width: 100%; -} - -#csstext, #jstext { - font-family: Monospace; -} - -#queue_next, #queue_end, #library_search, #youtube_search { - width: 50%; -} - -#footer { - background-color: #f5f5f5; - height: 30px; - width: 100%; - padding: 0; -} - -#footer p { - text-align: center; - width: 100%; -} - -.timestamp { - font-size: 8pt; -} - -.profile-box { - z-index: 9999; - position: absolute; - border: 1px solid #aaaaaa; - border-radius: 5px; - background-color: #ffffff; - max-width: 200px; - padding: 5px; -} - -.user-dropdown { - z-index: 9999; - position: absolute; - border: 1px solid #aaaaaa; - border-radius: 5px; - background-color: #ffffff; - color: #000000; - max-width: 200px; - padding: 5px; -} - -.profile-image { - width: 80px; - height: 80px; - border: 1px solid #aaaaaa; - border-radius: 5px; -} - -#channelsettingswrap3 { - margin-top: 20px; -} - -#customembed_code { - font-family: Monospace; -} - -#sc_volume .ui-slider-range { - background: rgb(255, 195, 0); -} - -#sc_volume .ui-slider-handle { - border-color: rgb(255, 195, 0); -} +html, body { + height: 100%; +} + +.wrapper { + min-height: 100%; + height: auto !important; + height: 100%; + margin: 0 auto -90px; +} + +#footer, .push { + margin: 90px 0 0 0; + height: 30px; + clear: both; +} + +#welcome { + font-size: 10pt; + color: #ffffff; +} + +#usercountwrap, #userlist, #messagebuffer, #videowrap { + background-color: #ffffff; +} + +#librarywrap, #userplaylistwrap, #playlist_controls { + display: none; +} + +.videolist { + list-style: none outside none; + margin-left: 0; + max-height: 500px; + overflow-y: scroll; +} + +.qe_btn { + height: 20px; + font-family: Monospace; + padding: 0 5px 0 5px; + margin: auto; + overflow: hidden; +} + +.qe_buttons { + float: left; +} + +.qe_title { + float: left; +} + +.qe_time { + font-family: Monospace; + float: right; +} + +.qe_clear { + clear: both; +} + +#userpl_list { + list-style: none outside none; + margin-left: 0; + max-height: 500px; + overflow-y: scroll; +} + +#userpl_list li { + clear: both; + margin: 2px 0 0 auto; + padding: 2px; + font-size: 8pt; +} + +#usercountwrap, #currenttitle { + border: 1px solid #aaaaaa; + border-bottom: none; + margin: 0; +} + +#usercount { + margin: 0; +} + +.pointer { + cursor: pointer; +} + +#leftpane-inner div.span12, #rightpane-inner div.span12, +#leftpane-inner ul, #rightpane-inner ul, +#channelsettingswrap div.span12 { + margin-left: 0; +} + +#queue { + margin-bottom: 0; +} + +.queue_sortable li { + cursor: row-resize; +} + +.queue_entry { + background-color: #ffffff; + margin: 2px 0 0 auto; + padding: 2px; + font-size: 8pt; + border: 1px solid #aaaaaa; // [](/w21) +} + +.queue_temp { + background-image: url(../img/stripe-diagonal.png); +} + +.queue_active { + background-color: #d9edf7; + border-color: #bce8f1; +} + +#plmeta { + border: 1px solid #aaaaaa; + border-top: 0; + background-color: #ffffff; + padding: 3px; + margin: 0; + font-size: 12pt; +} + +#plcount { + float: left; +} + +#pllength { + float: right; +} + +#userlist { + overflow-y: scroll; + overflow-x: hidden; + height: 347px; + float: left; + width: 150px; + border: 1px solid #aaaaaa; // [](/z13) + border-left: none; +} + +#messagebuffer { + overflow-y: scroll; + overflow-x: hidden; + height: 347px; + border: 1px solid #aaaaaa; // AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAa + border-left: 0; +} + +#channeldata td { + max-width: 200px; +} + +#messagebuffer div, #messagebuffer code, #filteredit code, +#channeldata td, #currenttitle { + white-space: pre-wrap; /* css-3 */ + white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ +} + +#filteredit td { + max-width: 200px; +} + +.userlist_siteadmin { + color: #cc0000; + font-weight: bold; +} + +.userlist_owner { + color: #0000cc; + font-weight: bold; +} + +.userlist_op { + color: #00aa00; +} + +.userlist_guest { + color: #888888; +} + +.action { + font-style: italic; + color: #888888; +} + +.server-whisper { + font-style: italic; + color: #888888; + font-size: 8pt; +} + +.spoiler { + color: #000000; + background-color: #000000; +} + +.spoiler:hover { + color: #ffffff; +} + +.greentext { + color: #789922; /* Color value directly from 4chan */ +} + +.shout { + color: #ff0000; + font-weight: bold; + font-size: 18pt; +} + +.mono { + font-family: Monospace; +} + +.server-msg-disconnect { + border: 1px solid #ff0000; + margin: 5px; + padding: 5px; + color: #ff0000; +} + +.server-msg-reconnect { + border: 1px solid #009900; + margin: 5px; + padding: 5px; + color: #009900; +} + +.poll-notify { + color: #0000aa; + font-weight: bold; + font-size: 14pt; +} + +.option button { + margin-right: 15px; +} + +.nick-highlight { + background-color: #ddffdd; +} + +.nick-hover { + background-color: #ffff99; +} + +.drink { + margin: 10px 10px; + padding: 10px 0px; + border: 2px solid #0000cc; +} + +#drinkbar { + margin-left: 0; + background-color: #000000; + color: #ffffff; + text-align: center; +} + +#motdtext, #csstext, #jstext { + width: 100%; +} + +#csstext, #jstext { + font-family: Monospace; +} + +#queue_next, #queue_end, #library_search, #youtube_search { + width: 50%; +} + +#footer { + background-color: #f5f5f5; + height: 30px; + width: 100%; + padding: 0; +} + +#footer p { + text-align: center; + width: 100%; +} + +.timestamp { + font-size: 8pt; +} + +.profile-box { + z-index: 9999; + position: absolute; + border: 1px solid #aaaaaa; + border-radius: 5px; + background-color: #ffffff; + max-width: 200px; + padding: 5px; +} + +.user-dropdown { + z-index: 9999; + position: absolute; + border: 1px solid #aaaaaa; + border-radius: 5px; + background-color: #ffffff; + color: #000000; + max-width: 200px; + padding: 5px; +} + +.profile-image { + width: 80px; + height: 80px; + border: 1px solid #aaaaaa; + border-radius: 5px; +} + +#channelsettingswrap3 { + margin-top: 20px; +} + +#customembed_code { + font-family: Monospace; +} + +#sc_volume .ui-slider-range { + background: rgb(255, 195, 0); +} + +#sc_volume .ui-slider-handle { + border-color: rgb(255, 195, 0); +} diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 0b13c612..d5d13504 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -1,1118 +1,1118 @@ -/* -The MIT License (MIT) -Copyright (c) 2013 Calvin Montgomery - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -Callbacks = { - - error: function (reason) { - var d = $("
").addClass("alert alert-error span12") - .appendTo($("#announcements")); - $("

").text("Uh-oh!").appendTo(d); - $("

").html("The socket.io connection failed."+ - "Try going to the "+ - "'Options' menu and enabling 'Alternate socket "+ - " connection'. If that doesn't help, talk to "+ - "someone on IRC").appendTo(d); - var data = { - iourl: IO_URL, - weburl: WEB_URL, - transports: io.transports, - fallback: USEROPTS.altsocket, - reason: reason - }; - - var r = JSON.stringify(data); - $("").text("When asking for help, give the following "+ - "information to an administrator:").appendTo(d); - $("").text(r).appendTo(d) - .css("white-space", "pre-wrap"); - }, - - /* fired when socket connection completes */ - connect: function() { - socket.emit("joinChannel", { - name: CHANNEL.name - }); - if(NAME && SESSION) { - socket.emit("login", { - name: NAME, - session: SESSION - }); - } - // Guest auto-relogin - else if(CLIENT.name) { - socket.emit("login", { - name: CLIENT.name - }); - } - $("

").addClass("server-msg-reconnect") - .text("Connected") - .appendTo($("#messagebuffer")); - $("#messagebuffer").scrollTop($("#messagebuffer").prop("scrollHeight")); - }, - - disconnect: function() { - if(KICKED) - return; - $("
") - .addClass("server-msg-disconnect") - .text("Disconnected from server. Attempting reconnection...") - .appendTo($("#messagebuffer")); - scrollChat(); - }, - - errorMsg: function(data) { - alert(data.msg); - }, - - announcement: function(data) { - $("#announcements").html(""); - makeAlert(data.title, data.text) - .appendTo($("#announcements")); - }, - - kick: function(data) { - KICKED = true; - $("
").addClass("server-msg-disconnect") - .text("Kicked: " + data.reason) - .appendTo($("#messagebuffer")); - scrollChat(); - }, - - noflood: function(data) { - $("
") - .addClass("server-msg-disconnect") - .text(data.action + ": " + data.msg) - .appendTo($("#messagebuffer")); - scrollChat(); - }, - - channelNotRegistered: function() { - var div = $("
").addClass("alert alert-info") - .attr("id", "chregnotice") - .insertBefore($("#main")); - $("