diff options
author | friendica <info@friendica.com> | 2015-03-15 16:51:35 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-03-15 16:51:35 -0700 |
commit | d7a6dae3cbf88cfc579674caa694a01f4e54ab89 (patch) | |
tree | 8d76a3635a61fedf57ff74442311bb3453d84a26 /view/theme | |
parent | 6da40fc559f540e67802f771411aa9f85dc8d64d (diff) | |
parent | e780dada832acbb9d46870178f9a6488f4e265d9 (diff) | |
download | volse-hubzilla-d7a6dae3cbf88cfc579674caa694a01f4e54ab89.tar.gz volse-hubzilla-d7a6dae3cbf88cfc579674caa694a01f4e54ab89.tar.bz2 volse-hubzilla-d7a6dae3cbf88cfc579674caa694a01f4e54ab89.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme')
-rw-r--r-- | view/theme/redbasic/js/redbasic.js | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 3db67dc87..c825b0485 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -1,52 +1,51 @@ - +/** + * redbasic theme specific JavaScript + */ $(document).ready(function() { + // CSS3 calc() fallback (for unsupported browsers) + $('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); + if( $('#css3-calc').width() == 10) { + $(window).resize(function() { + if($(window).width() < 767) { + $('main').css('width', $(window).width() + 231 ); + } else { + $('main').css('width', '100%' ); + } + }); + } + $('#css3-calc').remove(); // Remove the test element -// CSS3 calc() fallback (for unsupported browsers) -$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'); -if( $('#css3-calc').width() == 10) { - $(window).resize(function() { - if($(window).width() < 767) { - $('main').css('width', $(window).width() + 231 ); - } else { - $('main').css('width', '100%' ); - } + $('#expand-aside').click(function() { + $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); + $('main').toggleClass('region_1-on'); }); -} -$('#css3-calc').remove(); // Remove the test element -$('#expand-aside').click(function() { - $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); - $('main').toggleClass('region_1-on'); -}); - -if($('aside').length && $('aside').html().length == 0) { - $('#expand-aside').hide(); -} - -$('#expand-tabs').click(function() { - if(!$('#tabs-collapse-1').hasClass('in')){ - $('html, body').animate({ scrollTop: 0 }, 'slow'); + if($('aside').length && $('aside').html().length === 0) { + $('#expand-aside').hide(); } - $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); -}); -if($('#tabs-collapse-1').length == 0) { - $('#expand-tabs').hide(); -} + $('#expand-tabs').click(function() { + if(!$('#tabs-collapse-1').hasClass('in')){ + $('html, body').animate({ scrollTop: 0 }, 'slow'); + } + $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); + }); + if($('#tabs-collapse-1').length === 0) { + $('#expand-tabs').hide(); + } }); - $(document).ready(function(){ var doctitle = document.title; function checkNotify() { var notifyUpdateElem = document.getElementById('notify-update'); if(notifyUpdateElem !== null) { - if(notifyUpdateElem.innerHTML != "") - document.title = "("+notifyUpdateElem.innerHTML+") " + doctitle; - else - document.title = doctitle; + if(notifyUpdateElem.innerHTML !== "") + document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle; + else + document.title = doctitle; } - }; + } setInterval(function () {checkNotify();}, 10 * 1000); -}); +});
\ No newline at end of file |