use locals object to pass variables to the template's scope

elastic · Mar 4, 2017 · 07b7549 · 07b7549
1 parent c9d5c0c
commit 07b7549
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js b/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js
@@ -18,7 +18,7 @@ export default function ($compile) {
         interval: intervalTemplate,
         filter: filterTemplate,
       };
-      this.controllers = [];
+      this.locals = {};
 
       this.addItems(opts);
     }
@@ -36,8 +36,8 @@ export default function ($compile) {
         this.opts.push(opt);
         if (!opt.hideButton()) this.menuItems.push(opt);
         if (opt.template) this.templates[opt.key] = opt.template;
-        if (opt.controller) {
-          this.controllers[opt.key] = opt.controller;
+        if (opt.locals) {
+          this.locals[opt.key] = opt.locals;
         }
       });
     }
@@ -111,8 +111,8 @@ export default function ($compile) {
       }
 
       const $childScope = $scope.$new();
-      if (this.controllers[currentKey]) {
-        $childScope.controller = this.controllers[currentKey];
+      if (this.locals[currentKey]) {
+        Object.assign($childScope, this.locals[currentKey]);
       }
       const $el = $element.find('#template_wrapper').html(templateToRender).contents();
       $compile($el)($childScope);