diff options
| author | zotlabs <mike@macgirvin.com> | 2018-07-15 18:43:41 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-07-15 18:43:41 -0700 |
| commit | cc91db55b7ca24cb0b97273bab948af91dac0511 (patch) | |
| tree | acdc5df67e366a4bf472bccf42fa1e68d30a3812 /view/js | |
| parent | d71e70bedf4fa7244f3fcce789e29504c452d5cd (diff) | |
| parent | bb7022350943c6f049641d50d28cb99caf019b83 (diff) | |
| download | volse-hubzilla-cc91db55b7ca24cb0b97273bab948af91dac0511.tar.gz volse-hubzilla-cc91db55b7ca24cb0b97273bab948af91dac0511.tar.bz2 volse-hubzilla-cc91db55b7ca24cb0b97273bab948af91dac0511.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'view/js')
| -rw-r--r-- | view/js/main.js | 3 | ||||
| -rw-r--r-- | view/js/mod_mail.js | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 45c412296..17f94dd16 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -62,6 +62,9 @@ $(document).ready(function() { numbers : aStr['t17'], }; + //mod_mail only + $(".mail-conv-detail .autotime").timeago(); + savedTitle = document.title; updateInit(); diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js index 15a45519b..917e5414c 100644 --- a/view/js/mod_mail.js +++ b/view/js/mod_mail.js @@ -2,7 +2,6 @@ $(document).ready(function() { $("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) { $("#recip-complete").val(data.xid); }); - $(".autotime").timeago() $('#prvmail-text').bbco_autocomplete('bbcode'); - $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); + $("#prvmail-text").editor_autocomplete(baseurl+"/acl"); }); |