From 8dd118bd8659f178326e95afa5e64fbb97ddf02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 20 Jan 2016 09:45:24 +0100 Subject: [PATCH] updated --- public/app/features/panel/panel_meta2.ts | 1 - public/app/plugins/panel/test/module.ts | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/public/app/features/panel/panel_meta2.ts b/public/app/features/panel/panel_meta2.ts index ca276f9377b..c3f9a25eb31 100644 --- a/public/app/features/panel/panel_meta2.ts +++ b/public/app/features/panel/panel_meta2.ts @@ -23,7 +23,6 @@ export default class PanelMeta { this.addMenuItem('Edit', 'icon-cog', 'editPanel(); dismiss();', 'Editor'); this.addMenuItem('Duplicate', 'icon-copy', 'duplicatePanel()', 'Editor'); this.addMenuItem('Share', 'icon-share', 'sharePanel(); dismiss();'); - this.addEditorTab('General', 'app/partials/panelgeneral.html'); if (options.metricsEditor) { diff --git a/public/app/plugins/panel/test/module.ts b/public/app/plugins/panel/test/module.ts index 4fb2c4a66eb..74272cd21e3 100644 --- a/public/app/plugins/panel/test/module.ts +++ b/public/app/plugins/panel/test/module.ts @@ -15,7 +15,6 @@ class PanelBaseCtrl { } class TestPanelCtrl extends PanelBaseCtrl { - constructor($scope) { super($scope); $scope.panelMeta.panelName = "Test"; @@ -32,7 +31,8 @@ function testPanelDirective() { `, - controller: TestPanelCtrl + controller: TestPanelCtrl, + controllerAs: 'ctrl', }; }