Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-01-23 10:15:31 +00:00
Code Issues Projects Releases Wiki Activity

only load preset not in minimal pack

Browse source
This commit is contained in:
jberg 2018-06-08 17:58:53 -07:00 • committed by Jordan Eldredge
parent c0b004bb47
commit 6f72000aab
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/components/MilkdropWindow/index.js
View file

@ -164,13 +164,10 @@ class MilkdropWindow extends React.Component {
}
async _loadMainPresetPack() {
return require.ensure(
["butterchurn-presets"],
["butterchurn-presets/lib/butterchurnPresetsNonMinimal.min"],
require => {
const butterchurnPresets = require("butterchurn-presets");
this.presets = Object.assign(
this.presets,
butterchurnPresets.getPresets()
);
const butterchurnNonMinimalPresets = require("butterchurn-presets/lib/butterchurnPresetsNonMinimal.min");
Object.assign(this.presets, butterchurnNonMinimalPresets.getPresets());
},
e => {
console.error("Error loading Butterchurn Presets", e);

2
package.json
View file

@ -55,7 +55,7 @@
"babel-preset-react": "^6.24.1",
"babel-runtime": "^6.26.0",
"butterchurn": "^2.4.3",
"butterchurn-presets": "^2.4.5",
"butterchurn-presets": "^2.4.7",
"canvas-mock": "0.0.0",
"cardinal-spline-js": "^2.3.6",
"classnames": "^2.2.5",

6
yarn.lock
View file

@ -1269,9 +1269,9 @@ builtin-status-codes@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
butterchurn-presets@^2.4.5:
version "2.4.5"
resolved "https://registry.yarnpkg.com/butterchurn-presets/-/butterchurn-presets-2.4.5.tgz#5e05f2c57e941ff2d24f655b0ea842ca1ff4787a"
butterchurn-presets@^2.4.7:
version "2.4.7"
resolved "https://registry.yarnpkg.com/butterchurn-presets/-/butterchurn-presets-2.4.7.tgz#41e4e37cd3af2aec124fa8062352816100956c29"
dependencies:
babel-runtime "^6.26.0"
ecma-proposal-math-extensions "0.0.2"