aboutsummaryrefslogtreecommitdiffstats
path: root/js/main.js
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-26 12:51:08 -0700
committerFriendika <info@friendika.com>2011-10-26 12:51:08 -0700
commit1aba538c96628468b84136386496ccc69050e810 (patch)
tree102830d438afcc8552db79a9284dc1555c8f9247 /js/main.js
parent9f5d7b254b4edef7e7d2ffa14eb7c3c03ea516fe (diff)
parent6a8b96709e13b04a0657c25b4538c160e2118131 (diff)
downloadvolse-hubzilla-1aba538c96628468b84136386496ccc69050e810.tar.gz
volse-hubzilla-1aba538c96628468b84136386496ccc69050e810.tar.bz2
volse-hubzilla-1aba538c96628468b84136386496ccc69050e810.zip
Merge branch 'pull'
Diffstat (limited to 'js/main.js')
-rw-r--r--js/main.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/js/main.js b/js/main.js
index 03ba11ed8..15c5b5d1f 100644
--- a/js/main.js
+++ b/js/main.js
@@ -78,8 +78,6 @@
menu.toggle();
return false;
});
-
-
/* notifications template */
var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());
@@ -163,7 +161,9 @@
}
}
- });
+ });
+
+
});
function NavUpdate() {
@@ -245,6 +245,8 @@
commentBusy = false;
$('body').css('cursor', 'auto');
}
+ /* autocomplete @nicknames */
+ $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
});
}
@@ -445,6 +447,7 @@ function setupFieldRichtext(){
});
}
+
/**
* sprintf in javascript
* "{0} and {1}".format('zero','uno');