From d8eb72621bb05b046e1d107385b5eecacaa40494 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue, 4 Nov 2014 08:06:44 -0800
Subject: [PATCH] [Framework] Simplify custom registration

Handle the iteration over extensions which have a
custom registration mechanism (directives, services)
at the same level that general registration is handled.
WTD-518.
---
 platform/framework/src/CustomRegistrars.js   |  4 +---
 platform/framework/src/ExtensionRegistrar.js | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/platform/framework/src/CustomRegistrars.js b/platform/framework/src/CustomRegistrars.js
index d64389255e..e618de795b 100644
--- a/platform/framework/src/CustomRegistrars.js
+++ b/platform/framework/src/CustomRegistrars.js
@@ -45,9 +45,7 @@ define(
             }
 
             return {
-                services: function (extensions) {
-                    return extensions.map(registerExtension);
-                }
+                services: registerExtension;
             };
         }
 
diff --git a/platform/framework/src/ExtensionRegistrar.js b/platform/framework/src/ExtensionRegistrar.js
index c9a2123c99..1ff42bf605 100644
--- a/platform/framework/src/ExtensionRegistrar.js
+++ b/platform/framework/src/ExtensionRegistrar.js
@@ -16,7 +16,7 @@ define(
             // Track which extension categories have already been registered.
             // Exceptions will be thrown if the same extension category is
             // registered twice.
-            var registeredCategories = {},
+            var registeredCategories = {};
 
             function identify(category, extension, index) {
                 var name = extension.key ?
@@ -68,11 +68,16 @@ define(
                         category,
                         " more than once. Ignoring all but first set."
                     ].join(""));
-                } else if (customRegistrars[category]) {
-                    return customRegistrars[category](extensions);
                 } else {
-                    extensions.forEach(registerExtension);
-                    registerExtensionArraysForCategory(category, names);
+                    // Register all extensions. Use custom registration
+                    // code for services, directives, etc; otherwise,
+                    // just register them under generic names.
+                    if (customRegistrars[category]) {
+                        extensions.forEach(customRegistrars[category]);
+                    } else {
+                        extensions.forEach(registerExtension);
+                        registerExtensionArraysForCategory(category, names);
+                    }
                     registeredCategories[category] = true;
                     return true;
                 }