fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733

pull/2746/head
Torkel Ödegaard 10 years ago
parent d17f8538b2
commit de753bf330
  1. 11
      public/app/core/filters/filters.ts
  2. 11
      tasks/options/ngAnnotate.js
  3. 2
      tasks/options/tslint.js

@ -1,4 +1,5 @@
///<reference path="../../headers/common.d.ts" />
'use strict';
import angular = require('angular');
import jquery = require('jquery');
@ -59,8 +60,8 @@ module.filter('noXml', function() {
};
});
module.filter('interpolateTemplateVars', function(templateSrv) {
var interpolateTemplateVars : any = function (text, scope) {
module.filter('interpolateTemplateVars', function (templateSrv) {
var filterFunc : any = function (text, scope) {
if (scope.panel) {
return templateSrv.replaceWithText(text, scope.panel.scopedVars);
} else {
@ -68,10 +69,8 @@ module.filter('interpolateTemplateVars', function(templateSrv) {
}
};
interpolateTemplateVars.$stateful = true;
return interpolateTemplateVars;
filterFunc.$stateful = true;
return filterFunc;
});
// dummy export
export {};

@ -4,16 +4,7 @@ module.exports = function(config) {
expand: true,
cwd:'<%= genDir %>',
src: [
'app/controllers/**/*.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',
'app/**/*.js',
],
dest: '<%= genDir %>'
}

@ -14,7 +14,7 @@ module.exports = function(config) {
"class-name": true,
"interface-name": 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"],
}
}

Loading…
Cancel
Save