Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
de753bf3
Commit
de753bf3
authored
Sep 14, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(build): fixed issue with ngAnnotate not including files in core/*, fixes #2733
parent
d17f8538
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
17 deletions
+7
-17
public/app/core/filters/filters.ts
+5
-6
tasks/options/ngAnnotate.js
+1
-10
tasks/options/tslint.js
+1
-1
No files found.
public/app/core/filters/filters.ts
View file @
de753bf3
///<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
{};
tasks/options/ngAnnotate.js
View file @
de753bf3
...
...
@@ -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 %>'
}
...
...
tasks/options/tslint.js
View file @
de753bf3
...
...
@@ -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"
],
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment