Merge pull request #567 from jberg/butterchurn-viz-detect

test for milkdrop support
This commit is contained in:
Jordan Eldredge 2018-05-06 14:16:27 -07:00 committed by GitHub
commit faf0ae629a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View file

@ -1,6 +1,7 @@
import "babel-polyfill";
import Raven from "raven-js";
import createMiddleware from "raven-for-redux";
import isButterchurnSupported from "butterchurn/lib/isSupported";
import base from "../skins/base-2.91-png.wsz";
import osx from "../skins/MacOSXAqua1-5.wsz";
import topaz from "../skins/TopazAmp1-2.wsz";
@ -112,7 +113,7 @@ Raven.context(() => {
return;
}
const __extraWindows = [];
if (milkdrop) {
if (milkdrop && isButterchurnSupported()) {
__extraWindows.push({ title: "Milkdrop 2", Component: MilkdropWindow });
}

View file

@ -77,7 +77,7 @@
"babel-plugin-transform-react-jsx": "^6.24.1",
"babel-preset-env": "^1.6.1",
"babel-runtime": "^6.26.0",
"butterchurn": "^2.2.2",
"butterchurn": "^2.2.6",
"butterchurn-presets": "^0.0.2",
"cardinal-spline-js": "^2.3.6",
"classnames": "^2.2.5",

View file

@ -1205,9 +1205,9 @@ butterchurn-presets@^0.0.2:
ecma-proposal-math-extensions "0.0.2"
lodash "^4.17.4"
butterchurn@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/butterchurn/-/butterchurn-2.2.2.tgz#219f54a2f674179c2ba580ea7002d26d740a31f4"
butterchurn@^2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/butterchurn/-/butterchurn-2.2.6.tgz#c0e77bd07ad605a4357e3e9c388141a6c0508d47"
dependencies:
babel-runtime "^6.26.0"
ecma-proposal-math-extensions "0.0.2"