From 733a282f3ff738a79ea412381fcafa3f4e38f0d5 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu, 17 Sep 2015 17:51:06 -0700
Subject: [PATCH] [Framework] Obey priority order for controllers et al

Support overriding of controllers between bundles.
---
 platform/framework/src/register/CustomRegistrars.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/platform/framework/src/register/CustomRegistrars.js b/platform/framework/src/register/CustomRegistrars.js
index 04c3bbce7a..6b840a4310 100644
--- a/platform/framework/src/register/CustomRegistrars.js
+++ b/platform/framework/src/register/CustomRegistrars.js
@@ -52,6 +52,7 @@ define(
         // named methods on Angular modules, which follow the normal
         // app.method(key, [ deps..., function ]) pattern.
         function customRegistrar(angularFunction) {
+            var registered = {};
             return function (extension, index) {
                 var app = this.app,
                     $log = this.$log,
@@ -67,6 +68,14 @@ define(
                         ", no key specified. ",
                         JSON.stringify(extension)
                     ].join(""));
+                } else if (registered[key]) {
+                    $log.debug([
+                        "Already registered ",
+                        angularFunction,
+                        " with key ",
+                        key,
+                        "; skipping."
+                    ].join(""));
                 } else {
                     $log.info([
                         "Registering ",
@@ -74,6 +83,7 @@ define(
                         ": ",
                         key
                     ].join(""));
+                    registered[key] = true;
                     app[angularFunction](
                         key,
                         dependencies.concat([extension])