diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-12 15:30:43 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-12 15:30:43 -0700 |
| commit | 4f7d14dfb2a73437ec37b672a711a594186f101e (patch) | |
| tree | 80acaae71c3243f65408c3aabf1790ae2a29dcab /view/js | |
| parent | cfc61a69ef80de70b1e4e29666f8beb4b80406fc (diff) | |
| parent | 745ac240d72e653cc49da5a81f379b49de6f2004 (diff) | |
| download | volse-hubzilla-4f7d14dfb2a73437ec37b672a711a594186f101e.tar.gz volse-hubzilla-4f7d14dfb2a73437ec37b672a711a594186f101e.tar.bz2 volse-hubzilla-4f7d14dfb2a73437ec37b672a711a594186f101e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 1 | ||||
| -rw-r--r-- | view/js/mod_connections.js | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/view/js/main.js b/view/js/main.js index 0239fc1f8..5435dfd87 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -854,6 +854,7 @@ function pageUpdate() { scroll_next = false; updatePageItems(update_mode,data); $("#page-spinner").spin(false); + $(".autotime").timeago(); in_progress = false; }); } diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js index 112204a5a..68add4eed 100644 --- a/view/js/mod_connections.js +++ b/view/js/mod_connections.js @@ -4,13 +4,13 @@ $(document).ready(function() { }); $("#contacts-search").keyup(function(event){ - if(event.keyCode == 13){ - $("#contacts-search").click(); - } + if(event.keyCode == 13){ + $("#contacts-search").click(); + } }); $(".autocomplete-w1 .selected").keyup(function(event){ - if(event.keyCode == 13){ - $("#contacts-search").click(); - } + if(event.keyCode == 13){ + $("#contacts-search").click(); + } }); |