IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(phantomjs): another fix for phantomjs rendering, #3804

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-01-21 12:56:47 +01:00
parent cbb5811d8b
commit bc05cc4977
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/views/index.html
View File

@ -59,6 +59,7 @@
<script src="[[.AppSubUrl]]/public/vendor/npm/es5-shim/es5-shim.js"></script>
<script src="[[.AppSubUrl]]/public/vendor/npm/es6-shim/es6-shim.js"></script>
<script src="[[.AppSubUrl]]/public/vendor/npm/es6-promise/dist/es6-promise.js"></script>
<script src="[[.AppSubUrl]]/public/vendor/npm/systemjs/dist/system-polyfills.js"></script>
<script src="[[.AppSubUrl]]/public/vendor/npm/systemjs/dist/system.src.js"></script>
<script src="[[.AppSubUrl]]/public/app/system.conf.js"></script>
<script src="[[.AppSubUrl]]/public/app/boot.js"></script>

5
tasks/options/concat.js
View File

@ -28,9 +28,10 @@ module.exports = function(config) {
js: {
src: [
'<%= genDir %>/vendor/npm/es6-shim/es5-shim.js',
'<%= genDir %>/vendor/npm/es5-shim/es5-shim.js',
'<%= genDir %>/vendor/npm/es6-shim/es6-shim.js',
'<%= genDir %>/vendor/npm/es6-promise/es6-promise.js',
'<%= genDir %>/vendor/npm/es6-promise/dist/es6-promise.js',
'<%= genDir %>/vendor/npm/systemjs/dist/system-polyfills.js',
'<%= genDir %>/vendor/npm/systemjs/dist/system.js',
'<%= genDir %>/app/system.conf.js',
'<%= genDir %>/app/boot.js',