mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
working on angular partials pre caching, reving
This commit is contained in:
parent
3f9a8ecc7e
commit
fc7b4df98a
@ -44,7 +44,9 @@
|
|||||||
"karma-mocha": "~0.1.1",
|
"karma-mocha": "~0.1.1",
|
||||||
"karma-expect": "~1.0.0",
|
"karma-expect": "~1.0.0",
|
||||||
"grunt-cli": "~0.1.13",
|
"grunt-cli": "~0.1.13",
|
||||||
"jshint-stylish": "~0.1.5"
|
"jshint-stylish": "~0.1.5",
|
||||||
|
"grunt-contrib-concat": "^0.4.0",
|
||||||
|
"grunt-angular-templates": "^0.5.5"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "0.10.x",
|
"node": "0.10.x",
|
||||||
@ -55,6 +57,5 @@
|
|||||||
},
|
},
|
||||||
"license": "Apache License",
|
"license": "Apache License",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"grunt-contrib-concat": "^0.4.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -98,8 +98,9 @@ function (angular, $, _, appLevelRequire) {
|
|||||||
'pasvaz.bindonce'
|
'pasvaz.bindonce'
|
||||||
];
|
];
|
||||||
|
|
||||||
_.each('controllers directives factories services services.dashboard filters'.split(' '),
|
var module_types = ['controllers', 'directives', 'factories', 'services', 'services.dashboard', 'filters'];
|
||||||
function (type) {
|
|
||||||
|
_.each(module_types, function (type) {
|
||||||
var module_name = 'kibana.'+type;
|
var module_name = 'kibana.'+type;
|
||||||
// create the module
|
// create the module
|
||||||
app.useModule(angular.module(module_name, []));
|
app.useModule(angular.module(module_name, []));
|
||||||
@ -117,7 +118,8 @@ function (angular, $, _, appLevelRequire) {
|
|||||||
require([
|
require([
|
||||||
'controllers/all',
|
'controllers/all',
|
||||||
'directives/all',
|
'directives/all',
|
||||||
'filters/all'
|
'filters/all',
|
||||||
|
'components/partials',
|
||||||
], function () {
|
], function () {
|
||||||
|
|
||||||
// bootstrap the app
|
// bootstrap the app
|
||||||
|
2
src/app/components/partials.js
Normal file
2
src/app/components/partials.js
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
define([
|
||||||
|
], function () {});
|
3789
src/css/default.min.css
vendored
3789
src/css/default.min.css
vendored
File diff suppressed because it is too large
Load Diff
@ -6,8 +6,10 @@ module.exports = function(grunt) {
|
|||||||
'jshint:tests',
|
'jshint:tests',
|
||||||
'clean:on_start',
|
'clean:on_start',
|
||||||
'less:src',
|
'less:src',
|
||||||
|
'concat:css',
|
||||||
'copy:everything_but_less_to_temp',
|
'copy:everything_but_less_to_temp',
|
||||||
'htmlmin:build',
|
'htmlmin:build',
|
||||||
|
'ngtemplates:app',
|
||||||
'cssmin:build',
|
'cssmin:build',
|
||||||
'ngmin:build',
|
'ngmin:build',
|
||||||
'requirejs:build',
|
'requirejs:build',
|
||||||
|
@ -5,8 +5,8 @@ module.exports = function(config) {
|
|||||||
'<%= srcDir %>/css/normalize.min.css',
|
'<%= srcDir %>/css/normalize.min.css',
|
||||||
'<%= srcDir %>/css/bootstrap.dark.min.css',
|
'<%= srcDir %>/css/bootstrap.dark.min.css',
|
||||||
'<%= srcDir %>/css/timepicker.css',
|
'<%= srcDir %>/css/timepicker.css',
|
||||||
'<%= srcDir &>/css/spectrum.css',
|
'<%= srcDir %>/css/spectrum.css',
|
||||||
'<%= srcDir &>/css/animate.min.css'
|
'<%= srcDir %>/css/animate.min.css'
|
||||||
],
|
],
|
||||||
dest: '<%= srcDir %>/css/default.min.css'
|
dest: '<%= srcDir %>/css/default.min.css'
|
||||||
},
|
},
|
||||||
|
9
tasks/options/ngtemplates.js
Normal file
9
tasks/options/ngtemplates.js
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
module.exports = function(config) {
|
||||||
|
return {
|
||||||
|
kibana: {
|
||||||
|
cwd: '<%= tempDir %>',
|
||||||
|
src: 'app/**/*.html',
|
||||||
|
dest: '<%= tempDir %>/app/components/partials.js',
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user