Merge remote-tracking branch 'upstream/develop' into scratch-desktop

This commit is contained in:
Christopher Willis-Ford committed 2019-03-12 15:01:25 -07:00
commit f600e6095e
3 files changed
+4 -12

No files matched your search

+1 -1
View File
@@ -108,7 +108,7 @@
"scratch-blocks": "0.1.0-prerelease.1545364693",
"scratch-l10n": "3.1.20181220222259",
"scratch-paint": "0.2.0-prerelease.20181220194927",
"scratch-render": "0.1.0-prerelease.20190108175224",
"scratch-render": "0.1.0-prerelease.20190107163047",
"scratch-storage": "1.2.2",
"scratch-svg-renderer": "0.2.0-prerelease.20181220183040",
"scratch-vm": "0.2.0-prerelease.20190107184530",
@@ -32,7 +32,7 @@ const BrowserModal = ({intl, ...props}) => (
<p>
{ /* eslint-disable max-len */ }
<FormattedMessage
defaultMessage="We are very sorry, but Scratch does not support this browser version. We recommend updating to the latest version of a supported browser such as Google Chrome, Mozilla Firefox, Microsoft Edge, or Apple Safari."
defaultMessage="We are very sorry, but Scratch does not support this browser. We recommend trying a supported browser such as Google Chrome, Mozilla Firefox, Microsoft Edge, or Apple Safari."
description="Unsupported browser description"
id="gui.unsupportedBrowser.description"
/>
+2 -10
View File
@@ -10,14 +10,6 @@ export default function () {
bowser.silk) {
return false;
}
// IMPORTANT: If you change versions here, also change them in www
// minimum versions for recommended browsers
const minVersions = {
chrome: '63',
msedge: '15',
firefox: '57',
safari: '11'
};
// strict mode == false so any browser not mentioned in the min Versions is ok
return bowser.check(minVersions, false);
// @todo Should also test for versions of supported browsers
return true;
}