IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(lodash): changed how lodash is referenced from typescript

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-12-22 13:59:11 +01:00
parent e95170e9fd
commit f074c1eaff
19 changed files with 42 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/controllers/grafana_ctrl.ts
View File

@ -1,8 +1,8 @@
///<reference path="../../headers/common.d.ts" />
import config = require('app/core/config');
import store = require('app/core/store');
import config from 'app/core/config';
import store from 'app/core/store';
import _ from 'lodash';
import angular from 'angular';
import $ from 'jquery';
import coreModule from '../core_module';

4
public/app/core/controllers/signup_ctrl.ts
View File

@ -1,7 +1,7 @@
///<reference path="../../headers/common.d.ts" />
import angular = require('angular');
import config = require('app/core/config');
import angular from 'angular';
import config from 'app/core/config';
import coreModule from '../core_module';
export class SignUpCtrl {

3
public/app/core/directives/array_join.ts
View File

@ -1,7 +1,6 @@
///<reference path="../../headers/common.d.ts" />
import _ = require('lodash');
import _ from 'lodash';
import angular from 'angular';
import coreModule from '../core_module';

5
public/app/core/filters/filters.ts
View File

@ -1,8 +1,7 @@
///<reference path="../../headers/common.d.ts" />
import jquery = require('jquery');
import _ = require('lodash');
import jquery from 'jquery';
import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
import coreModule from '../core_module';

4
public/app/core/time_series2.ts
View File

@ -1,7 +1,7 @@
///<reference path="../headers/common.d.ts" />
import _ = require('lodash');
import kbn = require('app/core/utils/kbn');
import kbn from 'app/core/utils/kbn';
import _ from 'lodash';
function matchSeriesOverride(aliasOrRegex, seriesAlias) {
if (!aliasOrRegex) { return false; }

2
public/app/core/utils/datemath.ts
View File

@ -1,6 +1,6 @@
///<reference path="../../headers/common.d.ts" />
import _ = require('lodash');
import _ from 'lodash';
import moment from 'moment';
var units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];

3
public/app/core/utils/rangeutil.ts
View File

@ -1,7 +1,6 @@
///<reference path="../../headers/common.d.ts" />
import _ = require('lodash');
import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
import * as dateMath from './datemath';

6
public/app/features/dashboard/timepicker/timepicker.ts
View File

@ -1,11 +1,11 @@
///<reference path="../../../headers/common.d.ts" />
///<amd-dependency path="./input_date" name="inputDate" />
import _ = require('lodash');
import kbn = require('app/core/utils/kbn');
import _ from 'lodash';
import kbn from 'app/core/utils/kbn';
import angular from 'angular';
import moment from 'moment';
import * as dateMath from 'app/core/utils/datemath';
import * as rangeUtil from 'app/core/utils/rangeutil';

6
public/app/grafana.ts
View File

@ -12,10 +12,8 @@ import 'app/core/core';
import $ from 'jquery';
import angular from 'angular';
import _ = require('lodash');
import bootstrap = require('bootstrap');
import kbn = require('app/core/utils/kbn');
import config = require('app/core/config');
import config from 'app/core/config';
import _ from 'lodash';
export class GrafanaApp {
registerFunctions: any;

39
public/app/headers/common.d.ts vendored
View File

@ -1,17 +1,21 @@
///<reference path="lodash/lodash.d.ts" />
///<reference path="../../vendor/npm/angular2/typings/tsd.d.ts" />
///<reference path="../../vendor/npm/angular2/manual_typings/globals.d.ts" />
declare var System: any;
// dummy modules
declare module 'app/core/config' {
var config : any;
export = config;
export default config;
}
declare var System: any;
declare module 'lodash' {
var lodash: any;
export default lodash;
}
declare module 'moment' {
var moment : any;
var moment: any;
export default moment;
}
@ -27,35 +31,12 @@ declare module 'jquery' {
declare module 'app/core/utils/kbn' {
var kbn: any;
export = kbn;
export default kbn;
}
declare module 'app/core/store' {
var store : any;
export = store;
export default store;
}
declare module 'angular-route' {
var kbn : any;
export = kbn;
}
declare module 'angular-sanitize' {
var kbn : any;
export = kbn;
}
declare module 'bootstrap' {
var kbn : any;
export = kbn;
}
declare module 'angular-strap' {
var kbn : any;
export = kbn;
}
declare module 'angular-dragdrop' {
var kbn : any;
export = kbn;
}

2
public/app/plugins/datasource/influxdb/influx_query.ts
View File

@ -1,6 +1,6 @@
///<reference path="../../../headers/common.d.ts" />
import _ = require('lodash');
import _ from 'lodash';
import queryPart from './query_part';
export default class InfluxQuery {

2
public/app/plugins/datasource/influxdb/query_part.ts
View File

@ -1,6 +1,6 @@
///<reference path="../../../headers/common.d.ts" />
import _ = require('lodash');
import _ from 'lodash';
var index = [];
var categories = {

7
public/app/plugins/panels/table/controller.ts
View File

@ -1,10 +1,9 @@
///<reference path="../../../headers/common.d.ts" />
import angular = require('angular');
import _ = require('lodash');
import moment = require('moment');
import angular from 'angular';
import _ from 'lodash';
import moment from 'moment';
import PanelMeta from 'app/features/panel/panel_meta2';
import {transformDataToTable} from './transformers';
export class TablePanelCtrl {

5
public/app/plugins/panels/table/editor.ts
View File

@ -1,12 +1,13 @@
///<reference path="../../../headers/common.d.ts" />
import _ = require('lodash');
import kbn = require('app/core/utils/kbn');
import _ from 'lodash';
import $ from 'jquery';
import moment from 'moment';
import angular from 'angular';
import {transformers} from './transformers';
import kbn from 'app/core/utils/kbn';
export class TablePanelEditorCtrl {

2
public/app/plugins/panels/table/module.ts
View File

@ -1,8 +1,8 @@
///<reference path="../../../headers/common.d.ts" />
import _ = require('lodash');
import kbn = require('app/core/utils/kbn');
import _ from 'lodash';
import $ from 'jquery';
import moment from 'moment';
import angular from 'angular';

4
public/app/plugins/panels/table/renderer.ts
View File

@ -1,8 +1,8 @@
///<reference path="../../../headers/common.d.ts" />
import _ = require('lodash');
import kbn = require('app/core/utils/kbn');
import _ from 'lodash';
import moment from 'moment';
import kbn from 'app/core/utils/kbn';
export class TableRenderer {
formaters: any[];

4
public/app/plugins/panels/table/transformers.ts
View File

@ -1,7 +1,7 @@
///<reference path="../../../headers/common.d.ts" />
import moment = require('moment');
import _ = require('lodash');
import _ from 'lodash';
import moment from 'moment';
import flatten from '../../../core/utils/flatten';
import TimeSeries from '../../../core/time_series2';
import TableModel from '../../../core/table_model';

2
public/test/core/utils/datemath_specs.ts
View File

@ -1,8 +1,8 @@
import {describe, beforeEach, it, sinon, expect} from 'test/lib/common'
import * as dateMath from 'app/core/utils/datemath';
import * as _ from 'lodash';
import moment from 'moment';
import _ from 'lodash';
describe("DateMath", () => {
var spans = ['s', 'm', 'h', 'd', 'w', 'M', 'y'];

2
public/test/core/utils/rangeutil_specs.ts
View File

@ -1,7 +1,7 @@
import {describe, beforeEach, it, sinon, expect} from 'test/lib/common'
import * as rangeUtil from 'app/core/utils/rangeutil';
import * as _ from 'lodash';
import _ from 'lodash';
import moment from 'moment';
describe("rangeUtil", () => {