Skip to content

Commit

Permalink
5.1.1: Landscape layout responsive design & registerMiddleware() API
Browse files Browse the repository at this point in the history
  • Loading branch information
kirainmoe committed Aug 19, 2017
1 parent 04b0130 commit 3b801da
Show file tree
Hide file tree
Showing 11 changed files with 6,262 additions and 6,210 deletions.
88 changes: 44 additions & 44 deletions cfg/base.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
'use strict';
const webpack = require('webpack');
const path = require('path');
const defaultSettings = require('./defaults');

// Additional npm or bower modules to include in builds
// Add all foreign plugins you may need into this array
// @example:
// let npmBase = path.join(__dirname, '../node_modules');
// let additionalPaths = [ path.join(npmBase, 'react-bootstrap') ];
const additionalPaths = [];

module.exports = {
devtool: 'eval',
output: {
path: path.join(__dirname, '/../dist/assets'),
filename: 'muse-player.js',
library: 'MuseDOM',
libraryTarget: 'umd',
umdNamedDefine: true,
publicPath: defaultSettings.publicPath
},
devServer: {
contentBase: './src/',
historyApiFallback: true,
hot: true,
port: defaultSettings.port,
publicPath: defaultSettings.publicPath,
noInfo: false
},
resolve: {
extensions: ['.js', '.jsx'],
alias: {
actions: `${defaultSettings.srcPath}/actions/`,
components: `${defaultSettings.srcPath}/components/`,
sources: `${defaultSettings.srcPath}/sources/`,
stores: `${defaultSettings.srcPath}/stores/`,
styles: `${defaultSettings.srcPath}/styles/`,
config: `${defaultSettings.srcPath}/config/` + process.env.REACT_WEBPACK_ENV,
'react/lib/ReactMount': 'react-dom/lib/ReactMount'
}
},
module: {}
};
'use strict';
const webpack = require('webpack');
const path = require('path');
const defaultSettings = require('./defaults');

// Additional npm or bower modules to include in builds
// Add all foreign plugins you may need into this array
// @example:
// let npmBase = path.join(__dirname, '../node_modules');
// let additionalPaths = [ path.join(npmBase, 'react-bootstrap') ];
const additionalPaths = [];

module.exports = {
devtool: 'eval',
output: {
path: path.join(__dirname, '/../dist/assets'),
filename: 'muse-player.js',
library: 'MuseDOM',
libraryTarget: 'umd',
umdNamedDefine: true,
publicPath: defaultSettings.publicPath
},
devServer: {
contentBase: './src/',
historyApiFallback: true,
hot: true,
port: defaultSettings.port,
publicPath: defaultSettings.publicPath,
noInfo: false
},
resolve: {
extensions: ['.js', '.jsx'],
alias: {
actions: `${defaultSettings.srcPath}/actions/`,
components: `${defaultSettings.srcPath}/components/`,
sources: `${defaultSettings.srcPath}/sources/`,
stores: `${defaultSettings.srcPath}/stores/`,
styles: `${defaultSettings.srcPath}/styles/`,
config: `${defaultSettings.srcPath}/config/` + process.env.REACT_WEBPACK_ENV,
'react/lib/ReactMount': 'react-dom/lib/ReactMount'
}
},
module: {}
};
2 changes: 1 addition & 1 deletion dist/assets/muse-player.js

Large diffs are not rendered by default.

168 changes: 84 additions & 84 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,84 +1,84 @@
{
"name": "muse-player",
"version": "5.1.0",
"description": "Just a simple and dilligent HTML5 Audio Player written in React.",
"main": "dist/assets/muse-player.js",
"scripts": {
"start": "node server.js --env=dev",
"test": "karma start",
"test:watch": "karma start --autoWatch=true --singleRun=false",
"posttest": "npm run lint",
"serve": "node server.js --env=dev",
"serve:dist": "node server.js --env=dist",
"dist": "npm run copy & webpack --env=dist",
"lint": "eslint ./src",
"copy": "copyfiles -f ./src/index.html ./src/favicon.ico ./dist",
"clean": "rimraf dist/*",
"release:major": "npm version major && npm publish && git push --follow-tags",
"release:minor": "npm version minor && npm publish && git push --follow-tags",
"release:patch": "npm version patch && npm publish && git push --follow-tags"
},
"repository": "https://github.com/moefront/muse",
"keywords": [
"audio player",
"HTML5",
"lyric",
"muse",
"ymplayer",
"redux",
"react"
],
"author": "MoeFront Studio",
"organization": "MoeFront Studio",
"license": "MIT",
"devDependencies": {
"babel-core": "^6.0.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.1",
"babel-polyfill": "^6.3.14",
"babel-preset-es2015": "^6.0.15",
"babel-preset-react": "^6.0.15",
"babel-preset-stage-0": "^6.5.0",
"bower-webpack-plugin": "^0.1.9",
"chai": "^4.1.1",
"copyfiles": "^1.0.0",
"css-loader": "^0.28.5",
"eslint": "^4.4.1",
"eslint-loader": "^1.0.0",
"eslint-plugin-react": "^7.2.1",
"file-loader": "^0.11.2",
"glob": "^7.0.0",
"isparta-instrumenter-loader": "^1.0.0",
"karma": "^1.0.0",
"karma-chai": "^0.1.0",
"karma-coverage": "^1.0.0",
"karma-mocha": "^1.0.0",
"karma-mocha-reporter": "^2.0.0",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sourcemap-loader": "^0.3.5",
"karma-webpack": "^2.0.4",
"minimist": "^1.2.0",
"mocha": "^3.0.0",
"null-loader": "^0.1.1",
"open": "0.0.5",
"phantomjs-prebuilt": "^2.0.0",
"react-addons-test-utils": "^15.0.0",
"react-hot-loader": "^v3.0.0-beta.6",
"rimraf": "^2.4.3",
"style-loader": "^0.18.2",
"url-loader": "^0.5.6",
"webpack": "^3.5.5",
"webpack-dev-server": "^2.7.1"
},
"dependencies": {
"core-js": "^2.0.0",
"normalize.css": "^7.0.0",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-redux": "^5.0.4",
"redux": "^3.6.0",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.1",
"webpack-bundle-analyzer": "^2.8.2"
}
}
{
"name": "muse-player",
"version": "5.1.1",
"description": "Just a simple and dilligent HTML5 Audio Player written in React.",
"main": "dist/assets/muse-player.js",
"scripts": {
"start": "node server.js --env=dev",
"test": "karma start",
"test:watch": "karma start --autoWatch=true --singleRun=false",
"posttest": "npm run lint",
"serve": "node server.js --env=dev",
"serve:dist": "node server.js --env=dist",
"dist": "npm run copy & webpack --env=dist",
"lint": "eslint ./src",
"copy": "copyfiles -f ./src/index.html ./src/favicon.ico ./dist",
"clean": "rimraf dist/*",
"release:major": "npm version major && npm publish && git push --follow-tags",
"release:minor": "npm version minor && npm publish && git push --follow-tags",
"release:patch": "npm version patch && npm publish && git push --follow-tags"
},
"repository": "https://github.com/moefront/muse",
"keywords": [
"audio player",
"HTML5",
"lyric",
"muse",
"ymplayer",
"redux",
"react"
],
"author": "MoeFront Studio",
"organization": "MoeFront Studio",
"license": "MIT",
"devDependencies": {
"babel-core": "^6.0.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.1.1",
"babel-polyfill": "^6.3.14",
"babel-preset-es2015": "^6.0.15",
"babel-preset-react": "^6.0.15",
"babel-preset-stage-0": "^6.5.0",
"bower-webpack-plugin": "^0.1.9",
"chai": "^4.1.1",
"copyfiles": "^1.0.0",
"css-loader": "^0.28.5",
"eslint": "^4.4.1",
"eslint-loader": "^1.0.0",
"eslint-plugin-react": "^7.2.1",
"file-loader": "^0.11.2",
"glob": "^7.0.0",
"isparta-instrumenter-loader": "^1.0.0",
"karma": "^1.0.0",
"karma-chai": "^0.1.0",
"karma-coverage": "^1.0.0",
"karma-mocha": "^1.0.0",
"karma-mocha-reporter": "^2.0.0",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sourcemap-loader": "^0.3.5",
"karma-webpack": "^2.0.4",
"minimist": "^1.2.0",
"mocha": "^3.0.0",
"null-loader": "^0.1.1",
"open": "0.0.5",
"phantomjs-prebuilt": "^2.0.0",
"react-addons-test-utils": "^15.0.0",
"react-hot-loader": "^v3.0.0-beta.6",
"rimraf": "^2.4.3",
"style-loader": "^0.18.2",
"url-loader": "^0.5.6",
"webpack": "^3.5.5",
"webpack-dev-server": "^2.7.1"
},
"dependencies": {
"core-js": "^2.0.0",
"normalize.css": "^7.0.0",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-redux": "^5.0.4",
"redux": "^3.6.0",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.1",
"webpack-bundle-analyzer": "^2.8.2"
}
}
2 changes: 1 addition & 1 deletion src/config/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

// Settings configured here will be merged into the final config object.
export default {
MUSE_VERSION: '5.1.0'
MUSE_VERSION: '5.1.1'
}
7 changes: 0 additions & 7 deletions src/containers/ControlContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ export class ControlContainerWithoutStore extends Component
const { playerLayout, isDrawerOpen } = this.props.player,
{ dispatch } = this.props;
if (playerLayout == 'muse-layout-landscape') {
const dom = parent.player.ref;
if (isDrawerOpen) {
dom.style.height = '70px';
} else {
dom.style.height = '370px';
}

dispatch(PlayerActions.toggleDrawer(!isDrawerOpen));
}
}
Expand Down
34 changes: 22 additions & 12 deletions src/containers/UIContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export class UIContainerWithoutStore extends Component {

this.unsubscriber = this.props.store.subscribe(this.subscriber);
applyMiddleware('afterRender', instance);
applyMiddleware('onPlayerResize', instance);
}

componentWillUnmount() {
Expand All @@ -66,8 +67,8 @@ export class UIContainerWithoutStore extends Component {
return document.fullscreenElement
? true
: document.webkitFullscreenElement
? true
: document.mozFullscreenElement ? true : false;
? true
: document.mozFullscreenElement ? true : false;
},
eleFSState = getFullscreenState(),
{ isFullscreen } = this.props.player,
Expand All @@ -78,10 +79,10 @@ export class UIContainerWithoutStore extends Component {
const state = player.requestFullscreen
? player.requestFullscreen() || true
: player.webkitRequestFullscreen
? player.webkitRequestFullscreen() || true
: player.mozRequestFullscreen
? player.mozRequestFullscreen() || true
: false;
? player.webkitRequestFullscreen() || true
: player.mozRequestFullscreen
? player.mozRequestFullscreen() || true
: false;

if (!state) {
throw 'It seems that your browser does not support HTML5 Fullscreen Feature.';
Expand All @@ -91,8 +92,8 @@ export class UIContainerWithoutStore extends Component {
document.exitFullscreen
? document.exitFullscreen()
: document.webkitExitFullscreen
? document.webkitExitFullscreen()
: document.mozExitFullscreen ? document.mozExitFullscreen() : '';
? document.webkitExitFullscreen()
: document.mozExitFullscreen ? document.mozExitFullscreen() : '';
} else {
return;
}
Expand Down Expand Up @@ -135,7 +136,7 @@ export class UIContainerWithoutStore extends Component {
};

onWindowResize = e => {
applyMiddleware('onPlayerResize', this.props.player.instance, e);
applyMiddleware('onPlayerResize', this.props.player.playerInstance, e);
};

destroyPlayerMenu = e => {
Expand All @@ -149,13 +150,22 @@ export class UIContainerWithoutStore extends Component {
};

render() {
const { playList, currentMusicIndex, playerLayout } = this.props.player,
const {
playList,
currentMusicIndex,
playerLayout,
isDrawerOpen
} = this.props.player,
{ id, store } = this.props,
cover = playList[currentMusicIndex].cover;

return (
<div
className={'muse-player ' + playerLayout}
className={
'muse-player ' +
playerLayout +
(isDrawerOpen ? ' muse-root__state-drawer-open' : '')
}
id={id}
ref={ref => (this.player = ref)}
>
Expand All @@ -179,4 +189,4 @@ export default connect(state => {
return {
player: state.player
};
})(UIContainerWithoutStore);
})(UIContainerWithoutStore);
Loading

0 comments on commit 3b801da

Please sign in to comment.