ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-17 22:58:14 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Code Style] Rename shadowing variables

Browse Source
This commit is contained in:
Victor Woeltjen
2016-05-20 11:39:49 -07:00
parent e468080373
commit ad5691142e
56 changed files with 256 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/framework/src/register/ExtensionRegistrar.js
View File

@ -164,15 +164,15 @@ define(
// Examine a group of resolved dependencies to determine
// which extension categories still need to be satisfied.
function findEmptyExtensionDependencies(extensionGroup) {
function findEmptyExtensionDependencies(extGroup) {
var needed = {},
categories = Object.keys(extensionGroup),
categories = Object.keys(extGroup),
allExtensions = [];
// Build up an array of all extensions
categories.forEach(function (category) {
allExtensions =
allExtensions.concat(extensionGroup[category]);
allExtensions.concat(extGroup[category]);
});
// Track all extension dependencies exposed therefrom
@ -197,10 +197,9 @@ define(
// Register any extension categories that are depended-upon but
// have not been declared anywhere; such dependencies are then
// satisfied by an empty array, instead of not at all.
function registerEmptyDependencies(extensionGroup) {
findEmptyExtensionDependencies(
extensionGroup
).forEach(function (name) {
function registerEmptyDependencies(extGroup) {
findEmptyExtensionDependencies(extGroup)
.forEach(function (name) {
$log.info("Registering empty extension category " + name);
app.factory(name, [staticFunction([])]);
});

22
platform/framework/src/resolve/ExtensionResolver.js
View File

@ -58,11 +58,11 @@ define(
var loader = this.loader,
$log = this.$log;
function loadImplementation(extension) {
var implPromise = extension.hasImplementationValue() ?
Promise.resolve(extension.getImplementationValue()) :
loader.load(extension.getImplementationPath()),
definition = extension.getDefinition();
function loadImplementation(ext) {
var implPromise = ext.hasImplementationValue() ?
Promise.resolve(ext.getImplementationValue()) :
loader.load(ext.getImplementationPath()),
definition = ext.getDefinition();
// Wrap a constructor function (to avoid modifying the original)
function constructorFor(impl) {
@ -94,7 +94,7 @@ define(
result.definition = definition;
// Log that this load was successful
$log.info("Resolved " + extension.getLogName());
$log.info("Resolved " + ext.getLogName());
return result;
}
@ -105,7 +105,7 @@ define(
// Build up a log message from parts
var message = [
"Could not load implementation for extension ",
extension.getLogName(),
ext.getLogName(),
" due to ",
err.message
].join("");
@ -113,16 +113,16 @@ define(
// Log that the extension was not loaded
$log.warn(message);
return extension.getDefinition();
return ext.getDefinition();
}
if (!extension.hasImplementationValue()) {
if (!ext.hasImplementationValue()) {
// Log that loading has begun
$log.info([
"Loading implementation ",
extension.getImplementationPath(),
ext.getImplementationPath(),
" for extension ",
extension.getLogName()
ext.getLogName()
].join(""));
}