diff options
| author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
|---|---|---|
| committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
| commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
| tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /view/js/main.js | |
| parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
| parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
| download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index fa96596f4..5f88ea9ca 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -535,7 +535,7 @@ function updateConvItems(mode,data) { $(".wall-item-body").each(function() { if($(this).height() > 410) { if(! $(this).hasClass('divmore')) { - $(this).divgrow({ initialHeight: 400, showBrackets: false }); + $(this).divgrow({ initialHeight: 400, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false }); $(this).addClass('divmore'); } } |