Gitlab CSE Unil
Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
M. Chardon
ADIM
Commits
28b562a0
Commit
28b562a0
authored
Feb 26, 2018
by
M. Chardon
Browse files
ménage lib bower
parent
5dee0b9c
Changes
5
Hide whitespace changes
Inline
Side-by-side
adim_project/adim_app/static/_src/adim/helper/exporter.js
View file @
28b562a0
...
...
@@ -5,7 +5,7 @@ define([
"
adim/view
"
,
"
adim/config
"
,
"
canvasToBlob
"
//
"canvasToBlob"
],
function
(
$
,
paper
,
saveAs
,
view
,
config
)
{
var
zipLoaded
=
false
;
...
...
adim_project/adim_app/static/_src/adim/ui.js
View file @
28b562a0
...
...
@@ -42,7 +42,7 @@ define([
"
bootstrap.slider
"
,
"
jquery.autoGrowInput
"
,
"
bootstrap.rating
"
,
"
FileSaver
"
,
//
"FileSaver",
"
fontawesome
"
],
function
(
$
,
_
,
Signal
,
paper
,
config
,
view
,
io
,
tools
,
attributes
,
Users
,
exporter
,
AnObjMgr
)
{
...
...
adim_project/adim_app/static/_src/anobj-mgr/views/anobj/properties-panel.js
View file @
28b562a0
...
...
@@ -26,8 +26,7 @@ define([
"
anobj-mgr/config
"
,
"
adim/users
"
,
"
jquery.typeahead
"
,
//"jquery.select2"
"
jquery.typeahead
"
],
function
(
$
,
_
,
Backbone
,
config
,
Users
)
{
...
...
adim_project/adim_app/static/_src/bower.json
View file @
28b562a0
...
...
@@ -2,7 +2,8 @@
"name"
:
"adim"
,
"version"
:
"0.0.0"
,
"authors"
:
[
"Julien Furrer <Julien.Furrer@unil.com>"
"Julien Furrer <Julien.Furrer@unil.ch>"
,
"Marion Chardon <Marion.Chardon@unil.ch>"
],
"description"
:
"Annotation d'Image"
,
"license"
:
"GPLv3"
,
...
...
@@ -13,28 +14,24 @@
"bower_components"
],
"dependencies"
:
{
"requirejs"
:
""
,
"requirejs-i18n"
:
""
,
"jquery"
:
""
,
"bootstrap"
:
""
,
"jquery-mousewheel"
:
"~3.1.11"
,
"FileSaver"
:
"~1.3.4"
,
"blob"
:
"*"
,
"paper"
:
"~0.11.5"
,
"jquery.autoGrowInput"
:
"~0.0.2"
,
"signals"
:
"~1.0.0"
,
"bootstrap-spinedit"
:
"https://github.com/jujug42/bootstrap-spinedit.git#*"
,
"seiyria-bootstrap-slider"
:
"~10.0.0"
,
"backbone"
:
"~1.3.3"
,
"
jquery-file-upload
"
:
"~
9.2
0.0"
,
"
bootstrap
"
:
"~
4.
0.0"
,
"bootstrap-colorpicker"
:
"~2.5.1"
,
"bootstrap3-typeahead"
:
"https://github.com/bassjobsen/Bootstrap-3-Typeahead.git#master"
,
"typeahead.js"
:
"~0.11.1"
,
"bootstrap-rating-input"
:
"~0.4.0"
,
"fontawesome"
:
"~5.0.6"
,
"jquery"
:
""
,
"jquery-file-upload"
:
"~9.21.0"
,
"jquery-mousewheel"
:
"~3.1.11"
,
"jquery.autoGrowInput"
:
"~0.0.2"
,
"jquery.hotkeys"
:
"git://github.com/jeresig/jquery.hotkeys.git#~0.2.0"
,
"paper"
:
"~0.11.5"
,
"popper.js"
:
"~1.12.9"
,
"requirejs"
:
""
,
"requirejs-i18n"
:
""
,
"seiyria-bootstrap-slider"
:
"~10.0.0"
,
"signals"
:
"~1.0.0"
,
"sortablejs"
:
"~1.6.0"
,
"blueimp-file-upload"
:
"~9.20.0"
,
"fontawesome"
:
"~5.0.6"
,
"popper.js"
:
"~1.12.9"
"typeahead.js"
:
"~0.11.1"
}
}
adim_project/adim_app/static/_src/common.js
View file @
28b562a0
...
...
@@ -64,9 +64,8 @@ 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.min
'
,
canvasToBlob
:
'
../_src/lib/blueimp-canvas-to-blob/js/canvas-to-blob.min
'
,
//zeroclipboard: '../_src/lib/zeroclipboard/dist/ZeroClipboard.min',
//FileSaver: '../_src/lib/FileSaver/FileSaver.min',
//canvasToBlob: '../_src/lib/blueimp-canvas-to-blob/js/canvas-to-blob.min',
bloodhound
:
'
../_src/lib/typeahead.js/dist/bloodhound
'
,
sortable
:
'
../_src/lib/sortablejs/Sortable.min
'
,
...
...
@@ -82,12 +81,10 @@ requirejs.config({
'
jquery.autoGrowInput
'
:
"
../_src/lib/jquery.autoGrowInput/jquery.autoGrowInput
"
,
'
jquery.typeahead
'
:
"
../_src/lib/bootstrap3-typeahead/bootstrap3-typeahead.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.bootstrap
'
:
"
../_src/lib/bootstrap/dist/js/bootstrap.min
"
,
'
bootstrap.colorpicker
'
:
"
../_src/lib/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min
"
,
'
bootstrap.spinedit
'
:
"
../_src/lib/bootstrap-spinedit/js/bootstrap-spinedit
"
,
'
bootstrap.slider
'
:
"
../_src/lib/seiyria-bootstrap-slider/dist/bootstrap-slider.min
"
,
'
bootstrap.rating
'
:
"
../_src/adim/helper/bootstrap-rating-input
"
,
},
...
...
@@ -103,13 +100,11 @@ requirejs.config({
'
jquery.mousewheel
'
:
{
deps
:
[
"
jquery
"
]
},
'
jquery.autoGrowInput
'
:
{
deps
:
[
"
jquery
"
]
},
'
jquery.typeahead
'
:
{
deps
:
[
"
jquery
"
]},
//'jquery.select2': { deps: ["jquery"] },
'
jquery.hotkeys
'
:
{
deps
:
[
"
jquery
"
]},
'
jquery.bootstrap
'
:
{
deps
:
[
"
jquery
"
]
},
//'jquery-migrate': { deps: ['jquery'], exports: 'jQuery' },
'
bootstrap.colorpicker
'
:
{
deps
:
[
"
jquery.bootstrap
"
]
},
'
bootstrap.slider
'
:
{
deps
:
[
"
jquery.bootstrap
"
]
},
'
bootstrap.spinedit
'
:
{
deps
:
[
"
jquery.bootstrap
"
]
},
'
bootstrap.switch
'
:
{
deps
:
[
"
jquery.bootstrap
"
]
},
'
bootstrap.rating
'
:
{
deps
:
[
"
jquery.bootstrap
"
]
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment