ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-22 04:18:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Dave 2015-07-01 13:30:08 -07:00
commit d343d38037
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app.js
View File

@ -14,8 +14,7 @@
options = require('minimist')(process.argv.slice(2)), options = require('minimist')(process.argv.slice(2)),
express = require('express'), express = require('express'),
app = express(), app = express(),
fs = require('fs'), fs = require('fs');
bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8'));
// Defaults // Defaults
options.port = options.port || options.p || 8080; options.port = options.port || options.p || 8080;
@ -40,6 +39,10 @@
process.exit(0); process.exit(0);
} }
// Override bundles.json for HTTP requests
app.use('/' + BUNDLE_FILE, function (req, res) {
var bundles = JSON.parse(fs.readFileSync(BUNDLE_FILE, 'utf8'));
// Handle command line inclusions/exclusions // Handle command line inclusions/exclusions
bundles = bundles.concat(options.include); bundles = bundles.concat(options.include);
bundles = bundles.filter(function (bundle) { bundles = bundles.filter(function (bundle) {
@ -49,8 +52,6 @@
return bundles.indexOf(bundle) === index; return bundles.indexOf(bundle) === index;
}); });
// Override bundles.json for HTTP requests
app.use('/' + BUNDLE_FILE, function (req, res) {
res.send(JSON.stringify(bundles)); res.send(JSON.stringify(bundles));
}); });

2
platform/features/imagery/src/directives/MCTBackgroundImage.js
View File

@ -64,7 +64,7 @@ define(
if (!url) { if (!url) {
loaded = myCounter; loaded = myCounter;
element.css('background-image', undefined); element.css('background-image', 'none');
} else { } else {
image = $document[0].createElement('img'); image = $document[0].createElement('img');
image.src = url; image.src = url;

2
platform/features/imagery/test/directives/MCTBackgroundImageSpec.js
View File

@ -92,7 +92,7 @@ define(
expect(mockElement.css.mostRecentCall.args).toEqual([ expect(mockElement.css.mostRecentCall.args).toEqual([
"background-image", "background-image",
undefined "none"
]); ]);
}); });
}); });

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>gov.nasa.arc.wtd</groupId> <groupId>gov.nasa.arc.wtd</groupId>
<artifactId>open-mct-web</artifactId> <artifactId>open-mct-web</artifactId>
<name>Open MCT Web</name> <name>Open MCT Web</name>
<version>0.7.1-SNAPSHOT</version> <version>0.7.2-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>