aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-14 22:25:30 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-14 22:25:30 -0400
commit0edf248cd1f49cb7e4b44744629355e9e165ce64 (patch)
treed1b4f0ff41d6879d1bf6814a5e761dd0be51648c /view
parent514ffb74aa8457d8dec5c0158550d93d1a18c072 (diff)
parent05a9f2f0f58b9ca84e3a286a6126baf9455f947b (diff)
downloadvolse-hubzilla-0edf248cd1f49cb7e4b44744629355e9e165ce64.tar.gz
volse-hubzilla-0edf248cd1f49cb7e4b44744629355e9e165ce64.tar.bz2
volse-hubzilla-0edf248cd1f49cb7e4b44744629355e9e165ce64.zip
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'view')
-rw-r--r--view/js/autocomplete.js2
-rw-r--r--view/js/mod_mail.js2
-rw-r--r--view/js/mod_photos.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 59a9ed355..63f1e9a13 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -1,5 +1,5 @@
/**
- * Red people autocomplete
+ * general autocomplete support
*
* require jQuery, jquery.textcomplete
*/
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 3e55c8aeb..46574a63d 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -1,5 +1,5 @@
$(document).ready(function() {
- $("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
+ $("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) {
$("#recip-complete").val(data.xid);
});
$(".autotime").timeago()
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 006be5f23..e3df3ca68 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -3,7 +3,7 @@
*/
$(document).ready(function() {
- $("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
+ $("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
$("#photo-edit-newtag").val('@' + data.name);
});