Fix polls, MOTD/CSS/JS text

channel.js

@@ -1446,7 +1446,7 @@ Channel.prototype.tryVote = function(user, data) {
     if(!this.hasPermission(user, "pollvote")) {
         return;
     }
-    if(data.option == undefined) {
+    if(typeof data.option !== "number") {
         return;
     }
 

www/assets/js/callbacks.js

@@ -99,7 +99,9 @@ Callbacks = {
     },
 
     setMotd: function(data) {
+        CHANNEL.motd = data.html;
         $("#motd").html(data.html);
+        $("#motdtext").val(CHANNEL.motd);
         if(data.motd != "")
             $("#motd").show();
         else
@@ -336,6 +338,9 @@ Callbacks = {
         $("#chancss").remove();
         $("#chanjs").remove();
 
+        CHANNEL.css = data.css;
+        CHANNEL.js = data.js;
+
         $("#csstext").val(data.css);
         $("#jstext").val(data.js);
 
@@ -811,6 +816,7 @@ Callbacks = {
         for(var i = 0; i < data.options.length; i++) {
             (function(i) {
             var callback = function() {
+                    console.log("vote", i);
                     socket.emit("vote", {
                         option: i
                     });
@@ -830,7 +836,7 @@ Callbacks = {
     },
 
     updatePoll: function(data) {
-        var poll = $("#pollcontainer .active");
+        var poll = $("#pollwrap .active");
         var i = 0;
         poll.find(".option button").each(function() {
             $(this).text(data.counts[i]);

www/assets/js/data.js

@@ -9,119 +9,122 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 */
 
-var CL_VERSION = "2.0.0";
+var CL_VERSION = "2.0.0";
-
+
-var CLIENT = {
+var CLIENT = {
-    rank: -1,
+    rank: -1,
-    leader: false,
+    leader: false,
-    name: "",
+    name: "",
-    logged_in: false,
+    logged_in: false,
-    profile: {
+    profile: {
-        image: "",
+        image: "",
-        text: ""
+        text: ""
-    }
+    }
-};
+};
-
+
-var CHANNEL = {
+var CHANNEL = {
-    opts: {},
+    opts: {},
-    openqueue: false,
+    openqueue: false,
-    perms: {},
+    perms: {},
-    name: false // TODO load name from URL
+    css: "",
-};
+    js: "",
-
+    motd: "",
-var PLAYER = false;
+    name: false
-var FLUIDLAYOUT = false;
+};
-var VWIDTH = $("#ytapiplayer").parent().css("width").replace("px", "");
+
-var VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
+var PLAYER = false;
-var POSITION = -1;
+var FLUIDLAYOUT = false;
-var socket = {
+var VWIDTH = $("#ytapiplayer").parent().css("width").replace("px", "");
-    emit: function() {
+var VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
-        console.log("socket not initialized");
+var POSITION = -1;
-        console.log(arguments);
+var socket = {
-    }
+    emit: function() {
-};
+        console.log("socket not initialized");
-var IGNORED = [];
+        console.log(arguments);
-var CHATHIST = [];
+    }
-var CHATHISTIDX = 0;
+};
-var SCROLLCHAT = true;
+var IGNORED = [];
-var LASTCHATNAME = "";
+var CHATHIST = [];
-var LASTCHATTIME = 0;
+var CHATHISTIDX = 0;
-var FOCUSED = true;
+var SCROLLCHAT = true;
-var PAGETITLE = "CyTube";
+var LASTCHATNAME = "";
-var TITLE_BLINK;
+var LASTCHATTIME = 0;
-var KICKED = false;
+var FOCUSED = true;
-var NAME = readCookie("cytube_uname");
+var PAGETITLE = "CyTube";
-var SESSION = readCookie("cytube_session");
+var TITLE_BLINK;
-var LEADTMR = false;
+var KICKED = false;
-var PL_FROM = 0;
+var NAME = readCookie("cytube_uname");
-var PL_TO = 0;
+var SESSION = readCookie("cytube_session");
-var FILTER_FROM = 0;
+var LEADTMR = false;
-var FILTER_TO = 0;
+var PL_FROM = 0;
-
+var PL_TO = 0;
-function getOrDefault(k, def) {
+var FILTER_FROM = 0;
-    var v = localStorage.getItem(k);
+var FILTER_TO = 0;
-    if(v === null)
+
-        return def;
+function getOrDefault(k, def) {
-    if(v === "true")
+    var v = localStorage.getItem(k);
-        return true;
+    if(v === null)
-    if(v === "false")
+        return def;
-        return false;
+    if(v === "true")
-    if(v.match(/^[0-9]+$/))
+        return true;
-        return parseInt(v);
+    if(v === "false")
-    if(v.match(/^[0-9\.]+$/))
+        return false;
-        return parseFloat(v);
+    if(v.match(/^[0-9]+$/))
-    return v;
+        return parseInt(v);
-}
+    if(v.match(/^[0-9\.]+$/))
-
+        return parseFloat(v);
-var USEROPTS = {
+    return v;
-    theme           : getOrDefault("theme", "default"),
+}
-    css             : getOrDefault("css", ""),
+
-    layout          : getOrDefault("layout", "default"),
+var USEROPTS = {
-    synch           : getOrDefault("synch", true),
+    theme           : getOrDefault("theme", "default"),
-    hidevid         : getOrDefault("hidevid", false),
+    css             : getOrDefault("css", ""),
-    show_timestamps : getOrDefault("show_timestamps", true),
+    layout          : getOrDefault("layout", "default"),
-    modhat          : getOrDefault("modhat", false),
+    synch           : getOrDefault("synch", true),
-    blink_title     : getOrDefault("blink_title", false),
+    hidevid         : getOrDefault("hidevid", false),
-    sync_accuracy   : getOrDefault("sync_accuracy", 2),
+    show_timestamps : getOrDefault("show_timestamps", true),
-    chatbtn         : getOrDefault("chatbtn", false),
+    modhat          : getOrDefault("modhat", false),
-    altsocket       : getOrDefault("altsocket", false),
+    blink_title     : getOrDefault("blink_title", false),
-    joinmessage     : getOrDefault("joinmessage", true)
+    sync_accuracy   : getOrDefault("sync_accuracy", 2),
-};
+    chatbtn         : getOrDefault("chatbtn", false),
-
+    altsocket       : getOrDefault("altsocket", false),
-var Rank = {
+    joinmessage     : getOrDefault("joinmessage", true)
-    Guest: 0,
+};
-    Member: 1,
+
-    Leader: 1.5,
+var Rank = {
-    Moderator: 2,
+    Guest: 0,
-    Admin: 3,
+    Member: 1,
-    Owner: 10,
+    Leader: 1.5,
-    Siteadmin: 255
+    Moderator: 2,
-};
+    Admin: 3,
-
+    Owner: 10,
-function createCookie(name,value,days) {
+    Siteadmin: 255
-    if (days) {
+};
-        var date = new Date();
+
-        date.setTime(date.getTime()+(days*24*60*60*1000));
+function createCookie(name,value,days) {
-        var expires = "; expires="+date.toGMTString();
+    if (days) {
-    }
+        var date = new Date();
-    else var expires = "";
+        date.setTime(date.getTime()+(days*24*60*60*1000));
-    document.cookie = name+"="+value+expires+"; path=/";
+        var expires = "; expires="+date.toGMTString();
-}
+    }
-
+    else var expires = "";
-function readCookie(name) {
+    document.cookie = name+"="+value+expires+"; path=/";
-    var nameEQ = name + "=";
+}
-    var ca = document.cookie.split(";");
+
-    for(var i=0;i < ca.length;i++) {
+function readCookie(name) {
-        var c = ca[i];
+    var nameEQ = name + "=";
-        while (c.charAt(0)==" ") c = c.substring(1,c.length);
+    var ca = document.cookie.split(";");
-        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+    for(var i=0;i < ca.length;i++) {
-    }
+        var c = ca[i];
-    return null;
+        while (c.charAt(0)==" ") c = c.substring(1,c.length);
-}
+        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
-
+    }
-function eraseCookie(name) {
+    return null;
-    createCookie(name,"",-1);
+}
-}
+
-
+function eraseCookie(name) {
-/* to be implemented in callbacks.js */
+    createCookie(name,"",-1);
-function setupCallbacks() { }
+}
+
+/* to be implemented in callbacks.js */
+function setupCallbacks() { }

www/assets/js/util.js

@@ -65,7 +65,6 @@ function formatUserlistItem(div, data) {
     name.addClass(getNameColor(data.rank));
     div.find(".profile-box").remove();
 
-    // TODO might remove this
     var profile;
     name.mouseenter(function(ev) {
         profile = $("<div/>")
@@ -681,6 +680,9 @@ function handlePermissionChange() {
             $("#opt_enable_link_regex").prop("checked", CHANNEL.opts.enable_link_regex);
             $("#opt_allow_voteskip").prop("checked", CHANNEL.opts.allow_voteskip);
             $("#opt_voteskip_ratio").val(CHANNEL.opts.voteskip_ratio);
+            $("#csstext").val(CHANNEL.css);
+            $("#jstext").val(CHANNEL.js);
+            $("#motdtext").val(CHANNEL.motd);
             setVisible("#permedit_tab", CLIENT.rank >= 3);
             setVisible("#banlist_tab", hasPermission("ban"));
             setVisible("#motdedit_tab", hasPermission("motdedit"));