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) {

‎public/app/core/directives/dropdown_typeahead.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('dropdownTypeahead', function($compile) {
9+
coreModule.default.directive('dropdownTypeahead', function($compile) {
1010

1111
var inputTemplate = '<input type="text"'+
1212
' class="tight-form-input input-medium tight-form-input"' +

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import angular = require('angular');
44
import coreModule from '../core_module';
55

6-
coreModule.directive('giveFocus', function() {
6+
coreModule.default.directive('giveFocus', function() {
77
return function(scope, element, attrs) {
88
element.click(function(e) {
99
e.stopPropagation();

‎public/app/core/directives/grafana_version_check.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('grafanaVersionCheck', function($http, contextSrv) {
7+
coreModule.default.directive('grafanaVersionCheck', function($http, contextSrv) {
88
return {
99
restrict: 'A',
1010
link: function(scope, elem) {

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

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

9-
coreModule.directive('metricSegment', function($compile, $sce) {
9+
coreModule.default.directive('metricSegment', function($compile, $sce) {
1010
var inputTemplate = '<input type="text" data-provide="typeahead" ' +
1111
' class="tight-form-clear-input input-medium"' +
1212
' spellcheck="false" style="display:none"></input>';
@@ -157,7 +157,7 @@ function (_, $, coreModule) {
157157
};
158158
});
159159

160-
coreModule.directive('metricSegmentModel', function(uiSegmentSrv, $q) {
160+
coreModule.default.directive('metricSegmentModel', function(uiSegmentSrv, $q) {
161161
return {
162162
template: '<metric-segment segment="segment" get-options="getOptionsInternal()" on-change="onSegmentChange()"></metric-segment>',
163163
restrict: 'E',

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define([
66
function (angular, coreModule, kbn) {
77
'use strict';
88

9-
coreModule.directive('tip', function($compile) {
9+
coreModule.default.directive('tip', function($compile) {
1010
return {
1111
restrict: 'E',
1212
link: function(scope, elem, attrs) {
@@ -18,7 +18,7 @@ function (angular, coreModule, kbn) {
1818
};
1919
});
2020

21-
coreModule.directive('watchChange', function() {
21+
coreModule.default.directive('watchChange', function() {
2222
return {
2323
scope: { onchange: '&watchChange' },
2424
link: function(scope, element) {
@@ -31,7 +31,7 @@ function (angular, coreModule, kbn) {
3131
};
3232
});
3333

34-
coreModule.directive('editorOptBool', function($compile) {
34+
coreModule.default.directive('editorOptBool', function($compile) {
3535
return {
3636
restrict: 'E',
3737
link: function(scope, elem, attrs) {
@@ -51,7 +51,7 @@ function (angular, coreModule, kbn) {
5151
};
5252
});
5353

54-
coreModule.directive('editorCheckbox', function($compile, $interpolate) {
54+
coreModule.default.directive('editorCheckbox', function($compile, $interpolate) {
5555
return {
5656
restrict: 'E',
5757
link: function(scope, elem, attrs) {
@@ -73,7 +73,7 @@ function (angular, coreModule, kbn) {
7373
};
7474
});
7575

76-
coreModule.directive('gfDropdown', function ($parse, $compile, $timeout) {
76+
coreModule.default.directive('gfDropdown', function ($parse, $compile, $timeout) {
7777
function buildTemplate(items, placement) {
7878
var upclass = placement === 'top' ? 'dropup' : '';
7979
var ul = [

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define([
66
function (coreModule, kbn, rangeUtil) {
77
'use strict';
88

9-
coreModule.directive('ngModelOnblur', function() {
9+
coreModule.default.directive('ngModelOnblur', function() {
1010
return {
1111
restrict: 'A',
1212
priority: 1,
@@ -26,7 +26,7 @@ function (coreModule, kbn, rangeUtil) {
2626
};
2727
});
2828

29-
coreModule.directive('emptyToNull', function () {
29+
coreModule.default.directive('emptyToNull', function () {
3030
return {
3131
restrict: 'A',
3232
require: 'ngModel',
@@ -39,7 +39,7 @@ function (coreModule, kbn, rangeUtil) {
3939
};
4040
});
4141

42-
coreModule.directive('validTimeSpan', function() {
42+
coreModule.default.directive('validTimeSpan', function() {
4343
return {
4444
require: 'ngModel',
4545
link: function(scope, elm, attrs, ctrl) {

‎public/app/core/directives/password_strenght.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('passwordStrength', function() {
7+
coreModule.default.directive('passwordStrength', function() {
88
var template = '<div class="password-strength small" ng-if="!loginMode" ng-class="strengthClass">' +
99
'<em>{{strengthText}}</em>' +
1010
'</div>';

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

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

9-
coreModule.directive('spectrumPicker', function() {
9+
coreModule.default.directive('spectrumPicker', function() {
1010
return {
1111
restrict: 'E',
1212
require: 'ngModel',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function (angular, $, coreModule) {
3939
element.css("border-color", borderColor);
4040
}
4141

42-
coreModule.directive('tagColorFromName', function() {
42+
coreModule.default.directive('tagColorFromName', function() {
4343
return {
4444
scope: { tagColorFromName: "=" },
4545
link: function (scope, element) {
@@ -48,7 +48,7 @@ function (angular, $, coreModule) {
4848
};
4949
});
5050

51-
coreModule.directive('bootstrapTagsinput', function() {
51+
coreModule.default.directive('bootstrapTagsinput', function() {
5252

5353
function getItemProperty(scope, property) {
5454
if (!property) {

‎public/app/core/directives/topnav.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('topnav', function($rootScope, contextSrv) {
7+
coreModule.default.directive('topnav', function($rootScope, contextSrv) {
88
return {
99
restrict: 'E',
1010
transclude: true,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ define([
66
function (angular, _, coreModule) {
77
'use strict';
88

9-
coreModule.controller('ValueSelectDropdownCtrl', function($q) {
9+
coreModule.default.controller('ValueSelectDropdownCtrl', function($q) {
1010
var vm = this;
1111

1212
vm.show = function() {
@@ -224,7 +224,7 @@ function (angular, _, coreModule) {
224224

225225
});
226226

227-
coreModule.directive('valueSelectDropdown', function($compile, $window, $timeout, $rootScope) {
227+
coreModule.default.directive('valueSelectDropdown', function($compile, $window, $timeout, $rootScope) {
228228
return {
229229
scope: { variable: "=", onUpdated: "&", getValuesForTag: "&" },
230230
templateUrl: 'app/partials/valueSelectDropdown.html',

‎public/app/core/filters/filters.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');
43
import jquery = require('jquery');
5-
import moment = require('moment');
64
import _ = require('lodash');
5+
6+
import angular from 'angular';
7+
import moment from 'moment';
78
import coreModule from '../core_module';
89

910
coreModule.filter('stringSort', function() {

‎public/app/core/utils/datemath.ts

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

33
import _ = require('lodash');
4-
import moment = require('moment');
4+
import moment from 'moment';
55

66
var units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
77
var unitsAsc = _.sortBy(units, function (unit) {

‎public/app/grafana_app.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import 'angular-bindonce';
1010
import 'angular-ui';
1111
import 'app/core/core';
1212

13+
import $ from 'jquery';
14+
import angular from 'angular';
1315
import _ = require('lodash');
14-
import $ = require('jquery');
1516
import bootstrap = require('bootstrap');
1617
import kbn = require('app/core/utils/kbn');
17-
import angular = require('angular');
1818
import config = require('app/core/config');
1919

2020
export class GrafanaApp {
@@ -66,8 +66,7 @@ export class GrafanaApp {
6666
this.useModule(angular.module(moduleName, []));
6767
});
6868

69-
//var preBootRequires = [System.import('app/features/all')];
70-
var preBootRequires = [];
69+
var preBootRequires = [System.import('app/features/all')];
7170
var pluginModules = config.bootData.pluginModules || [];
7271

7372
// add plugin modules

0 commit comments

Comments
 (0)