aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2016-01-15 20:58:10 +0100
committermrjive <mrjive@mrjive.it>2016-01-15 20:58:10 +0100
commit763c700372ee91f3f840c6fba915cb4d941c34a0 (patch)
tree1d7e4a7f19825b6417764e2c46d3cd109f94b075 /view/js
parent2696deb2a18ba06593657a2317176baa26821708 (diff)
parent2498df68c716ec6ed80b5547c721ca9741a85572 (diff)
downloadvolse-hubzilla-763c700372ee91f3f840c6fba915cb4d941c34a0.tar.gz
volse-hubzilla-763c700372ee91f3f840c6fba915cb4d941c34a0.tar.bz2
volse-hubzilla-763c700372ee91f3f840c6fba915cb4d941c34a0.zip
Merge pull request #17 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/js')
-rw-r--r--view/js/autocomplete.js2
-rw-r--r--view/js/mod_connections.js7
2 files changed, 5 insertions, 4 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 511a7f815..437425a0e 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -196,4 +196,4 @@ function submit_form(e) {
if(typeof onselect !== 'undefined')
a.on('textComplete:select', function(e, value, strategy) { onselect(value); });
};
-})( jQuery ); \ No newline at end of file
+})( jQuery );
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index f29d96729..112204a5a 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -1,15 +1,16 @@
-$(document).ready(function() {
+$(document).ready(function() {
$("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
+ $(".autotime").timeago();
});
$("#contacts-search").keyup(function(event){
if(event.keyCode == 13){
- $("#contacts-search-submit").click();
+ $("#contacts-search").click();
}
});
$(".autocomplete-w1 .selected").keyup(function(event){
if(event.keyCode == 13){
- $("#contacts-search-submit").click();
+ $("#contacts-search").click();
}
});