Merge branch 'topic-core-refactor' into tcr-master

This commit is contained in:
Andrew Henry 2019-12-06 14:37:18 -08:00
commit f86b8cce16
2 changed files with 4 additions and 8 deletions

7
API.md
View File

@ -108,15 +108,13 @@ script loaders are also supported.
<html> <html>
<head> <head>
<title>Open MCT</title> <title>Open MCT</title>
<script src="openmct.js"></script> <script src="dist/openmct.js"></script>
</head> </head>
<body> <body>
<script> <script>
openmct.setAssetPath('openmct/dist');
openmct.install(openmct.plugins.LocalStorage()); openmct.install(openmct.plugins.LocalStorage());
openmct.install(openmct.plugins.MyItems()); openmct.install(openmct.plugins.MyItems());
openmct.install(openmct.plugins.UTCTimeSystem()); openmct.install(openmct.plugins.UTCTimeSystem());
openmct.install(openmct.plugins.Espresso());
openmct.start(); openmct.start();
</script> </script>
</body> </body>
@ -127,9 +125,6 @@ The Open MCT library included above requires certain assets such as html
templates, images, and css. If you installed Open MCT from GitHub as described templates, images, and css. If you installed Open MCT from GitHub as described
in the section on [Building from Source](#building-from-source) then these in the section on [Building from Source](#building-from-source) then these
assets will have been downloaded along with the Open MCT javascript library. assets will have been downloaded along with the Open MCT javascript library.
You can specify the location of these assets by calling `openmct.setAssetPath()`.
Typically this will be the same location as the `openmct.js` library is
included from.
There are some plugins bundled with the application that provide UI, There are some plugins bundled with the application that provide UI,
persistence, and other default configuration which are necessary to be able to persistence, and other default configuration which are necessary to be able to

View File

@ -12,6 +12,7 @@
"concurrently": "^3.6.1", "concurrently": "^3.6.1",
"copy-webpack-plugin": "^4.5.2", "copy-webpack-plugin": "^4.5.2",
"css-loader": "^1.0.0", "css-loader": "^1.0.0",
"cross-env": "^6.0.3",
"d3-array": "1.2.x", "d3-array": "1.2.x",
"d3-axis": "1.0.x", "d3-axis": "1.0.x",
"d3-collection": "1.0.x", "d3-collection": "1.0.x",
@ -77,11 +78,11 @@
"start": "node app.js", "start": "node app.js",
"lint": "eslint platform example src/**/*.{js,vue} openmct.js", "lint": "eslint platform example src/**/*.{js,vue} openmct.js",
"lint:fix": "eslint platform example src/**/*.{js,vue} openmct.js --fix", "lint:fix": "eslint platform example src/**/*.{js,vue} openmct.js --fix",
"build:prod": "NODE_ENV=production webpack", "build:prod": "cross-env NODE_ENV=production webpack",
"build:dev": "webpack", "build:dev": "webpack",
"build:watch": "webpack --watch", "build:watch": "webpack --watch",
"test": "karma start --single-run", "test": "karma start --single-run",
"test-debug": "NODE_ENV=debug karma start --no-single-run", "test-debug": "cross-env NODE_ENV=debug karma start --no-single-run",
"test:watch": "karma start --no-single-run", "test:watch": "karma start --no-single-run",
"verify": "concurrently 'npm:test' 'npm:lint'", "verify": "concurrently 'npm:test' 'npm:lint'",
"jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api", "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",