Merge pull request #10 from mariez/master

minify js
phpList · Nov 10, 2016 · d2ddda0 · d2ddda0
2 parents 39fd677 + 2a43daf
commit d2ddda0
Show file tree

Hide file tree

Showing 5 changed files with 394 additions and 6 deletions.
diff --git a/footer_minified.inc b/footer_minified.inc
@@ -17,10 +17,7 @@
 
 <script type="text/javascript" src="ui/phplist-ui-bootstrap/js/jquery-1.12.1.min.js"></script>
 <script type="text/javascript" src="js/phplistapp.js"></script>
-<script type="text/javascript" src="ui/phplist-ui-bootstrap/js/phpList3ToBootstrap.js"></script>
-<script type="text/javascript" src="ui/phplist-ui-bootstrap/bootstrap/dist/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="ui/phplist-ui-bootstrap/js/jcarousellite_1.0.1.min.js"></script>
-<script type="text/javascript" src="ui/phplist-ui-bootstrap/js/phplist.js?v=<?php echo filemtime(dirname(__FILE__).'/js/phplist.js'); ?>"></script>
+<script type="text/javascript" src="ui/phplist-ui-bootstrap/js/dist/phpList_ui_bootstrap.min.js"></script>
 
 <script>
 /* do not remove this from here */

diff --git a/gruntfile.js b/gruntfile.js
@@ -2,6 +2,26 @@ module.exports = function(grunt) {
   require('jit-grunt')(grunt);
 
   grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    	 concat: {
+      options: {
+        separator: ';'
+      },
+      dist: {
+        src: ['js/phpList3ToBootstrap.js','bootstrap/dist/js/bootstrap.min.js','js/jcarousellite_1.0.1.min.js','js/phplist.js'],
+        dest: 'js/dist/<%= pkg.name %>.js'
+      }
+    },
+    uglify: {
+      options: {
+        banner: '/*! <%= pkg.name %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
+      },
+      dist: {
+        files: {
+          'js/dist/<%= pkg.name %>.min.js': ['<%= concat.dist.dest %>']
+        }
+      }
+    },
     less: {
       development: {
         options: {
@@ -24,6 +44,7 @@ module.exports = function(grunt) {
       }
     }
   });
-
-  grunt.registerTask('default', ['less', 'watch']);
+	grunt.loadNpmTasks('grunt-contrib-concat');
+	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.registerTask('default', ['less', 'watch','concat','uglify']);
 };