VISTA compatibility issues (#2291)

* Build config changes necessary to work with VISTA
* Fixes to TelemetryTableRow to address bug in VISTA
* Fixed sass-fast-loader version to avoid https://github.com/yibn2008/fast-sass-loader/issues/47
* Reverted default theme
This commit is contained in:
Andrew Henry 2019-02-27 17:08:50 -08:00 committed by GitHub
parent 0e30fba72d
commit 322a7bd5a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 7 deletions

View File

@ -27,7 +27,7 @@
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<title></title> <title></title>
<script src="dist/openmct.js"></script> <script src="dist/openmct.js"></script>
<link rel="stylesheet" href="dist/openmct.css"> <link rel="stylesheet" href="dist/styles/openmct.css">
<link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="dist/favicons/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96"> <link rel="icon" type="image/png" href="dist/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16"> <link rel="icon" type="image/png" href="dist/favicons/favicon-16x16.png" sizes="16x16">

View File

@ -25,7 +25,7 @@
"eventemitter3": "^1.2.0", "eventemitter3": "^1.2.0",
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"express": "^4.13.1", "express": "^4.13.1",
"fast-sass-loader": "^1.4.5", "fast-sass-loader": "1.4.6",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"file-saver": "^1.3.8", "file-saver": "^1.3.8",
"git-rev-sync": "^1.4.0", "git-rev-sync": "^1.4.0",

View File

@ -158,7 +158,7 @@ define([
return { return {
evaluate: function (datum, property) { evaluate: function (datum, property) {
return limitEvaluator.evaluate(datum, property.key); return limitEvaluator.evaluate(datum, property && property.key);
} }
}; };
}; };

View File

@ -44,7 +44,7 @@ define([], function () {
getRowLimitClass() { getRowLimitClass() {
if (!this.rowLimitClass) { if (!this.rowLimitClass) {
let limitEvaluation = this.limitEvaluator.evaluate(this.datum); let limitEvaluation = this.limitEvaluator.evaluate(this.datum);
this.rowLimitClass = limitEvaluation && limitEvaluation.cssClass; this.rowLimitClass = limitEvaluation && limitEvaluation.cssClass;
} }
return this.rowLimitClass; return this.rowLimitClass;

View File

@ -9,7 +9,7 @@ const EventEmitter = require('EventEmitter');
function paramsToObject(searchParams) { function paramsToObject(searchParams) {
let params = {}; let params = {};
for ([key, value] of searchParams.entries()) { for (let [key, value] of searchParams.entries()) {
if (params[key]) { if (params[key]) {
if (!Array.isArray(params[key])) { if (!Array.isArray(params[key])) {
params[key] = [params[key]]; params[key] = [params[key]];

View File

@ -83,8 +83,19 @@ const webpackConfig = {
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[name].[ext]', name: '[name].[ext]',
useRelativePath: true, outputPath(url, resourcePath, context) {
outputPath: 'assets/' if (/\.(jpg|jpeg|png|svg)$/.test(url)) {
return `images/${url}`
}
if (/\.ico$/.test(url)) {
return `icons/${url}`
}
if (/\.(woff2?|eot|ttf)$/.test(url)) {
return `fonts/${url}`
} else {
return `${url}`;
}
}
} }
}, },
{ {