Skip to content

V2.97a.20170601+dev, shuffle function added for bar-ui demo #262

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

Open
lekonell wants to merge 2 commits into
base: V2.97a.20170601+DEV
Choose a base branch
from
Open

V2.97a.20170601+dev, shuffle function added for bar-ui demo #262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8af4f
shuffle function added
lekonell Mar 22, 2021
2b47984
Merge branch 'V2.97a.20170601+DEV' of https://github.com/lekonell/Sou…
lekonell Mar 22, 2021
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
42 changes: 37 additions & 5 deletions demo/bar-ui/script/bar-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,10 @@
// list of nodes?
playlist: [],

// NOTE: not implemented yet.
// shuffledIndex: [],
// shuffleMode: false,
shuffledIndex: [],
shuffleMode: false,
shuffleProgress: 0,
firstplayed: false,

// selection
selectedIndex: 0,
Expand All @@ -401,6 +402,28 @@

};

function setShuffleList(key = null) {
data.shuffledIndex = [];
data.shuffleProgress = 0;

var tmpIndex = [];

for (var i = 0; i < data.playlist.length; i++) {
tmpIndex[i] = i;
}

if (key) {
data.shuffledIndex[0] = key;
tmpIndex.splice(key, 1);
}

for (var i = 1; i < data.playlist.length; i++) {
var k = Math.floor(Math.random() * tmpIndex.length);
data.shuffledIndex[i] = tmpIndex[k];
tmpIndex.splice(k, 1);
}
}

function getPlaylist() {

return data.playlist;
Expand Down Expand Up @@ -647,6 +670,7 @@
return {
data: data,
refresh: refreshDOM,
setShuffleList: setShuffleList,
getNext: getNext,
getPrevious: getPrevious,
getItem: getItem,
Expand Down Expand Up @@ -1078,13 +1102,21 @@

shuffle: function(e) {

// NOTE: not implemented yet.

var target = (e ? e.target || e.srcElement : utils.dom.get(dom.o, '.shuffle'));

if (target && !utils.css.has(target, css.disabled)) {
utils.css.toggle(target.parentNode, css.active);
playlistController.data.shuffleMode = !playlistController.data.shuffleMode;

if (playlistController.data.shuffleMode) {
if (playlistController.data.firstplayed) {
playlistController.setShuffleList(playlistController.data.selectedIndex);
}
else {
playlistController.setShuffleList();
playlistController.playlistController.playItemByOffset(playlistController.data.shuffledIndex[playlistController.data.shuffleProgress]);
}
}
}

},
Expand Down