mirror of
https://github.com/captbaritone/webamp.git
synced 2026-07-20 16:49:52 +00:00
Upgrade Prettier
This commit is contained in:
parent
a1541b59d6
commit
972689c448
6 changed files with 27 additions and 11 deletions
|
|
@ -81,7 +81,9 @@ const loadQueue = new LoadQueue({ threads: 4 });
|
|||
|
||||
function playRandomTrack() {
|
||||
return (dispatch, getState) => {
|
||||
const { playlist: { trackOrder, currentTrack } } = getState();
|
||||
const {
|
||||
playlist: { trackOrder, currentTrack }
|
||||
} = getState();
|
||||
if (trackOrder.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -548,7 +550,9 @@ export function cropPlaylist() {
|
|||
if (getSelectedTrackObjects(state).length === 0) {
|
||||
return;
|
||||
}
|
||||
const { playlist: { tracks } } = getState();
|
||||
const {
|
||||
playlist: { tracks }
|
||||
} = getState();
|
||||
dispatch({
|
||||
type: REMOVE_TRACKS,
|
||||
ids: Object.keys(tracks).filter(id => !tracks[id].selected)
|
||||
|
|
@ -558,7 +562,9 @@ export function cropPlaylist() {
|
|||
|
||||
export function removeSelectedTracks() {
|
||||
return (dispatch, getState) => {
|
||||
const { playlist: { tracks } } = getState();
|
||||
const {
|
||||
playlist: { tracks }
|
||||
} = getState();
|
||||
dispatch({
|
||||
type: REMOVE_TRACKS,
|
||||
ids: Object.keys(tracks).filter(id => tracks[id].selected)
|
||||
|
|
@ -652,7 +658,9 @@ function findLastIndex(arr, cb) {
|
|||
|
||||
export function dragSelected(offset) {
|
||||
return (dispatch, getState) => {
|
||||
const { playlist: { trackOrder, tracks } } = getState();
|
||||
const {
|
||||
playlist: { trackOrder, tracks }
|
||||
} = getState();
|
||||
const firstSelected = trackOrder.findIndex(
|
||||
trackId => tracks[trackId] && tracks[trackId].selected
|
||||
);
|
||||
|
|
|
|||
|
|
@ -59,7 +59,10 @@ class TrackCell extends React.Component {
|
|||
}
|
||||
|
||||
const mapStateToProps = (state, ownProps) => {
|
||||
const { display: { skinPlaylistStyle }, playlist: { tracks } } = state;
|
||||
const {
|
||||
display: { skinPlaylistStyle },
|
||||
playlist: { tracks }
|
||||
} = state;
|
||||
const current = getCurrentTrackId(state) === ownProps.id;
|
||||
const track = tracks[ownProps.id];
|
||||
return { skinPlaylistStyle, selected: track.selected, current };
|
||||
|
|
|
|||
|
|
@ -22,7 +22,9 @@ import { next as nextTrack } from "./actionCreators";
|
|||
import { getCurrentTrackId } from "./selectors";
|
||||
|
||||
export default media => store => {
|
||||
const { media: { volume, balance } } = store.getState();
|
||||
const {
|
||||
media: { volume, balance }
|
||||
} = store.getState();
|
||||
|
||||
// Ensure the default state is the canonical value.
|
||||
media.setVolume(volume);
|
||||
|
|
|
|||
|
|
@ -86,7 +86,10 @@ export const getCurrentTrackNumber = createSelector(
|
|||
export const getCurrentTrackId = state => state.playlist.currentTrack;
|
||||
|
||||
export const nextTrack = (state, n = 1) => {
|
||||
const { playlist: { trackOrder }, media: { repeat } } = state;
|
||||
const {
|
||||
playlist: { trackOrder },
|
||||
media: { repeat }
|
||||
} = state;
|
||||
const trackCount = getTrackCount(state);
|
||||
if (trackCount === 0) {
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@
|
|||
"invariant": "^2.2.3",
|
||||
"jsmediatags": "^3.8.1",
|
||||
"jszip": "^3.1.3",
|
||||
"prettier": "^1.10.2",
|
||||
"prettier": "^1.12.1",
|
||||
"prop-types": "^15.5.10",
|
||||
"raven-for-redux": "^1.3.1",
|
||||
"raven-js": "^3.19.1",
|
||||
|
|
|
|||
|
|
@ -5642,9 +5642,9 @@ preserve@^0.2.0:
|
|||
version "0.2.0"
|
||||
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
|
||||
|
||||
prettier@^1.10.2:
|
||||
version "1.10.2"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93"
|
||||
prettier@^1.12.1:
|
||||
version "1.12.1"
|
||||
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
|
||||
|
||||
pretty-bytes@^4.0.2:
|
||||
version "4.0.2"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue