diff options
author | RedMatrix <info@friendica.com> | 2015-01-06 09:40:26 +1100 |
---|---|---|
committer | RedMatrix <info@friendica.com> | 2015-01-06 09:40:26 +1100 |
commit | c45456fa3342bc72d30c20bafd029913930130aa (patch) | |
tree | f707891da9bd1c7272f04e455f33043bbb29ef1d /view/js/main.js | |
parent | 074be42e234a9d44ffe7875ffef6eb7a5e22f013 (diff) | |
parent | 5ce5de73051e0d68d277dc189b3bcc4593d7ab8d (diff) | |
download | volse-hubzilla-c45456fa3342bc72d30c20bafd029913930130aa.tar.gz volse-hubzilla-c45456fa3342bc72d30c20bafd029913930130aa.tar.bz2 volse-hubzilla-c45456fa3342bc72d30c20bafd029913930130aa.zip |
Merge pull request #820 from pafcu/nomigrate
Steps towards not needing jquery-migrate
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) { |