Skip to content
This repository was archived by the owner on Mar 7, 2024. It is now read-only.

Better Support Large Websites #2 #180

Open
deltoss wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Better Support Large Websites #2 #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5c979
Made Changes to CSS, utilizing fixed positioning
deltoss Jun 9, 2017
9bc60c5
- Fixed an issue with RTL collapsing
deltoss Jun 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions demo/jquery.multilevelpushmenu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
.multilevelpushmenu_wrapper {
position: absolute;
position: fixed;
overflow: hidden;
min-width: 100%;
min-height: 100%;
height: 100%;
margin: 0;
padding: 0;
}

.multilevelpushmenu_wrapper .levelHolderClass {
position: absolute;
overflow: hidden;
position: fixed;
top: 0;
background: #336ca6;
width: auto;
min-height: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1em;
zoom: 1;
Expand Down
2 changes: 1 addition & 1 deletion demo/jquery.multilevelpushmenu.min.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions demo/jquery.multilevelpushmenu_brown.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
.mlpm_w {
position: absolute;
position: fixed;
overflow: hidden;
min-width: 100%;
min-height: 100%;
height: 100%;
margin: 0;
padding: 0;
}

.mlpm_w .levelHolderClass {
position: absolute;
overflow: hidden;
position: fixed;
top: 0;
background: #926738;
width: auto;
min-height: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1em;
zoom: 1;
Expand Down
11 changes: 6 additions & 5 deletions demo/jquery.multilevelpushmenu_grey.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
.mlpm_w {
position: absolute;
position: fixed;
overflow: hidden;
min-width: 100%;
min-height: 100%;
height: 100%;
margin: 0;
padding: 0;
}

.mlpm_w .levelHolderClass {
position: absolute;
overflow: hidden;
position: fixed;
top: 0;
background: #737373;
width: auto;
min-height: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1em;
zoom: 1;
Expand Down
11 changes: 6 additions & 5 deletions demo/jquery.multilevelpushmenu_red.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
.mlpm_w {
position: absolute;
position: fixed;
overflow: hidden;
min-width: 100%;
min-height: 100%;
height: 100%;
margin: 0;
padding: 0;
}

.mlpm_w .levelHolderClass {
position: absolute;
overflow: hidden;
position: fixed;
top: 0;
background: #ce3130;
width: auto;
min-height: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1em;
zoom: 1;
Expand Down
11 changes: 6 additions & 5 deletions jquery.multilevelpushmenu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
.multilevelpushmenu_wrapper {
position: absolute;
position: fixed;
overflow: hidden;
min-width: 100%;
min-height: 100%;
height: 100%;
margin: 0;
padding: 0;
}

.multilevelpushmenu_wrapper .levelHolderClass {
position: absolute;
overflow: hidden;
position: fixed;
top: 0;
background: #336ca6;
width: auto;
min-height: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1em;
zoom: 1;
Expand Down
5 changes: 3 additions & 2 deletions jquery.multilevelpushmenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@

// Collapse menu
function collapseMenu() {

if( $(instance).find( 'div.levelHolderClass' ).is(':animated') ) return false;
instance.settings.onCollapseMenuStart.apply(this, Array.prototype.slice.call([instance.settings]));
var level = arguments[0],
Expand Down Expand Up @@ -660,7 +661,7 @@
.find( '#' + instance.settings.menuID + ' div.levelHolderClass' )
.filter(function(){
var retObjs = ( instance.settings.direction == 'rtl' ) ?
($( this ).attr( 'data-level' ) > level) && (parseInt( $( this ).css( 'margin-right' ) ) >= 0 && $( this ).position().left < instance.settings.container.width() - instance.settings.overlapWidth )
($( this ).attr( 'data-level' ) > level) && (parseInt( $( this ).css( 'margin-right' ) ) >= 0 && $( this ).position().left - instance.settings.container.position().left < instance.settings.container.width() - instance.settings.overlapWidth )
:
($( this ).attr( 'data-level' ) > level) && (parseInt( $( this ).css( 'margin-left' ) ) >= 0 && $( this ).position().left >= 0 );
return retObjs;
Expand All @@ -669,7 +670,7 @@
.find( '#' + instance.settings.menuID + ' div.levelHolderClass' )
.filter(function(){
var retObjs = ( instance.settings.direction == 'rtl' ) ?
($( this ).attr( 'data-level' ) <= level) && (parseInt( $( this ).css( 'margin-right' ) ) >= 0 && $( this ).position().left < instance.settings.container.width() - instance.settings.overlapWidth )
($( this ).attr( 'data-level' ) <= level) && (parseInt( $( this ).css( 'margin-right' ) ) >= 0 && $( this ).position().left - instance.settings.container.position().left < instance.settings.container.width() - instance.settings.overlapWidth )
:
($( this ).attr( 'data-level' ) <= level) && (parseInt( $( this ).css( 'margin-left' ) ) >= 0 && $( this ).position().left >= 0 );
return retObjs;
Expand Down
2 changes: 1 addition & 1 deletion jquery.multilevelpushmenu.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jquery.multilevelpushmenu.min.js
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions jquery.multilevelpushmenu.min.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
$borderColor:#295685;
.multilevelpushmenu_wrapper {
margin: 0;
min-height: 100%;
height: 100%;
min-width: 100%;
overflow: hidden;
padding: 0;
position: absolute;
position: fixed;
.backItemClass {
background: #2e6196;
border-top: 1px solid #{$borderColor};
Expand All @@ -28,14 +28,15 @@ $borderColor:#295685;
padding: 0 0 0 .4em;
}
.levelHolderClass {
background: #336ca6;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1em;
min-height: 100%;
overflow: hidden;
position: absolute;
top: 0;
width: auto;
position: fixed;
background: #336ca6;
font-family: 'Open Sans Condensed', sans-serif;
font-size: 1em;
min-height: 100%;
overflow-x: hidden;
overflow-y: auto;
top: 0;
width: auto;
zoom: 1;
}
.ltr {
Expand Down