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

scampi · scampi · commit 07b75491cf67 · 2017-03-04T21:26:33.000Z
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);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export default function ($compile) {`
`18`	`18`	`interval: intervalTemplate,`
`19`	`19`	`filter: filterTemplate,`
`20`	`20`	`};`
`21`		`- this.controllers = [];`
	`21`	`+ this.locals = {};`
`22`	`22`
`23`	`23`	`this.addItems(opts);`
`24`	`24`	`}`
`@@ -36,8 +36,8 @@ export default function ($compile) {`
`36`	`36`	`this.opts.push(opt);`
`37`	`37`	`if (!opt.hideButton()) this.menuItems.push(opt);`
`38`	`38`	`if (opt.template) this.templates[opt.key] = opt.template;`
`39`		`- if (opt.controller) {`
`40`		`- this.controllers[opt.key] = opt.controller;`
	`39`	`+ if (opt.locals) {`
	`40`	`+ this.locals[opt.key] = opt.locals;`
`41`	`41`	`}`
`42`	`42`	`});`
`43`	`43`	`}`
`@@ -111,8 +111,8 @@ export default function ($compile) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`const $childScope = $scope.$new();`
`114`		`- if (this.controllers[currentKey]) {`
`115`		`- $childScope.controller = this.controllers[currentKey];`
	`114`	`+ if (this.locals[currentKey]) {`
	`115`	`+ Object.assign($childScope, this.locals[currentKey]);`
`116`	`116`	`}`
`117`	`117`	`const $el = $element.find('#template_wrapper').html(templateToRender).contents();`
`118`	`118`	`$compile($el)($childScope);`