Gitlab CSE Unil

Commit 8906dafb authored by M. Chardon's avatar M. Chardon
Browse files

concat lib css et js

correction import
parent cf1fc902
......@@ -122,7 +122,7 @@ module.exports = function(grunt) {
files: [
{
expand: true,
cwd: "lib/jujug42-bootstrap-colorpicker/dist/img/",
cwd: "lib/bootstrap-colorpicker/dist/img/",
src: ["**"],
dest: '../img/'
},
......@@ -212,9 +212,10 @@ module.exports = function(grunt) {
files: {
"../css/libs.css": [
"lib/jquery-file-upload/css/jquery.fileupload.css",
"lib/jujug42-bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
"lib/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
"lib/bootstrap-spinedit/css/bootstrap-spinedit.css",
"lib/whhg-font/css/whhg.css"
"lib/whhg-font/css/whhg.css",
"lib/select2-bootstrap/select2-bootstrap.css"
]
}
}
......
......@@ -34,6 +34,7 @@
"jquery.hotkeys": "git://github.com/jeresig/jquery.hotkeys.git#~0.2.0",
"sortablejs": "~1.6.0",
"select2": "~4.0",
"select2-bootstrap": "~1.3.0",
"zeroclipboard": "~2.3.0",
"blueimp-file-upload": "~9.20.0"
}
......
......@@ -36,11 +36,11 @@ requirejs.config({
location: '../_src/lib/paper/dist',
main: 'paper-core'
}/*,
{
name: 'typeahead',
location: '../_src/lib/typeahead.js/dist',
main: 'typeahead.jquery'
}*/],
{
name: 'jquery.typeahead',
location: '../_src/lib/typeahead.js/dist',
main: 'typeahead.jquery'
}*/],
paths: {
adim: '../_src/adim',
tools: '../_src/adim/tools',
......@@ -54,7 +54,7 @@ requirejs.config({
underscore: '../_src/lib/underscore/underscore-min',
paper: '../_src/lib/paper/dist/paper-core',
signals: '../_src/lib/signals/dist/signals.min',
FileSaver: '../_src/lib/FileSaver/FileSaver',
FileSaver: '../_src/lib/FileSaver/FileSaver.min',
canvasToBlob: '../_src/lib/blueimp-canvas-to-blob/js/canvas-to-blob.min',
zeroclipboard: '../_src/lib/zeroclipboard/dist/ZeroClipboard.min',
bloodhound: '../_src/lib/typeahead.js/dist/bloodhound',
......@@ -70,10 +70,10 @@ requirejs.config({
'jquery.fileupload-proc': "../_src/lib/jquery-file-upload/js/jquery.fileupload-process",
'jquery.mousewheel': "../_src/lib/jquery-mousewheel/jquery.mousewheel.min",
'jquery.autoGrowInput': "../_src/lib/jquery.autoGrowInput/jquery.autoGrowInput",
// 'jquery.typeahead': "../_src/lib/typeahead.js/dist/typeahead.jquery.min",
// 'jquery.typeahead': "../_src/lib/typeahead.js/dist/typeahead.jquery.min",
'jquery.hotkeys': "../_src/lib/jquery.hotkeys/jquery.hotkeys.min",
'jquery.select2': "../_src/lib/select2/dist/js/select2.full",
'jquery-migrate': '//code.jquery.com/jquery-migrate-3.0.0',
//'jquery-migrate': '//code.jquery.com/jquery-migrate-3.0.0',
'jquery.bootstrap': "../_src/lib/bootstrap/dist/js/bootstrap.min",
'bootstrap.colorpicker': "../_src/lib/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min",
......@@ -95,7 +95,7 @@ requirejs.config({
//'jquery.typeahead': { deps: ["jquery"]},
'jquery.hotkeys': { deps: ["jquery"]},
'jquery.bootstrap': { deps: ["jquery"] },
'jquery-migrate': { deps: ['jquery'], exports: 'jQuery' },
//'jquery-migrate': { deps: ['jquery'], exports: 'jQuery' },
'bootstrap.colorpicker': { deps: ["jquery.bootstrap"] },
'bootstrap.slider': { deps: ["jquery.bootstrap"] },
'bootstrap.spinedit': { deps: ["jquery.bootstrap"] },
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment