Fixed Outstanding issues from merge

2025-04-21 01:21:19 +00:00 · 2016-01-14 18:51:53 -08:00 · 2016-01-14 18:51:53 -08:00 · 66e827de2e
commit 66e827de2e
parent 7a563b80ee
2 changed files with 3 additions and 2 deletions
--- a/platform/core/bundle.js
+++ b/platform/core/bundle.js
@ -383,7 +383,8 @@ define([
                    "key": "instantiate",
                    "implementation": Instantiate,
                    "depends": [
-                        "capabilityService"
+                        "capabilityService",
+                        "identifierService"
                    ]
                }
            ],
--- a/platform/forms/src/MCTToolbar.js
+++ b/platform/forms/src/MCTToolbar.js
@ -64,7 +64,7 @@ define(
                templateUrl: templatePath,

                // Use FormController to populate/respond to changes in scope
-                controller: FormController,
+                controller: [ '$scope', FormController ],

                // Initial an isolate scope
                scope: {