aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authormrjive <mrjive@mrjive.it>2015-11-11 16:51:48 +0100
committermrjive <mrjive@mrjive.it>2015-11-11 16:51:48 +0100
commit53a796afcc0cff6f9e3f51457df4506a43db1945 (patch)
treea2366c48e0dae047b052283cc44284224369c8cd /view/js
parenta4c3058f845a1c38d06b2201a10700c5f878366d (diff)
parentbc7c0ed844711e81c4bc642e3024849195a48421 (diff)
downloadvolse-hubzilla-53a796afcc0cff6f9e3f51457df4506a43db1945.tar.gz
volse-hubzilla-53a796afcc0cff6f9e3f51457df4506a43db1945.tar.bz2
volse-hubzilla-53a796afcc0cff6f9e3f51457df4506a43db1945.zip
Merge pull request #8 from redmatrix/master
get fresh code from HZ base
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js13
-rw-r--r--view/js/mod_mail.js1
2 files changed, 12 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js
index acdc2e5f5..8bd4357cc 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -836,10 +836,20 @@ function dropItem(url, object) {
function dosubthread(ident) {
unpause();
$('#like-rotator-' + ident.toString()).spin('tiny');
- $.get('subthread/' + ident.toString(), NavUpdate );
+ $.get('subthread/sub/' + ident.toString(), NavUpdate );
liking = 1;
}
+
+function dounsubthread(ident) {
+ unpause();
+ $('#like-rotator-' + ident.toString()).spin('tiny');
+ $.get('subthread/unsub/' + ident.toString(), NavUpdate );
+ liking = 1;
+}
+
+
+
function dostar(ident) {
ident = ident.toString();
$('#like-rotator-' + ident).spin('tiny');
@@ -1156,7 +1166,6 @@ $(document).ready(function() {
numbers : aStr['t17'],
};
- $(".autotime").timeago();
$("#toc").toc();
});
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 36b22138f..561df7229 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -2,4 +2,5 @@ $(document).ready(function() {
$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
$("#recip-complete").val(data.xid);
});
+ $(".autotime").timeago()
});