diff options
| author | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
| commit | 0657195125675700eeb9bcd1bc92f4299cac0304 (patch) | |
| tree | 2e6d2df8fd42b289b947a16f0c5f0009a2c98043 /view/js/main.js | |
| parent | a1e5a661fa8f87793cab0fe9c34f507dafb65d99 (diff) | |
| parent | 087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef (diff) | |
| download | volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.gz volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.bz2 volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index 974f5f971..9d5136c34 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -577,7 +577,7 @@ function updateConvItems(mode,data) { } /* autocomplete @nicknames */ - $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl?f=&n=1"); + $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); var bimgs = $(".wall-item-body img").not(function() { return this.complete; }); var bimgcount = bimgs.length; @@ -604,7 +604,7 @@ function updateConvItems(mode,data) { $(this).readmore({ collapsedHeight: divmore_height, moreLink: '<a href="#" class="divgrow-showmore">'+aStr['divgrowmore']+'</a>', - lessLink: '<a href="#">'+aStr['divgrowless']+'</a>' + lessLink: '<a href="#" class="divgrow-showmore">'+aStr['divgrowless']+'</a>' }); $(this).addClass('divmore'); } |