Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-22 09:37:17 +00:00
Code Issues Projects Releases Wiki Activity

Don't autoplay on playlist drop. Fixes #435

Browse source
This commit is contained in:
Jordan Eldredge 2018-01-01 19:28:39 -08:00
parent 00ecdf384e
commit bf4c955f59
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/actionCreators.js
View file

@ -171,10 +171,10 @@ function setEqFromFile(file) {
};
}
function addTracksFromReferences(fileReferences, atIndex) {
function addTracksFromReferences(fileReferences, autoPlay, atIndex) {
return dispatch => {
Array.from(fileReferences).forEach((file, i) => {
const priority = i === 0 ? "PLAY" : "NONE";
const priority = i === 0 && autoPlay ? "PLAY" : "NONE";
const id = uniqueId();
const url = URL.createObjectURL(file);
dispatch(_addTrackFromUrl(url, file.name, id, priority, atIndex + i));
@ -185,7 +185,11 @@ function addTracksFromReferences(fileReferences, atIndex) {
const SKIN_FILENAME_MATCHER = new RegExp("(wsz|zip)$", "i");
const EQF_FILENAME_MATCHER = new RegExp("eqf$", "i");
export function loadFilesFromReferences(fileReferences, atIndex = null) {
export function loadFilesFromReferences(
fileReferences,
autoPlay = true,
atIndex = null
) {
return dispatch => {
if (fileReferences.length < 1) {
return;
@ -201,7 +205,7 @@ export function loadFilesFromReferences(fileReferences, atIndex = null) {
return;
}
}
dispatch(addTracksFromReferences(fileReferences, atIndex));
dispatch(addTracksFromReferences(fileReferences, autoPlay, atIndex));
};
}

2
js/components/PlaylistWindow/index.js
View file

@ -175,7 +175,7 @@ const mapDispatchToProps = (dispatch, ownProps) => ({
scrollUpFourTracks: () => dispatch(scrollUpFourTracks()),
scrollDownFourTracks: () => dispatch(scrollDownFourTracks()),
loadFilesFromReferences: (e, startIndex) =>
dispatch(loadFilesFromReferences(e.dataTransfer.files, startIndex))
dispatch(loadFilesFromReferences(e.dataTransfer.files, false, startIndex))
});
const mapStateToProps = state => {