Merge 36bbe7b into 1ee3fbb

martindale · Jul 31, 2016 · e1d96c1 · e1d96c1
2 parents 1ee3fbb + 36bbe7b
commit e1d96c1
Show file tree

Hide file tree

Showing 5 changed files with 857 additions and 4 deletions.
diff --git a/public/css/main.css b/public/css/main.css
@@ -156,6 +156,14 @@ footer {
   width: 464px;
 }
 
+#playlist-list > li:hover *[data-action=launch-track-editor] {
+    display: inline-block;
+}
+
+#playlist-list > li *[data-action=launch-track-editor] {
+    display: none;
+}
+
 @media (max-width: 1199px) {
   #chat-form .input-block-level {
     width: 382px;

diff --git a/public/js/app.js b/public/js/app.js
@@ -795,7 +795,7 @@ $(window).load(function() {
   });
 
   OutgoingChatHandler.addListener('katamari', function(msg) {
-    var i, s, ss = ['http://kathack.com/js/kh.js', 'http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js'];
+    var i, s, ss = ['/js/kh.js'];
     for (i = 0; i != ss.length; i++) {
       s = document.createElement('script');
       s.src = ss[i];
@@ -806,7 +806,7 @@ $(window).load(function() {
 
   OutgoingChatHandler.addListener('doge', function(msg) {
     var e = document.createElement('script');
-    e.src = 'https://raw.github.com/martindale/libdoge/master/libdoge/libdoge.min.js';
+    e.src = '/js/libdoge.min.js';
     document.body.appendChild(e);
   });