Merge branch 'trunk' of D:\incubator-ambari with conflicts.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2fc2da4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2fc2da4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2fc2da4 Branch: refs/heads/trunk Commit: e2fc2da45e6b392502dee2955096371cf21c3398 Parents: 6f1e476 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Mon Nov 10 12:28:14 2014 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Mon Nov 10 14:32:14 2014 +0200 ---------------------------------------------------------------------- ambari-web/karma.conf.js | 4 +-- .../jobs/src/main/resources/ui/Gruntfile.js | 36 +++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e2fc2da4/ambari-web/karma.conf.js ---------------------------------------------------------------------- diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js index 3a54978..d5351a6 100644 --- a/ambari-web/karma.conf.js +++ b/ambari-web/karma.conf.js @@ -102,7 +102,7 @@ module.exports = function(config) { }, preprocessors: { -// '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage', + '!(vendor|node_modules|test)/**/!(karma_setup|tests).js': 'coverage', 'app/templates/**/*.hbs': ['ember-precompiler-brunch', 'common-require'], 'app!(assets)/**/!(karma_setup|tests).js': ['common-require'], 'test/**/*.js': ['common-require'] @@ -117,7 +117,7 @@ module.exports = function(config) { // test results reporter to use // possible values: 'dots', 'progress', 'junit', 'growl', 'coverage' // reporters: ['progress', 'coverage'], - reporters: ['progress'], + reporters: ['progress', 'coverage'], // web server port http://git-wip-us.apache.org/repos/asf/ambari/blob/e2fc2da4/contrib/views/jobs/src/main/resources/ui/Gruntfile.js ---------------------------------------------------------------------- diff --git a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js index f5c13e6..ba69c24 100644 --- a/contrib/views/jobs/src/main/resources/ui/Gruntfile.js +++ b/contrib/views/jobs/src/main/resources/ui/Gruntfile.js @@ -181,6 +181,18 @@ module.exports = function (grunt) { dirs: ['<%= yeoman.dist %>'] } }, + imagemin: { + dist: { + files: [ + { + expand: true, + cwd: '<%= yeoman.app %>/images', + src: '{,*/}*.{png,jpg,jpeg}', + dest: '<%= yeoman.dist %>/images' + } + ] + } + }, svgmin: { dist: { files: [ @@ -260,24 +272,22 @@ module.exports = function (grunt) { cwd: '<%= yeoman.app %>', dest: '<%= yeoman.dist %>', src: [ - '*.{ico,txt}', + '*.{ico,txt,php}', '.htaccess', 'img/*', 'styles/fonts/*', 'scripts/assets/**/*' ] - }, - { - expand: true, - flatten: true, - src: '<%= yeoman.app %>/bower_components/jquery-ui/themes/base/images/*', - dest: '<%= yeoman.dist %>/styles/images/' - }, + } + ] + }, + xampp: { + files: [ { expand: true, - flatten: true, - src: '<%= yeoman.app %>/bower_components/font-awesome/font/*', - dest: '<%= yeoman.dist %>/font/' + flatten: false, + src: '<%= yeoman.dist %>/**/*', + dest: 'D:/xampp/htdocs/' } ] } @@ -291,6 +301,7 @@ module.exports = function (grunt) { ], dist: [ 'emberTemplates', + 'imagemin', 'svgmin', 'htmlmin' ] @@ -385,7 +396,8 @@ module.exports = function (grunt) { //'uglify', 'copy:dist', //'rev', - 'usemin' + 'usemin', + 'copy:xampp' ]); grunt.registerTask('default', [