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
df71ac1e
Commit
df71ac1e
authored
Feb 09, 2018
by
M. Chardon
Browse files
maj lib js paper
migration typeahead par select2
parent
0995f431
Changes
3
Show whitespace changes
Inline
Side-by-side
adim_project/adim_app/static/_src/anobj-mgr/views/anobj/properties-panel.js
View file @
df71ac1e
...
...
@@ -27,7 +27,8 @@ define([
"
adim/users
"
,
"
zeroclipboard
"
,
"
jquery.typeahead
"
//"jquery.typeahead",
"
jquery.select2
"
],
function
(
$
,
_
,
Backbone
,
config
,
Users
,
ZeroClipboard
)
{
...
...
@@ -90,13 +91,13 @@ define([
this
.
initZeroClipboard
();
this
.
$
(
'
[data-toggle="tooltip"]
'
).
tooltip
();
this
.
$
(
'
[data-toggle="tooltip"]
'
).
select2
();
this
.
$
(
"
input.aom-shm-ctrl-member-input
"
).
typeahead
({
minLength
:
3
,
highlight
:
true
},
{
source
:
Users
.
engine
.
ttAdapter
(),
this
.
$
(
"
input.aom-shm-ctrl-member-input
"
).
select2
({
min
imumInput
Length
:
3
,
//
highlight: true
//
}, {
data
:
Users
.
engine
.
ttAdapter
(),
name
:
'
users
'
,
displayKey
:
'
username
'
});
...
...
adim_project/adim_app/static/_src/bower.json
View file @
df71ac1e
...
...
@@ -20,7 +20,7 @@
"jquery-mousewheel"
:
"~3.1.11"
,
"FileSaver"
:
"~1.3.4"
,
"blob"
:
"*"
,
"paper"
:
"~0.
9.20
"
,
"paper"
:
"~0.
11.5
"
,
"jquery.autoGrowInput"
:
"~0.0.2"
,
"signals"
:
"~1.0.0"
,
"bootstrap-spinedit"
:
"https://github.com/jujug42/bootstrap-spinedit.git#*"
,
...
...
@@ -29,9 +29,10 @@
"jquery-file-upload"
:
"~9.20.0"
,
"jujug42-bootstrap-colorpicker"
:
"https://github.com/jujug42/bootstrap-colorpicker.git#8498378921e71a7781f06543ca3abfa367916b25"
,
"bootstrap3-typeahead"
:
"https://github.com/bassjobsen/Bootstrap-3-Typeahead.git#master"
,
"typeahead.js"
:
"~0.11.1"
,
//
"typeahead.js"
:
"~0.11.1"
,
"bootstrap-rating-input"
:
"~0.4.0"
,
"jquery.hotkeys"
:
"git://github.com/jeresig/jquery.hotkeys.git#~0.2.0"
,
"sortablejs"
:
"~1.6.0"
"sortablejs"
:
"~1.6.0"
,
"select2"
:
"~4.0"
}
}
adim_project/adim_app/static/_src/common.js
View file @
df71ac1e
...
...
@@ -30,6 +30,16 @@ requirejs.config({
name
:
'
jquery-ui/ui/widget
'
,
location
:
'
../_src/lib/jquery-file-upload/js/vendor
'
,
main
:
'
jquery.ui.widget
'
},
{
name
:
'
paper
'
,
location
:
'
../_src/lib/paper/dist
'
,
main
:
'
paper-core
'
},
{
name
:
'
typeahead
'
,
location
:
'
../_src/lib/typeahead.js/dist
'
,
main
:
'
typeahead.jquery
'
}],
paths
:
{
adim
:
'
../_src/adim
'
,
...
...
@@ -60,8 +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
"
,
//'select2/compat/inputData':"../_src/lib/select2/dist/js/select2",
'
jquery.bootstrap
'
:
"
../_src/lib/bootstrap/dist/js/bootstrap.min
"
,
'
bootstrap.colorpicker
'
:
"
../_src/lib/jujug42-bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min
"
,
...
...
Write
Preview
Supports
Markdown
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