diff options
| author | friendica <info@friendica.com> | 2015-01-05 14:41:08 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-05 14:41:08 -0800 |
| commit | 8a3ef177cefe12e80a1cf121cfbc29d15ffa4735 (patch) | |
| tree | ba9ca23deb70290f4aa328739ace6920ff9e9f1d /view/js/main.js | |
| parent | ed19984534970b75dad4a09b948e1e134d501011 (diff) | |
| parent | 3df3ab563004423477640393eb8e50cb3d2fe8d6 (diff) | |
| download | volse-hubzilla-8a3ef177cefe12e80a1cf121cfbc29d15ffa4735.tar.gz volse-hubzilla-8a3ef177cefe12e80a1cf121cfbc29d15ffa4735.tar.bz2 volse-hubzilla-8a3ef177cefe12e80a1cf121cfbc29d15ffa4735.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/view/js/main.js b/view/js/main.js index 8c48bbb72..85aea9875 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -269,9 +269,9 @@ } // fancyboxes - $("a.popupbox").fancybox({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic' + // Is this actually used anywhere? + $("a.popupbox").colorbox({ + 'transition' : 'elastic' }); @@ -598,14 +598,15 @@ function updateConvItems(mode,data) { $(".wall-item-body, .contact-info").each(function() { if($(this).height() > divmore_height + 10) { if(! $(this).hasClass('divmore')) { - $(this).divgrow({ initialHeight: divmore_height, moreText: aStr['divgrowmore'], lessText: aStr['divgrowless'], showBrackets: false }); + $(this).readmore({collapsedHeight: divmore_height, moreLink: '<a href="#">'+aStr['divgrowmore']+'</a>', lessLink: '<a href="#">'+aStr['divgrowless']+'</a>'}); $(this).addClass('divmore'); } - } + } }); } function liveUpdate() { + if(typeof profile_uid === 'undefined') profile_uid = false; /* Should probably be unified with channelId defined in head.tpl */ if((src == null) || (stopped) || (! profile_uid)) { $('.like-rotator').spin(false); return; } if(($('.comment-edit-text-full').length) || (in_progress)) { if(livetime) { |