This commit is contained in:
Jack Grigg 2016-09-11 03:26:18 +12:00
parent b6a64af705
commit 4def8706b1
4 changed files with 23 additions and 5 deletions

View File

@ -26,7 +26,10 @@ module.exports = function(grunt) {
}
},
vendors: {
src: ['public/src/js/ios-imagefile-megapixel/megapix-image.js', 'public/lib/qrcode-generator/js/qrcode.js', 'public/src/js/jsqrcode/grid.js', 'public/src/js/jsqrcode/version.js', 'public/src/js/jsqrcode/detector.js', 'public/src/js/jsqrcode/formatinf.js', 'public/src/js/jsqrcode/errorlevel.js', 'public/src/js/jsqrcode/bitmat.js', 'public/src/js/jsqrcode/datablock.js', 'public/src/js/jsqrcode/bmparser.js', 'public/src/js/jsqrcode/datamask.js', 'public/src/js/jsqrcode/rsdecoder.js', 'public/src/js/jsqrcode/gf256poly.js', 'public/src/js/jsqrcode/gf256.js', 'public/src/js/jsqrcode/decoder.js', 'public/src/js/jsqrcode/qrcode.js', 'public/src/js/jsqrcode/findpat.js', 'public/src/js/jsqrcode/alignpat.js', 'public/src/js/jsqrcode/databr.js', 'public/lib/moment/min/moment.min.js', 'public/lib/moment/lang/es.js', 'public/lib/zeroclipboard/ZeroClipboard.min.js'],
src: ['public/src/js/ios-imagefile-megapixel/megapix-image.js', 'public/lib/qrcode-generator/js/qrcode.js', 'public/src/js/jsqrcode/grid.js', 'public/src/js/jsqrcode/version.js', 'public/src/js/jsqrcode/detector.js', 'public/src/js/jsqrcode/formatinf.js', 'public/src/js/jsqrcode/errorlevel.js', 'public/src/js/jsqrcode/bitmat.js', 'public/src/js/jsqrcode/datablock.js', 'public/src/js/jsqrcode/bmparser.js', 'public/src/js/jsqrcode/datamask.js', 'public/src/js/jsqrcode/rsdecoder.js', 'public/src/js/jsqrcode/gf256poly.js', 'public/src/js/jsqrcode/gf256.js', 'public/src/js/jsqrcode/decoder.js', 'public/src/js/jsqrcode/qrcode.js', 'public/src/js/jsqrcode/findpat.js', 'public/src/js/jsqrcode/alignpat.js', 'public/src/js/jsqrcode/databr.js', 'public/lib/moment/min/moment.min.js', 'public/lib/moment/lang/es.js', 'public/lib/zeroclipboard/ZeroClipboard.min.js',
'public/lib/c3/c3.min.js',
'public/lib/d3/d3.min.js'
],
dest: 'public/js/vendors.js'
},
angular: {
@ -38,7 +41,11 @@ module.exports = function(grunt) {
dest: 'public/js/main.js'
},
css: {
src: ['public/lib/bootstrap/dist/css/bootstrap.min.css', 'public/src/css/**/*.css'],
src: [
'public/lib/bootstrap/dist/css/bootstrap.min.css',
'public/lib/c3/c3.min.css',
'public/src/css/**/*.css'
],
dest: 'public/css/main.css'
}
},

View File

@ -14,6 +14,7 @@
"ngprogress": "~1.0.4",
"angular-ui-utils": "~0.1.1",
"angular-gettext": "~1.1.0",
"angular-moment": "1.0.0-beta.6"
"angular-moment": "1.0.0-beta.6",
"c3": "~0.4.11"
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long