Commit fc7b4df9 by Torkel Ödegaard

working on angular partials pre caching, reving

parent 3f9a8ecc
......@@ -44,7 +44,9 @@
"karma-mocha": "~0.1.1",
"karma-expect": "~1.0.0",
"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": {
"node": "0.10.x",
......@@ -55,6 +57,5 @@
},
"license": "Apache License",
"dependencies": {
"grunt-contrib-concat": "^0.4.0"
}
}
......@@ -98,8 +98,9 @@ function (angular, $, _, appLevelRequire) {
'pasvaz.bindonce'
];
_.each('controllers directives factories services services.dashboard filters'.split(' '),
function (type) {
var module_types = ['controllers', 'directives', 'factories', 'services', 'services.dashboard', 'filters'];
_.each(module_types, function (type) {
var module_name = 'kibana.'+type;
// create the module
app.useModule(angular.module(module_name, []));
......@@ -117,7 +118,8 @@ function (angular, $, _, appLevelRequire) {
require([
'controllers/all',
'directives/all',
'filters/all'
'filters/all',
'components/partials',
], function () {
// bootstrap the app
......
define([
], function () {});
......@@ -6,8 +6,10 @@ module.exports = function(grunt) {
'jshint:tests',
'clean:on_start',
'less:src',
'concat:css',
'copy:everything_but_less_to_temp',
'htmlmin:build',
'ngtemplates:app',
'cssmin:build',
'ngmin:build',
'requirejs:build',
......
......@@ -2,11 +2,11 @@ module.exports = function(config) {
return {
css: {
src: [
'<%= srcDir %>/css/normalize.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css',
'<%= srcDir %>/css/timepicker.css',
'<%= srcDir &>/css/spectrum.css',
'<%= srcDir &>/css/animate.min.css'
'<%= srcDir %>/css/normalize.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css',
'<%= srcDir %>/css/timepicker.css',
'<%= srcDir %>/css/spectrum.css',
'<%= srcDir %>/css/animate.min.css'
],
dest: '<%= srcDir %>/css/default.min.css'
},
......
module.exports = function(config) {
return {
kibana: {
cwd: '<%= tempDir %>',
src: 'app/**/*.html',
dest: '<%= tempDir %>/app/components/partials.js',
}
};
};
\ No newline at end of file
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