Commit d34ba416 by Torkel Ödegaard

tech(systemjs): more stuff is starting to work

parent 545c3935
...@@ -19,6 +19,8 @@ function (angular, $, config) { ...@@ -19,6 +19,8 @@ function (angular, $, config) {
var panelEl = angular.element(document.createElement('grafana-panel-' + panelType)); var panelEl = angular.element(document.createElement('grafana-panel-' + panelType));
elem.append(panelEl); elem.append(panelEl);
$compile(panelEl)(scope); $compile(panelEl)(scope);
}).catch(function(err) {
scope.appEvent('alert-error', ['Panel Load Error', 'Failed to load panel ' + panelType + ', ' + err]);
}); });
} }
}; };
......
define([
'./panel_meta2',
],
function (panelMeta) {
'use strict';
return panelMeta.default;
});
...@@ -7,7 +7,7 @@ export default class PanelMeta { ...@@ -7,7 +7,7 @@ export default class PanelMeta {
editorTabs: any; editorTabs: any;
extendedMenu: any; extendedMenu: any;
constructor(options : any) { constructor(options: any) {
this.description = options.description; this.description = options.description;
this.fullscreen = options.fullscreen; this.fullscreen = options.fullscreen;
this.editIcon = options.editIcon; this.editIcon = options.editIcon;
......
...@@ -9,7 +9,7 @@ function (angular, app, _, config, PanelMeta) { ...@@ -9,7 +9,7 @@ function (angular, app, _, config, PanelMeta) {
'use strict'; 'use strict';
var module = angular.module('grafana.panels.dashlist', []); var module = angular.module('grafana.panels.dashlist', []);
app.useModule(module); app.default.useModule(module);
module.directive('grafanaPanelDashlist', function() { module.directive('grafanaPanelDashlist', function() {
return { return {
......
...@@ -7,7 +7,7 @@ define([ ...@@ -7,7 +7,7 @@ define([
'use strict'; 'use strict';
var module = angular.module('grafana.panels.graph', []); var module = angular.module('grafana.panels.graph', []);
app.useModule(module); app.default.useModule(module);
module.controller('SeriesOverridesCtrl', function($scope, $element, popoverSrv) { module.controller('SeriesOverridesCtrl', function($scope, $element, popoverSrv) {
$scope.overrideMenu = []; $scope.overrideMenu = [];
......
...@@ -11,7 +11,7 @@ function (angular, app, _, kbn, TimeSeries, PanelMeta) { ...@@ -11,7 +11,7 @@ function (angular, app, _, kbn, TimeSeries, PanelMeta) {
'use strict'; 'use strict';
var module = angular.module('grafana.panels.singlestat'); var module = angular.module('grafana.panels.singlestat');
app.useModule(module); app.default.useModule(module);
module.directive('grafanaPanelSinglestat', function() { module.directive('grafanaPanelSinglestat', function() {
return { return {
......
...@@ -9,7 +9,7 @@ function (angular, app, _, $) { ...@@ -9,7 +9,7 @@ function (angular, app, _, $) {
'use strict'; 'use strict';
var module = angular.module('grafana.panels.singlestat', []); var module = angular.module('grafana.panels.singlestat', []);
app.useModule(module); app.default.useModule(module);
module.directive('singlestatPanel', function($location, linkSrv, $timeout, templateSrv) { module.directive('singlestatPanel', function($location, linkSrv, $timeout, templateSrv) {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
import angular = require('angular'); import angular = require('angular');
import _ = require('lodash'); import _ = require('lodash');
import moment = require('moment'); import moment = require('moment');
import PanelMeta from '../../../features/panel/panel_meta'; import PanelMeta from 'app/features/panel/panel_meta2';
import {transformDataToTable} from './transformers'; import {transformDataToTable} from './transformers';
......
...@@ -11,7 +11,7 @@ function (angular, app, _, require, PanelMeta) { ...@@ -11,7 +11,7 @@ function (angular, app, _, require, PanelMeta) {
var converter; var converter;
var module = angular.module('grafana.panels.text', []); var module = angular.module('grafana.panels.text', []);
app.useModule(module); app.default.useModule(module);
module.directive('grafanaPanelText', function() { module.directive('grafanaPanelText', function() {
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment