ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-20 08:03:49 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed Outstanding issues from merge

Browse Source
This commit is contained in:
Henry
2016-01-14 18:51:53 -08:00
parent 7a563b80ee
commit 66e827de2e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/core/bundle.js
View File

@ -383,7 +383,8 @@ define([
"key": "instantiate", "key": "instantiate",
"implementation": Instantiate, "implementation": Instantiate,
"depends": [ "depends": [
"capabilityService" "capabilityService",
"identifierService"
] ]
} }
], ],

2
platform/forms/src/MCTToolbar.js
View File

@ -64,7 +64,7 @@ define(
templateUrl: templatePath, templateUrl: templatePath,
// Use FormController to populate/respond to changes in scope // Use FormController to populate/respond to changes in scope
controller: FormController, controller: [ '$scope', FormController ],
// Initial an isolate scope // Initial an isolate scope
scope: { scope: {