Skip to content

Commit df1e52e

Browse files
torkelotorkelo
committed
tech(systemjs): more stuff is starting to work
1 parent 83ce401 commit df1e52e

27 files changed

+75
-68
lines changed

‎public/app/core/controllers/grafana_ctrl.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
///<reference path="../../headers/common.d.ts" />
22

3-
import angular = require('angular');
4-
import $ = require('jquery');
53
import config = require('app/core/config');
64
import store = require('app/core/store');
5+
6+
import angular from 'angular';
7+
import $ from 'jquery';
78
import coreModule from '../core_module';
89

910
coreModule.controller('GrafanaCtrl', function($scope, alertSrv, utilSrv, $rootScope, $controller, contextSrv) {

‎public/app/core/core.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
///<reference path="../headers/common.d.ts" />
22
///<reference path="./mod_defs.d.ts" />
33

4-
///<amd-dependency path="./directives/annotation_tooltip" />
5-
///<amd-dependency path="./directives/body_class" />
6-
///<amd-dependency path="./directives/config_modal" />
7-
///<amd-dependency path="./directives/confirm_click" />
8-
///<amd-dependency path="./directives/dash_edit_link" />
9-
///<amd-dependency path="./directives/dash_upload" />
10-
///<amd-dependency path="./directives/dropdown_typeahead" />
11-
///<amd-dependency path="./directives/grafana_version_check" />
12-
///<amd-dependency path="./directives/metric_segment" />
13-
///<amd-dependency path="./directives/misc" />
14-
///<amd-dependency path="./directives/ng_model_on_blur" />
15-
///<amd-dependency path="./directives/password_strenght" />
16-
///<amd-dependency path="./directives/spectrum_picker" />
17-
///<amd-dependency path="./directives/tags" />
18-
///<amd-dependency path="./directives/topnav" />
19-
///<amd-dependency path="./directives/value_select_dropdown" />
20-
///<amd-dependency path="./jquery_extended" />
21-
///<amd-dependency path="./partials" />
4+
import "./directives/annotation_tooltip";
5+
import "./directives/body_class";
6+
import "./directives/config_modal";
7+
import "./directives/confirm_click";
8+
import "./directives/dash_edit_link";
9+
import "./directives/dash_upload";
10+
import "./directives/dropdown_typeahead";
11+
import "./directives/grafana_version_check";
12+
import "./directives/metric_segment";
13+
import "./directives/misc";
14+
import "./directives/ng_model_on_blur";
15+
import "./directives/password_strenght";
16+
import "./directives/spectrum_picker";
17+
import "./directives/tags";
18+
import "./directives/topnav";
19+
import "./directives/value_select_dropdown";
20+
import './jquery_extended';
21+
import './partials';
2222

2323
import {arrayJoin} from './directives/array_join';
2424
import * as controllers from 'app/core/controllers/all';
2525
import * as services from 'app/core/services/all';
2626
import * as routes from 'app/core/routes/all';
27+
import './filters/filters';
2728

2829
// export * from './directives/give_focus'
29-
// export * from './filters/filters'
3030

3131
export {arrayJoin, controllers, services, routes};

‎public/app/core/core_module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
///<reference path="../headers/common.d.ts" />
22

3-
import angular = require('angular');
4-
3+
import angular from 'angular';
54
export default angular.module('grafana.core', ['ngRoute']);

‎public/app/core/directives/annotation_tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define([
66
function ($, _, coreModule) {
77
'use strict';
88

9-
coreModule.directive('annotationTooltip', function($sanitize, dashboardSrv, $compile) {
9+
coreModule.default.directive('annotationTooltip', function($sanitize, dashboardSrv, $compile) {
1010

1111
function sanitizeString(str) {
1212
try {

‎public/app/core/directives/array_join.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
///<reference path="../../headers/common.d.ts" />
22

3-
import angular = require('angular');
43
import _ = require('lodash');
4+
5+
import angular from 'angular';
56
import coreModule from '../core_module';
67

78
export function arrayJoin() {

‎public/app/core/directives/body_class.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define([
66
function (_, $, coreModule) {
77
'use strict';
88

9-
coreModule.directive('bodyClass', function() {
9+
coreModule.default.directive('bodyClass', function() {
1010
return {
1111
link: function($scope, elem) {
1212

‎public/app/core/directives/config_modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define([
66
function (_, $, coreModule) {
77
'use strict';
88

9-
coreModule.directive('configModal', function($modal, $q, $timeout) {
9+
coreModule.default.directive('configModal', function($modal, $q, $timeout) {
1010
return {
1111
restrict: 'A',
1212
link: function(scope, elem, attrs) {

‎public/app/core/directives/confirm_click.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ define([
44
function (coreModule) {
55
'use strict';
66

7-
coreModule.directive('confirmClick', function() {
7+
coreModule.default.directive('confirmClick', function() {
88
return {
99
restrict: 'A',
1010
link: function(scope, elem, attrs) {

‎public/app/core/directives/dash_edit_link.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function ($, coreModule) {
1111
'templating': { src: 'app/features/templating/partials/editor.html', title: "Templating" }
1212
};
1313

14-
coreModule.directive('dashEditorLink', function($timeout) {
14+
coreModule.default.directive('dashEditorLink', function($timeout) {
1515
return {
1616
restrict: 'A',
1717
link: function(scope, elem, attrs) {
@@ -27,7 +27,7 @@ function ($, coreModule) {
2727
};
2828
});
2929

30-
coreModule.directive('dashEditorView', function($compile, $location) {
30+
coreModule.default.directive('dashEditorView', function($compile, $location) {
3131
return {
3232
restrict: 'A',
3333
link: function(scope, elem) {

‎public/app/core/directives/dash_upload.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ define([
55
function (coreModule, kbn) {
66
'use strict';
77

8-
coreModule.directive('dashUpload', function(timer, alertSrv, $location) {
8+
coreModule.default.directive('dashUpload', function(timer, alertSrv, $location) {
99
return {
1010
restrict: 'A',
1111
link: function(scope) {

0 commit comments

Comments
 (0)