aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-08-24 20:18:18 +0200
committerMario Vavti <mario@mariovavti.com>2017-08-24 20:18:18 +0200
commitcdccf601320ec7e59f5d96438edac34d5ea30085 (patch)
treed08cdd7e50dca5fbbffa96d922536db745bc0233 /view/js
parentdf2725a360f173d7521d8a552608014968763288 (diff)
parent85f24c292f071b9a83aea0aa122231afd57e7f73 (diff)
downloadvolse-hubzilla-cdccf601320ec7e59f5d96438edac34d5ea30085.tar.gz
volse-hubzilla-cdccf601320ec7e59f5d96438edac34d5ea30085.tar.bz2
volse-hubzilla-cdccf601320ec7e59f5d96438edac34d5ea30085.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js3
-rw-r--r--view/js/mod_cards.js3
2 files changed, 5 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js
index f20432735..fd3c8b08f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -380,8 +380,9 @@ function NavUpdate() {
if($('#live-pubstream').length) { src = 'pubstream'; liveUpdate(); }
if($('#live-display').length) { src = 'display'; liveUpdate(); }
if($('#live-search').length) { src = 'search'; liveUpdate(); }
+ // if($('#live-cards').length) { src = 'cards'; liveUpdate(); }
- if($('#live-photos').length) {
+ if($('#live-photos').length || $('#live-cards').length) {
if(liking) {
liking = 0;
window.location.href=window.location.href;
diff --git a/view/js/mod_cards.js b/view/js/mod_cards.js
new file mode 100644
index 000000000..78b2e1bd0
--- /dev/null
+++ b/view/js/mod_cards.js
@@ -0,0 +1,3 @@
+$(document).ready( function() {
+ $(".autotime").timeago();
+}); \ No newline at end of file