From d01d558ed6a9c91cbd38365eb2fd5facd3f2df37 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 12 Jul 2016 23:04:07 -0700
Subject: [PATCH] Fill in incomplete CSEmoteList changes

---
 www/js/util.js | 101 ++++++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 47 deletions(-)

diff --git a/www/js/util.js b/www/js/util.js
index 71232181..11ca1072 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -3014,53 +3014,6 @@ function onEmoteClicked(emote) {
 window.EMOTELIST = new EmoteList("#emotelist", onEmoteClicked);
 window.EMOTELIST.sortAlphabetical = USEROPTS.emotelist_sort;
 
-function showChannelSettings() {
-    hidePlayer();
-    $("#channeloptions").on("hidden.bs.modal", function () {
-        unhidePlayer();
-    });
-
-    $("#channeloptions").modal();
-}
-
-// There is a point where this file needed to stop and we have clearly passed
-// it but let's keep going and see what happens
-
-function startQueueSpinner(data) {
-    if ($("#queueprogress").length > 0) {
-        return;
-    }
-
-    var id = data.id;
-    if (data.type === "yp") {
-        id = "$any";
-    }
-
-    var progress = $("<div/>").addClass("progress").attr("id", "queueprogress")
-            .data("queue-id", id);
-    var progressBar = $("<div/>").addClass("progress-bar progress-bar-striped active")
-            .attr({
-                role: "progressbar",
-                "aria-valuenow": "100",
-                "aria-valuemin": "0",
-                "aria-valuemax": "100",
-            }).css({
-                width: "100%"
-            }).appendTo(progress);
-    progress.appendTo($("#addfromurl"));
-}
-
-function stopQueueSpinner(data) {
-    var shouldRemove = (data !== null &&
-                        typeof data === 'object' &&
-                        $("#queueprogress").data("queue-id") === data.id);
-    shouldRemove = shouldRemove || data === null;
-    shouldRemove = shouldRemove || $("#queueprogress").data("queue-id") === "$any";
-    if (shouldRemove) {
-        $("#queueprogress").remove();
-    }
-}
-
 function CSEmoteList(selector) {
     EmoteList.call(this, selector);
 }
@@ -3077,6 +3030,7 @@ CSEmoteList.prototype.loadPage = function (page) {
     }
     var end = Math.min(start + this.itemsPerPage, this.emotes.length);
     var self = this;
+    this.page = page;
 
     for (var i = start; i < end; i++) {
         var row = document.createElement("tr");
@@ -3093,6 +3047,12 @@ CSEmoteList.prototype.loadPage = function (page) {
             tdDelete.appendChild(btnDelete);
             row.appendChild(tdDelete);
 
+            btnDelete.onclick = function deleteEmote() {
+                document.getElementById("cs-emotes-newname").value = emote.name;
+                document.getElementById("cs-emotes-newimage").value = emote.image;
+                socket.emit("removeEmote", emote);
+            };
+
             // Add emote name
             // TODO: editable
             var tdName = document.createElement("td");
@@ -3152,3 +3112,50 @@ CSEmoteList.prototype.loadPage = function (page) {
 
 window.CSEMOTELIST = new CSEmoteList("#cs-emotes");
 window.CSEMOTELIST.sortAlphabetical = USEROPTS.emotelist_sort;
+
+function showChannelSettings() {
+    hidePlayer();
+    $("#channeloptions").on("hidden.bs.modal", function () {
+        unhidePlayer();
+    });
+
+    $("#channeloptions").modal();
+}
+
+// There is a point where this file needed to stop and we have clearly passed
+// it but let's keep going and see what happens
+
+function startQueueSpinner(data) {
+    if ($("#queueprogress").length > 0) {
+        return;
+    }
+
+    var id = data.id;
+    if (data.type === "yp") {
+        id = "$any";
+    }
+
+    var progress = $("<div/>").addClass("progress").attr("id", "queueprogress")
+            .data("queue-id", id);
+    var progressBar = $("<div/>").addClass("progress-bar progress-bar-striped active")
+            .attr({
+                role: "progressbar",
+                "aria-valuenow": "100",
+                "aria-valuemin": "0",
+                "aria-valuemax": "100",
+            }).css({
+                width: "100%"
+            }).appendTo(progress);
+    progress.appendTo($("#addfromurl"));
+}
+
+function stopQueueSpinner(data) {
+    var shouldRemove = (data !== null &&
+                        typeof data === 'object' &&
+                        $("#queueprogress").data("queue-id") === data.id);
+    shouldRemove = shouldRemove || data === null;
+    shouldRemove = shouldRemove || $("#queueprogress").data("queue-id") === "$any";
+    if (shouldRemove) {
+        $("#queueprogress").remove();
+    }
+}