Merge pull request #1011 from codedge/Remove-built-public-js

Remove built.public.js
This commit is contained in:
Hillel Coren 2016-07-24 10:24:55 +03:00 committed by GitHub
commit 26c78e4a34
4 changed files with 2 additions and 14 deletions

View File

@ -116,21 +116,19 @@ module.exports = function(grunt) {
dest: 'public/built.js', dest: 'public/built.js',
nonull: true nonull: true
}, },
js_public: { /*js_public: {
src: [ src: [
/*
'public/js/simpleexpand.js', 'public/js/simpleexpand.js',
'public/js/valign.js', 'public/js/valign.js',
'public/js/bootstrap.min.js', 'public/js/bootstrap.min.js',
'public/js/simpleexpand.js', 'public/js/simpleexpand.js',
*/
'public/vendor/bootstrap/dist/js/bootstrap.min.js', 'public/vendor/bootstrap/dist/js/bootstrap.min.js',
'public/js/bootstrap-combobox.js', 'public/js/bootstrap-combobox.js',
], ],
dest: 'public/built.public.js', dest: 'public/built.public.js',
nonull: true nonull: true
}, },*/
css: { css: {
src: [ src: [
'public/vendor/bootstrap/dist/css/bootstrap.min.css', 'public/vendor/bootstrap/dist/css/bootstrap.min.css',

View File

@ -42,11 +42,5 @@ elixir(function(mix) {
* JS configuration * JS configuration
*/ */
// built.public.js
mix.scripts([
bowerDir + '/bootstrap/dist/js/bootstrap.js',
bowerDir + '/bootstrap-combobox/js/bootstrap-combobox.js'
], elixir.config.publicPath + '/built.public.js');
}); });

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long