diff options
| author | friendica <info@friendica.com> | 2015-01-07 14:39:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-07 14:39:07 -0800 |
| commit | 087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef (patch) | |
| tree | f731ec2ef4b1977306e18c5dc0491a84f42e423f /view/js/main.js | |
| parent | ce953e2f41c2bf8abdda2584dd84c2bd0175f609 (diff) | |
| parent | 8771dee9cf90b9c8f76c1856ea7e5107aab5840e (diff) | |
| download | volse-hubzilla-087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef.tar.gz volse-hubzilla-087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef.tar.bz2 volse-hubzilla-087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef.zip | |
Merge https://github.com/friendica/red into pending_merge
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'); } |