From 42db1378e0997a8ecf357e74e3559acb64165c12 Mon Sep 17 00:00:00 2001 From: woodsaj Date: Thu, 17 Dec 2015 23:59:01 +0800 Subject: [PATCH] rename app config directive to grafana-app-* --- public/app/features/org/partials/appConfigCore.html | 3 +++ public/app/features/org/partials/pluginConfigCore.html | 3 --- public/app/features/org/plugin_directive.js | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 public/app/features/org/partials/appConfigCore.html delete mode 100644 public/app/features/org/partials/pluginConfigCore.html diff --git a/public/app/features/org/partials/appConfigCore.html b/public/app/features/org/partials/appConfigCore.html new file mode 100644 index 00000000000..8435f39d07b --- /dev/null +++ b/public/app/features/org/partials/appConfigCore.html @@ -0,0 +1,3 @@ +
+{{current.type}} app does not have any additional config. +
diff --git a/public/app/features/org/partials/pluginConfigCore.html b/public/app/features/org/partials/pluginConfigCore.html deleted file mode 100644 index 1b13b46d0e5..00000000000 --- a/public/app/features/org/partials/pluginConfigCore.html +++ /dev/null @@ -1,3 +0,0 @@ -
-{{current.type}} plugin does not have any additional config. -
diff --git a/public/app/features/org/plugin_directive.js b/public/app/features/org/plugin_directive.js index 6fd30730264..845a60aaa3a 100644 --- a/public/app/features/org/plugin_directive.js +++ b/public/app/features/org/plugin_directive.js @@ -10,12 +10,12 @@ function (angular) { return { restrict: 'E', link: function(scope, elem) { - var directive = 'grafana-plugin-core'; + var directive = 'grafana-app-core'; //wait for the parent scope to be applied. scope.$watch("current", function(newVal) { if (newVal) { if (newVal.module) { - directive = 'grafana-plugin-'+newVal.type; + directive = 'grafana-app-'+newVal.type; } scope.require([newVal.module], function () { var panelEl = angular.element(document.createElement(directive)); @@ -28,10 +28,10 @@ function (angular) { }; }); - module.directive('grafanaPluginCore', function() { + module.directive('grafanaAppCore', function() { return { restrict: 'E', - templateUrl: 'app/features/org/partials/pluginConfigCore.html', + templateUrl: 'app/features/org/partials/appConfigCore.html', transclude: true, link: function(scope) { scope.update = function() {