Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add insert and replace methods #157

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add insert and replace methods #157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afd1dea
Don't block playlist remove for animations
pdf Apr 2, 2013
03eabe3
Add insert and replace methods
pdf Apr 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 89 additions & 44 deletions add-on/jplayer.playlist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,14 @@
});
},
_initPlaylist: function(playlist) {
var self = this;
this.current = 0;
this.shuffled = false;
this.removing = false;
this.original = $.extend(true, [], playlist); // Copy the Array of Objects
$.each(this.original, function(i){
self.original[i]._element = self._createListItem(this);
});
this._originalPlaylist();
},
_originalPlaylist: function() {
Expand All @@ -208,7 +212,7 @@
if(instant && !$.isFunction(instant)) {
$(this.cssSelector.playlist + " ul").empty();
$.each(this.playlist, function(i) {
$(self.cssSelector.playlist + " ul").append(self._createListItem(self.playlist[i]));
$(self.cssSelector.playlist + " ul").append(self.playlist[i]._element);
});
this._updateControls();
} else {
Expand All @@ -219,7 +223,7 @@
$(this).empty();

$.each(self.playlist, function(i) {
$this.append(self._createListItem(self.playlist[i]));
$this.append(self.playlist[i]._element);
});
self._updateControls();
if($.isFunction(instant)) {
Expand Down Expand Up @@ -263,7 +267,7 @@
listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.itemClass + "' tabindex='1'>" + media.title + (media.artist ? " <span class='jp-artist'>by " + media.artist + "</span>" : "") + "</a>";
listItem += "</div></li>";

return listItem;
return $(listItem);
},
_createItemHandlers: function() {
var self = this;
Expand Down Expand Up @@ -311,7 +315,7 @@
_highlight: function(index) {
if(this.playlist.length && index !== undefined) {
$(this.cssSelector.playlist + " .jp-playlist-current").removeClass("jp-playlist-current");
$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current");
this.playlist[index]._element.addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current");
$(this.cssSelector.title + " li").html(this.playlist[index].title + (this.playlist[index].artist ? " <span class='jp-artist'>by " + this.playlist[index].artist + "</span>" : ""));
}
},
Expand All @@ -320,7 +324,10 @@
this._init();
},
add: function(media, playNow) {
$(this.cssSelector.playlist + " ul").append(this._createListItem(media)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);
el = this._createListItem(media);
$(this.cssSelector.playlist + " ul").append(el);
el.hide().slideDown(this.options.playlistOptions.addTime);
media._element = el;
this._updateControls();
this.original.push(media);
this.playlist.push(media); // Both array elements share the same object pointer. Comforms with _initPlaylist(p) system.
Expand All @@ -343,51 +350,89 @@
});
return true;
} else {
index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array.
if(0 <= index && index < this.playlist.length) {
this.playlist[index]._element.slideUp(this.options.playlistOptions.removeTime, function() {
this.remove();
});

if(this.removing) {
return false;
} else {
index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array.
if(0 <= index && index < this.playlist.length) {
this.removing = true;

$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").slideUp(this.options.playlistOptions.removeTime, function() {
$(this).remove();

if(self.shuffled) {
var item = self.playlist[index];
$.each(self.original, function(i) {
if(self.original[i] === item) {
self.original.splice(i, 1);
return false; // Exit $.each
}
});
self.playlist.splice(index, 1);
} else {
self.original.splice(index, 1);
self.playlist.splice(index, 1);
}

if(self.original.length) {
if(index === self.current) {
self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed
self.select(self.current);
} else if(index < self.current) {
self.current--;
}
} else {
$(self.cssSelector.jPlayer).jPlayer("clearMedia");
self.current = 0;
self.shuffled = false;
self._updateControls();
if(self.shuffled) {
var item = self.playlist[index];
$.each(self.original, function(i) {
if(self.original[i] === item) {
self.original.splice(i, 1);
return false; // Exit $.each
}

self.removing = false;
});
self.playlist.splice(index, 1);
} else {
self.original.splice(index, 1);
self.playlist.splice(index, 1);
}
return true;

if(self.original.length) {
if(index === self.current) {
self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed
self.select(self.current);
} else if(index < self.current) {
self.current--;
}
} else {
$(self.cssSelector.jPlayer).jPlayer("clearMedia");
self.current = 0;
self.shuffled = false;
self._updateControls();
}
}
return true;
}
},
insert: function(index, media, playNow) {
var self = this;

if(this.playlist.length == 0) {
return this.add(media, playNow)
} else if(index === undefined) {
return true;
}

index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
if(0 <= index && index < this.playlist.length) {
el = $(this._createListItem(media));
this.playlist[index]._element.before(el);
el.hide().slideDown(this.options.playlistOptions.addTime);
media._element = el;
this._updateControls();

if(this.shuffled) {
var item = this.playlist[index];
$.each(this.original, function(i) {
if(self.original[i] === item) {
self.original.splice(i, 0, media);
return false; // Exit $.each
}
});
this.playlist.splice(index, 0, media);
} else {
this.original.splice(index, 0, media);
this.playlist.splice(index, 0, media);
}
}
return true;
},
replace: function(index, media, playNow) {
if(index === undefined) {
return true;
} else if (!this.insert(index, media, playNow)) {
return false;
}
removed = this.remove(index + 1);
if(removed) {
if(this.current == index) {
this.select(index);
}
}
return removed;
},
select: function(index) {
index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
Expand Down