mirror of https://github.com/vector-im/riot-web
Merge pull request #283 from vector-im/kegan/blocking
Add feature-based browser blockingpull/314/head
commit
626e8bab1a
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
"minify": true,
|
||||||
|
"classPrefix": "modernizr_",
|
||||||
|
"options": [
|
||||||
|
"setClasses"
|
||||||
|
],
|
||||||
|
"feature-detects": [
|
||||||
|
"test/css/displaytable",
|
||||||
|
"test/css/flexbox",
|
||||||
|
"test/es5/specification",
|
||||||
|
"test/css/objectfit",
|
||||||
|
"test/storage/localstorage"
|
||||||
|
]
|
||||||
|
}
|
|
@ -11,6 +11,7 @@
|
||||||
"style": "bundle.css",
|
"style": "bundle.css",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"reskindex": "reskindex vector -h src/skins/vector/header",
|
"reskindex": "reskindex vector -h src/skins/vector/header",
|
||||||
|
"build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
|
||||||
"build:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/bundle.css -c uglifycss --no-watch",
|
"build:css": "catw \"src/skins/vector/css/**/*.css\" -o vector/bundle.css -c uglifycss --no-watch",
|
||||||
"build:compile": "babel --source-maps -d lib src",
|
"build:compile": "babel --source-maps -d lib src",
|
||||||
"build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
|
"build:bundle": "NODE_ENV=production webpack -p lib/vector/index.js vector/bundle.js",
|
||||||
|
@ -27,6 +28,7 @@
|
||||||
"filesize": "^3.1.2",
|
"filesize": "^3.1.2",
|
||||||
"flux": "~2.0.3",
|
"flux": "~2.0.3",
|
||||||
"linkifyjs": "^2.0.0-beta.4",
|
"linkifyjs": "^2.0.0-beta.4",
|
||||||
|
"modernizr": "^3.1.0",
|
||||||
"matrix-js-sdk": "^0.3.0",
|
"matrix-js-sdk": "^0.3.0",
|
||||||
"matrix-react-sdk": "^0.0.2",
|
"matrix-react-sdk": "^0.0.2",
|
||||||
"q": "^1.4.1",
|
"q": "^1.4.1",
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
.mx_CompatibilityPage {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background-color: #e55;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_CompatibilityPage_box {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
margin: auto;
|
||||||
|
width: 500px;
|
||||||
|
height: 300px;
|
||||||
|
border: 1px solid;
|
||||||
|
padding: 10px;
|
||||||
|
background-color: #fcc;
|
||||||
|
}
|
|
@ -0,0 +1,62 @@
|
||||||
|
/*
|
||||||
|
Copyright 2015 OpenMarket Ltd
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
var React = require('react');
|
||||||
|
|
||||||
|
module.exports = React.createClass({
|
||||||
|
displayName: 'CompatibilityPage',
|
||||||
|
propTypes: {
|
||||||
|
onAccept: React.PropTypes.func
|
||||||
|
},
|
||||||
|
|
||||||
|
getDefaultProps: function() {
|
||||||
|
return {
|
||||||
|
onAccept: function() {} // NOP
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
onAccept: function() {
|
||||||
|
this.props.onAccept();
|
||||||
|
},
|
||||||
|
|
||||||
|
render: function() {
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mx_CompatibilityPage">
|
||||||
|
<div className="mx_CompatibilityPage_box">
|
||||||
|
<p>Sorry, your browser is <b>not</b> able to run Vector.</p>
|
||||||
|
<p>
|
||||||
|
Buttons and images may appear out of place, communication may
|
||||||
|
not be possible and all manner of chaos may be unleashed.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Please install <a href={"https://www.google.com/chrome"}>Chrome</a> for
|
||||||
|
the best experience.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Though if you like taking risks with your life, you can still try it
|
||||||
|
out by clicking that you understand the risks involved.
|
||||||
|
</p>
|
||||||
|
<button onClick={this.onAccept}>
|
||||||
|
I understand the risks and wish to continue
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
|
@ -16,6 +16,7 @@ limitations under the License.
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
var RunModernizrTests = require("./modernizr"); // this side-effects a global
|
||||||
var React = require("react");
|
var React = require("react");
|
||||||
var sdk = require("matrix-react-sdk");
|
var sdk = require("matrix-react-sdk");
|
||||||
sdk.loadSkin(require('../skins/vector/skindex'));
|
sdk.loadSkin(require('../skins/vector/skindex'));
|
||||||
|
@ -25,6 +26,34 @@ var qs = require("querystring");
|
||||||
|
|
||||||
var lastLocationHashSet = null;
|
var lastLocationHashSet = null;
|
||||||
|
|
||||||
|
function checkBrowserFeatures(featureList) {
|
||||||
|
if (!window.Modernizr) {
|
||||||
|
console.error("Cannot check features - Modernizr global is missing.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
var featureComplete = true;
|
||||||
|
for (var i = 0; i < featureList.length; i++) {
|
||||||
|
if (window.Modernizr[featureList[i]] === undefined) {
|
||||||
|
console.error(
|
||||||
|
"Looked for feature '%s' but Modernizr has no results for this. " +
|
||||||
|
"Has it been configured correctly?", featureList[i]
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (window.Modernizr[featureList[i]] === false) {
|
||||||
|
console.error("Browser missing feature: '%s'", featureList[i]);
|
||||||
|
// toggle flag rather than return early so we log all missing features
|
||||||
|
// rather than just the first.
|
||||||
|
featureComplete = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return featureComplete;
|
||||||
|
}
|
||||||
|
|
||||||
|
var validBrowser = checkBrowserFeatures([
|
||||||
|
"displaytable", "flexbox", "es5object", "es5function", "localstorage",
|
||||||
|
"objectfit"
|
||||||
|
]);
|
||||||
|
|
||||||
// We want to support some name / value pairs in the fragment
|
// We want to support some name / value pairs in the fragment
|
||||||
// so we're re-using query string like format
|
// so we're re-using query string like format
|
||||||
|
@ -84,14 +113,11 @@ var makeRegistrationUrl = function() {
|
||||||
'#/register';
|
'#/register';
|
||||||
}
|
}
|
||||||
|
|
||||||
var MatrixChat = sdk.getComponent('pages.MatrixChat');
|
|
||||||
window.matrixChat = React.render(
|
|
||||||
<MatrixChat onNewScreen={onNewScreen} registrationUrl={makeRegistrationUrl()} />,
|
|
||||||
document.getElementById('matrixchat')
|
|
||||||
);
|
|
||||||
|
|
||||||
window.addEventListener('hashchange', onHashChange);
|
window.addEventListener('hashchange', onHashChange);
|
||||||
window.onload = function() {
|
window.onload = function() {
|
||||||
|
if (!validBrowser) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
routeUrl(window.location);
|
routeUrl(window.location);
|
||||||
loaded = true;
|
loaded = true;
|
||||||
if (lastLoadedScreen) {
|
if (lastLoadedScreen) {
|
||||||
|
@ -100,3 +126,28 @@ window.onload = function() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function loadApp() {
|
||||||
|
if (validBrowser) {
|
||||||
|
var MatrixChat = sdk.getComponent('pages.MatrixChat');
|
||||||
|
window.matrixChat = React.render(
|
||||||
|
<MatrixChat onNewScreen={onNewScreen} registrationUrl={makeRegistrationUrl()} />,
|
||||||
|
document.getElementById('matrixchat')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
console.error("Browser is missing required features.");
|
||||||
|
// take to a different landing page to AWOOOOOGA at the user
|
||||||
|
var CompatibilityPage = require("../skins/vector/views/pages/CompatibilityPage");
|
||||||
|
window.matrixChat = React.render(
|
||||||
|
<CompatibilityPage onAccept={function() {
|
||||||
|
validBrowser = true;
|
||||||
|
console.log("User accepts the compatibility risks.");
|
||||||
|
loadApp();
|
||||||
|
window.onload(); // still do the same code paths for compatible clients
|
||||||
|
}} />,
|
||||||
|
document.getElementById('matrixchat')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
loadApp();
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue