From 8ac32cf4d60d1e0bf6e8afd81b37cb3503063140 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 3 Nov 2016 21:01:18 -0400 Subject: Collapse navbar-collapse-1 if avatar menu is clicked. --- view/theme/redbasic/js/redbasic.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 999b46268..bdd6441f8 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -32,6 +32,12 @@ $(document).ready(function() { $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); + $('#avatar').click(function() { + if($('#navbar-collapse-1').hasClass('in')){ + $('#navbar-collapse-1').removeClass('in'); + } + }); + if($('#tabs-collapse-1').length === 0) { $('#expand-tabs').hide(); } -- cgit v1.2.3 From 471d88c1d2708de8d5ef9bc5923b62c4084046e4 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 4 Nov 2016 21:29:23 +0100 Subject: some fixes for the recent changes in the personal menu dropdown --- view/theme/redbasic/js/redbasic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index bdd6441f8..c5f74db3f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -32,7 +32,7 @@ $(document).ready(function() { $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); - $('#avatar').click(function() { + $('.usermenu-head').click(function() { if($('#navbar-collapse-1').hasClass('in')){ $('#navbar-collapse-1').removeClass('in'); } -- cgit v1.2.3 From b8370cffb9a9f69ad87d489df6b73d7daa5434c0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 16 Dec 2016 16:14:01 +0100 Subject: move the sticky-kit^Cquery plugin to /lib and see if we want this for the whole app --- view/theme/redbasic/js/redbasic.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c5f74db3f..c3c2c7e3f 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,6 +16,23 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element + if($(window).outerWidth() > 767) { + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + }); + } + + $(window).resize(function() { + if($(window).outerWidth() > 767) { + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + }); + } + else { + $('#left_aside_wrapper').trigger("sticky_kit:detach"); + } + }); + $('#expand-aside').click(function() { $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); $('main').toggleClass('region_1-on'); -- cgit v1.2.3 From 7c86f11167bf9f942dba6405a79f48d87bd309a5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 16 Dec 2016 16:24:17 +0100 Subject: retrigger after fullscreen --- view/theme/redbasic/js/redbasic.js | 1 + 1 file changed, 1 insertion(+) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index c3c2c7e3f..8fb1117ce 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -89,5 +89,6 @@ function makeFullScreen(full) { $('#tabs-collapse-1').css({'visibility': ''}); $('#inline-btn').hide(); $('main').css({'transition': ''}); + $(document.body).trigger("sticky_kit:recalc"); } } -- cgit v1.2.3 From 1e1b51bc1c9bd3f94670ecfa1c1e5b9f6a4402bc Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 19 Dec 2016 12:46:36 +0100 Subject: make sticky aside available for small screens. we had to get rid of the transition effect for this to work reliably --- view/theme/redbasic/js/redbasic.js | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 8fb1117ce..4a18db8ff 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -8,34 +8,32 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 287 ); + $('main').css('width', $(window).width() + $('aside').outerWidth() ); } else { $('main').css('width', '100%' ); } }); } + $('#css3-calc').remove(); // Remove the test element - if($(window).outerWidth() > 767) { - $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) - }); - } + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + }); - $(window).resize(function() { - if($(window).outerWidth() > 767) { - $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) - }); - } - else { - $('#left_aside_wrapper').trigger("sticky_kit:detach"); + $('#expand-aside').on('click', toggleAside); + + $('section').on('click', function() { + if($('main').hasClass('region_1-on')){ + toggleAside(); } }); - $('#expand-aside').click(function() { - $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); - $('main').toggleClass('region_1-on'); + $(window).on('scroll', function() { + if($('main').hasClass('region_1-on') && $(window).scrollLeft() > 5){ + $(window).scrollLeft(0); + toggleAside(); + } }); if($('aside').length && $('aside').html().length === 0) { @@ -92,3 +90,9 @@ function makeFullScreen(full) { $(document.body).trigger("sticky_kit:recalc"); } } + +function toggleAside() { + $(window).scroll(); + $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); + $('main').toggleClass('region_1-on'); +} -- cgit v1.2.3 From 007ba2bee4ae0d0fec8ce97a3b5bebc8b900c68b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 22 Dec 2016 11:54:04 +0100 Subject: more robust crossbrowser support --- view/theme/redbasic/js/redbasic.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 4a18db8ff..5691a40d0 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -92,7 +92,19 @@ function makeFullScreen(full) { } function toggleAside() { - $(window).scroll(); $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); - $('main').toggleClass('region_1-on'); + if($('main').hasClass('region_1-on')){ + $('main').removeClass('region_1-on') + $('#overlay').remove(); + } + else { + $('main').addClass('region_1-on') + $('
').appendTo('section'); + } + + $(window).scroll(); + // work around a bug where a browser seems to not trigger scroll with $(window).scroll() + var scrollpos = $(window).scrollTop(); + $(window).scrollTop(scrollpos - 1); + setTimeout(function(){ $(window).scrollTop(scrollpos) }, 100); } -- cgit v1.2.3 From a7a3ce72456b7c1ca1838bd59075e2a656459b81 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 22 Dec 2016 14:55:05 +0100 Subject: a cleaner way to work around browser bugs --- view/theme/redbasic/js/redbasic.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 5691a40d0..f97467947 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -14,7 +14,6 @@ $(document).ready(function() { } }); } - $('#css3-calc').remove(); // Remove the test element $('#left_aside_wrapper').stick_in_parent({ @@ -96,15 +95,13 @@ function toggleAside() { if($('main').hasClass('region_1-on')){ $('main').removeClass('region_1-on') $('#overlay').remove(); + $('#left_aside_wrapper').trigger("sticky_kit:detach"); } else { $('main').addClass('region_1-on') $('
').appendTo('section'); + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + }); } - - $(window).scroll(); - // work around a bug where a browser seems to not trigger scroll with $(window).scroll() - var scrollpos = $(window).scrollTop(); - $(window).scrollTop(scrollpos - 1); - setTimeout(function(){ $(window).scrollTop(scrollpos) }, 100); } -- cgit v1.2.3 From d7f65ca125ee6020928a48220055f637d8ca5000 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 22 Dec 2016 15:01:29 +0100 Subject: another check --- view/theme/redbasic/js/redbasic.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'view/theme/redbasic/js/redbasic.js') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index f97467947..e31458b4e 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -16,9 +16,11 @@ $(document).ready(function() { } $('#css3-calc').remove(); // Remove the test element - $('#left_aside_wrapper').stick_in_parent({ - offset_top: $('nav').outerHeight(true) - }); + if($(window).width() > 767) { + $('#left_aside_wrapper').stick_in_parent({ + offset_top: $('nav').outerHeight(true) + }); + } $('#expand-aside').on('click', toggleAside); -- cgit v1.2.3