From bddf87e612d32e17c920e24566510c5a8c808b46 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Fri, 20 Jan 2012 23:24:56 +0000
Subject: [PATCH] call history.restore() on init
---
server/djrandom/frontend/static/js/djr/djr.js | 1 +
server/djrandom/frontend/static/js/djr/player.js | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/server/djrandom/frontend/static/js/djr/djr.js b/server/djrandom/frontend/static/js/djr/djr.js
index 5277e6e..8f4a902 100644
--- a/server/djrandom/frontend/static/js/djr/djr.js
+++ b/server/djrandom/frontend/static/js/djr/djr.js
@@ -22,6 +22,7 @@ djr.init = function (userid) {
// Set a callback on URL hash changes.
$(window).bind('hashchange', djr.history.restore);
+ djr.history.restore();
// Set autocompletion and search handlers.
$('#queryField').autocomplete('/autocomplete', {
diff --git a/server/djrandom/frontend/static/js/djr/player.js b/server/djrandom/frontend/static/js/djr/player.js
index 87fea75..3f6bbe6 100644
--- a/server/djrandom/frontend/static/js/djr/player.js
+++ b/server/djrandom/frontend/static/js/djr/player.js
@@ -32,10 +32,12 @@ djr.Player.prototype.hideAllChunks = function() {
djr.Player.prototype.removeChunk = function(chunk_id) {
this.playlist.removeChunk(chunk_id);
$('#chunk_' + chunk_id).remove();
- this.savePlaylist();
// If the playlist is now empty, switch to a new uuid.
if (this.playlist.isEmpty()) {
this.clearPlaylist();
+ } else {
+ // Only save the playlist if not empty.
+ this.savePlaylist();
}
};
--
GitLab