diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-07-15 13:20:00 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-07-15 13:20:00 +0200 |
| commit | 2e32b5f467e9bb66e339c56308ad8a82163566e6 (patch) | |
| tree | ad03bdf26555b7136240917657a5e7a768529a3b /view/js/main.js | |
| parent | 7ee7f00bf34b11d0427f03df9494088cf56ef9ee (diff) | |
| download | volse-hubzilla-2e32b5f467e9bb66e339c56308ad8a82163566e6.tar.gz volse-hubzilla-2e32b5f467e9bb66e339c56308ad8a82163566e6.tar.bz2 volse-hubzilla-2e32b5f467e9bb66e339c56308ad8a82163566e6.zip | |
upgrade to jquery-3.1 and minor fixes
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/view/js/main.js b/view/js/main.js index 2caf5a1dd..90ca92078 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -283,12 +283,13 @@ $(function() { /* Turn elements with one of our special rel tags into popup menus */ /* CHANGES: let bootstrap handle popups and only do the loading here */ - $('a[rel^=#]').click(function(e){ + + $('a[rel^="#"]').click(function(e){ manage_popup_menu(this, e); return; }); - $('span[rel^=#]').click(function(e){ + $('span[rel^="#"]').click(function(e){ manage_popup_menu(this, e); return; }); @@ -679,8 +680,8 @@ function collapseHeight() { speed: 0, heightMargin: 50, collapsedHeight: divmore_height, - moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>', - lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>', + moreLink: '<a href="#" class="divgrow-showmore fakelink">' + aStr.divgrowmore + '</a>', + lessLink: '<a href="#" class="divgrow-showmore fakelink">' + aStr.divgrowless + '</a>', beforeToggle: function(trigger, element, expanded) { if(expanded) { if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { |