opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 00:41:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

tech(typescript): added tslint to default task

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-11 08:00:13 +02:00
parent d4a701aad0
commit 166a3c4d64
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ module.filter('stringSort', function() {
module.filter('slice', function() { module.filter('slice', function() {
return function(arr, start, end) { return function(arr, start, end) {
if(!_.isUndefined(arr)) { if (!_.isUndefined(arr)) {
return arr.slice(start, end); return arr.slice(start, end);
} }
}; };
@ -23,7 +23,7 @@ module.filter('slice', function() {
module.filter('stringify', function() { module.filter('stringify', function() {
return function(arr) { return function(arr) {
if(_.isObject(arr) && !_.isArray(arr)) { if (_.isObject(arr) && !_.isArray(arr)) {
return angular.toJson(arr); return angular.toJson(arr);
} else { } else {
return _.isNull(arr) ? null : arr.toString(); return _.isNull(arr) ? null : arr.toString();
@ -32,8 +32,8 @@ module.filter('stringify', function() {
}); });
module.filter('moment', function() { module.filter('moment', function() {
return function(date,mode) { return function(date, mode) {
switch(mode) { switch (mode) {
case 'ago': case 'ago':
return moment(date).fromNow(); return moment(date).fromNow();
} }
@ -66,11 +66,12 @@ module.filter('interpolateTemplateVars', function(templateSrv) {
} else { } else {
return templateSrv.replaceWithText(text, scope.row.scopedVars); return templateSrv.replaceWithText(text, scope.row.scopedVars);
} }
} };
interpolateTemplateVars.$stateful = true; interpolateTemplateVars.$stateful = true;
return interpolateTemplateVars; return interpolateTemplateVars;
}); });
export function filters() {} // dummy export
export {};

4
public/test/karma.conf.js
View File

@ -9,9 +9,6 @@ module.exports = function(config) {
// list of files / patterns to load in the browser // list of files / patterns to load in the browser
files: [ files: [
'public/test/test-main.js', 'public/test/test-main.js',
{pattern: 'public_gen/.app_gen/**/*.js', included: false},
{pattern: 'public_gen/vendor/**/*.js', included: false},
{pattern: 'public_gen/test/**/*.js', included: false},
{pattern: 'public_gen/**/*.js', included: false} {pattern: 'public_gen/**/*.js', included: false}
], ],
@ -28,4 +25,5 @@ module.exports = function(config) {
singleRun: true, singleRun: true,
}); });
}; };

1
tasks/default_task.js
View File

@ -6,6 +6,7 @@ module.exports = function(grunt) {
grunt.registerTask('default', [ grunt.registerTask('default', [
'jscs', 'jscs',
'jshint', 'jshint',
'tslint',
'clean:gen', 'clean:gen',
'copy:public_to_gen', 'copy:public_to_gen',
'css', 'css',