rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflict

Browse source
This commit is contained in:
calzoneman 2013-08-08 18:28:10 -04:00
commit 4f6d72d6d5
6 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
www/assets/js/ui.js
View file

@ -346,7 +346,7 @@ $("#customembed_btn").click(function () {
$("#getplaylist").click(function() {
var callback = function(data) {
PLAYER.hide();
hidePlayer();
socket.listeners("playlist").splice(
socket.listeners("playlist").indexOf(callback)
);
@ -374,7 +374,7 @@ $("#getplaylist").click(function() {
$("<div/>").addClass("modal-footer").appendTo(modal);
modal.on("hidden", function() {
modal.remove();
PLAYER.unhide();
unhidePlayer();
});
modal.modal();
}