mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
///<reference path="../../headers/common.d.ts" />
|
///<reference path="../../headers/common.d.ts" />
|
||||||
|
'use strict';
|
||||||
|
|
||||||
import angular = require('angular');
|
import angular = require('angular');
|
||||||
import jquery = require('jquery');
|
import jquery = require('jquery');
|
||||||
@@ -60,7 +61,7 @@ module.filter('noXml', function() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
module.filter('interpolateTemplateVars', function (templateSrv) {
|
module.filter('interpolateTemplateVars', function (templateSrv) {
|
||||||
var interpolateTemplateVars : any = function (text, scope) {
|
var filterFunc : any = function (text, scope) {
|
||||||
if (scope.panel) {
|
if (scope.panel) {
|
||||||
return templateSrv.replaceWithText(text, scope.panel.scopedVars);
|
return templateSrv.replaceWithText(text, scope.panel.scopedVars);
|
||||||
} else {
|
} else {
|
||||||
@@ -68,10 +69,8 @@ module.filter('interpolateTemplateVars', function(templateSrv) {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
interpolateTemplateVars.$stateful = true;
|
filterFunc.$stateful = true;
|
||||||
|
return filterFunc;
|
||||||
return interpolateTemplateVars;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// dummy export
|
|
||||||
export {};
|
export {};
|
||||||
|
|||||||
@@ -4,16 +4,7 @@ module.exports = function(config) {
|
|||||||
expand: true,
|
expand: true,
|
||||||
cwd:'<%= genDir %>',
|
cwd:'<%= genDir %>',
|
||||||
src: [
|
src: [
|
||||||
'app/controllers/**/*.js',
|
'app/**/*.js',
|
||||||
'app/plugins/**/*.js',
|
|
||||||
'app/directives/**/*.js',
|
|
||||||
'app/services/**/*.js',
|
|
||||||
'app/filters/**/*.js',
|
|
||||||
'app/features/**/*.js',
|
|
||||||
'app/panels/**/*.js',
|
|
||||||
'app/routes/**/*.js',
|
|
||||||
'app/app.js',
|
|
||||||
'vendor/angular/**/*.js',
|
|
||||||
],
|
],
|
||||||
dest: '<%= genDir %>'
|
dest: '<%= genDir %>'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ module.exports = function(config) {
|
|||||||
"class-name": true,
|
"class-name": true,
|
||||||
"interface-name": true,
|
"interface-name": true,
|
||||||
"semicolon": true,
|
"semicolon": true,
|
||||||
"use-strict": [true, "check-module", "check-function" ],
|
"use-strict": [false, "check-module", "check-function"],
|
||||||
"whitespace": [true, "check-branch", "check-decl", "check-type"],
|
"whitespace": [true, "check-branch", "check-decl", "check-type"],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user