Commit de753bf3 by Torkel Ödegaard

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

parent d17f8538
///<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');
...@@ -59,8 +60,8 @@ module.filter('noXml', function() { ...@@ -59,8 +60,8 @@ 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) { ...@@ -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) { ...@@ -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) { ...@@ -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"],
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment