aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthur <arthur@hoa.ro>2016-05-03 19:23:15 +0200
committerArthur <arthur@hoa.ro>2016-05-03 19:23:15 +0200
commit5a63c34f3a68ce2f53ee9164e2a35a0904676399 (patch)
tree98f622b24e7c453edae6ed5a89836d88be436a8f
parentfa72470d5d14082e6c05b83f3f32439298dbc0e3 (diff)
parent69a1a90c27953b8a2523f6e49258170cdc6b682d (diff)
downloadShaarli-5a63c34f3a68ce2f53ee9164e2a35a0904676399.tar.gz
Shaarli-5a63c34f3a68ce2f53ee9164e2a35a0904676399.tar.zst
Shaarli-5a63c34f3a68ce2f53ee9164e2a35a0904676399.zip
Merge pull request #550 from kalvn/master
Renames Awesomeplete dollar variable to avoid conflicts with jQuery
-rw-r--r--inc/awesomplete-multiple-tags.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/awesomplete-multiple-tags.js b/inc/awesomplete-multiple-tags.js
index e0f889b1..4cc8429f 100644
--- a/inc/awesomplete-multiple-tags.js
+++ b/inc/awesomplete-multiple-tags.js
@@ -1,5 +1,5 @@
1$ = Awesomplete.$; 1var awp = Awesomplete.$;
2awesomplete = new Awesomplete($('input[data-multiple]'), { 2awesomplete = new Awesomplete(awp('input[data-multiple]'), {
3 filter: function(text, input) { 3 filter: function(text, input) {
4 return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]); 4 return Awesomplete.FILTER_CONTAINS(text, input.match(/[^ ]*$/)[0]);
5 }, 5 },