diff --git a/Gruntfile.js b/Gruntfile.js index 26129f641..7da72c692 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -72,10 +72,10 @@ module.exports = function(grunt) { }, minjs: { options: { - starttag: '', + starttag: '', }, files: { - 'app/Views/partial/header.php': [ospos_min_css] + 'app/Views/partial/header.php': [ospos_min_js] }, }, css_login: { @@ -126,7 +126,7 @@ module.exports = function(grunt) { concat: { js: { options: { - separator: ';' + separator: '\n' }, files: { 'tmp/opensourcepos.js': ['public/dist/jquery/jquery.js', 'tmp/opensourcepos_bower.js', 'public/js/*.js'] diff --git a/app/Views/partial/header.php b/app/Views/partial/header.php index e52e209f2..013334475 100644 --- a/app/Views/partial/header.php +++ b/app/Views/partial/header.php @@ -39,7 +39,7 @@ $request = Services::request(); - + diff --git a/grunt045/Gruntfile.js b/grunt045/Gruntfile.js index 82fd061f4..6c9440464 100644 --- a/grunt045/Gruntfile.js +++ b/grunt045/Gruntfile.js @@ -13,11 +13,11 @@ module.exports = function(grunt) { 'dist/extensions/sticky-header/bootstrap-table-sticky-header.min.js', 'dist/extensions/sticky-header/bootstrap-table-sticky-header.css' ], - 'chartist-plugin-axistitle': [ "./dist/chartist-plugin-axistitle.min.js"] + 'chartist-plugin-axistitle': [ "dist/chartist-plugin-axistitle.min.js"] }, dest: { - 'js': '../../tmp/opensourcepos_bower.js', - 'css': '../../tmp/opensourcepos_bower.css' + 'js': '../tmp/opensourcepos_bower.js', + 'css': '../tmp/opensourcepos_bower.css' } } },