Small updates and improvements

bower.json

@@ -1,7 +1,7 @@
 {
 	"name": "jQuery.mmenu",
 	"main": "src/js/jquery.mmenu.min.js",
-	"version": "4.6.2",
+	"version": "4.6.3",
 	"homepage": "http://mmenu.frebsite.nl/",
 	"authors": [
 		"Fred Heusschen <[email protected]>"

demo/css/demo.css

@@ -68,6 +68,18 @@ nav:not(.mm-menu)
 	height: 40px;
 	padding: 0 50px;
 }
+.header.fixed
+{
+	position: fixed;
+	top: 0;
+	left: 0;
+}
+.footer.fixed
+{
+	position: fixed;
+	bottom: 0;
+	left: 0;
+}
 .header a
 {
 	background: center center no-repeat transparent;

mmenu.jquery.json

@@ -1,6 +1,6 @@
 {
 	"name": "mmenu",
-	"version": "4.6.2",
+	"version": "4.6.3",
 	"title": "jQuery mmenu",
 	"description": "The best jQuery plugin for app look-alike on- and off-canvas menus with sliding submenus for your website and webapp.",
 	"keywords": [

src/css/addons/jquery.mmenu.labels.css

@@ -1,19 +1,19 @@
 /*
 	jQuery.mmenu labels addon CSS
 */
-.mm-list > li.mm-label > span {
+.mm-list li.mm-label > span {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
   padding: 0;
   line-height: 25px; }
-.mm-list > li.mm-label.mm-opened a.mm-subopen:after {
+.mm-list li.mm-label.mm-opened a.mm-subopen:after {
   -webkit-transform: rotate(45deg);
   -moz-transform: rotate(45deg);
   -ms-transform: rotate(45deg);
   -o-transform: rotate(45deg);
   transform: rotate(45deg); }
-.mm-list > li.mm-collapsed {
+.mm-list li.mm-collapsed:not(.mm-uncollapsed) {
   display: none; }
 
 .mm-menu.mm-vertical .mm-list > li.mm-label > a.mm-subopen:after {

src/css/jquery.mmenu.all.css

@@ -545,19 +545,19 @@ html.mm-opened.mm-dragging #mm-blocker {
 /*
 	jQuery.mmenu labels addon CSS
 */
-.mm-list > li.mm-label > span {
+.mm-list li.mm-label > span {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
   padding: 0;
   line-height: 25px; }
-.mm-list > li.mm-label.mm-opened a.mm-subopen:after {
+.mm-list li.mm-label.mm-opened a.mm-subopen:after {
   -webkit-transform: rotate(45deg);
   -moz-transform: rotate(45deg);
   -ms-transform: rotate(45deg);
   -o-transform: rotate(45deg);
   transform: rotate(45deg); }
-.mm-list > li.mm-collapsed {
+.mm-list li.mm-collapsed:not(.mm-uncollapsed) {
   display: none; }
 
 .mm-menu.mm-vertical .mm-list > li.mm-label > a.mm-subopen:after {

src/js/addons/jquery.mmenu.fixedelements.js

@@ -65,7 +65,6 @@
 						'-webkit-transform': 'translateY( ' + _top + 'px )',
 						'transform': 'translateY( ' + _top + 'px )'
 					});
-
 					$bots.css({
 						'-webkit-transform': 'translateY( -' + _bot + 'px )',
 						'transform': 'translateY( -' + _bot + 'px )'

src/js/addons/jquery.mmenu.labels.js

@@ -18,7 +18,7 @@
 		{
 			_initAddon();
 		}
-		
+
 		var addon_added = this.vars[ _ADDON_ + '_added' ];
 		this.vars[ _ADDON_ + '_added' ] = true;
 
@@ -44,39 +44,38 @@
 				.each(
 					function()
 					{
-						var $labl = $(this),
-							$expn = $labl.nextUntil( '.' + _c.label, ( opts.collapse == 'all' ) ? null : '.' + _c.collapsed );
-
-						if ( opts.collapse == 'all' )
-						{
-							$labl.addClass( _c.opened );
-							$expn.removeClass( _c.collapsed );
-						}
+						var $l = $(this),
+							$e = $l.nextUntil( '.' + _c.label, '.' + _c.collapsed );
 
-						if ( $expn.length )
+						if ( $e.length )
 						{
-							if ( !$labl.data( _d.updatelabel ) )
+							if ( !$l.children( '.' + _c.subopen ).length )
 							{
-								$labl.data( _d.updatelabel, true );
-								$labl.wrapInner( '<span />' );
-								$labl.prepend( '<a href="#" class="' + _c.subopen + ' ' + _c.fullsubopen + '" />' );
+								$l.wrapInner( '<span />' );
+								$l.prepend( '<a href="#" class="' + _c.subopen + ' ' + _c.fullsubopen + '" />' );
 							}
-
-							$labl
-								.find( 'a.' + _c.subopen )
-								.off( _e.click )
-								.on( _e.click,
-									function( e )
-									{
-										e.preventDefault();
-
-										$labl.toggleClass( _c.opened );
-										$expn[ $labl.hasClass( _c.opened ) ? 'removeClass' : 'addClass' ]( _c.collapsed );
-									}
-								);
 						}
 					}
 				);
+
+			if ( !addon_added )
+			{
+				glbl.$body
+					.on( _e.click,
+						'.' + _c.label + ' .' + _c.subopen,
+						function( e )
+						{
+							e.stopPropagation();
+							e.preventDefault();
+
+							var $l = $(this).parent(),
+								$e = $l.nextUntil( '.' + _c.label, '.' + _c.collapsed );
+
+							$l.toggleClass( _c.opened );
+							$e[ $l.hasClass( _c.opened ) ? 'addClass' : 'removeClass' ]( _c.uncollapsed );
+						}
+					);
+			}
 		}
 
 	};
@@ -125,8 +124,7 @@
 		_d = $[ _PLUGIN_ ]._d;
 		_e = $[ _PLUGIN_ ]._e;
 
-		_c.add( 'collapsed' );
-		_d.add( 'updatelabel' );
+		_c.add( 'collapsed uncollapsed' );
 
 		glbl = $[ _PLUGIN_ ].glbl;
 	}

src/js/addons/jquery.mmenu.offcanvas.js

@@ -59,6 +59,7 @@
 		this[ _ADDON_ + '_initBlocker' ]();
 		this[ _ADDON_ + '_initAnchors' ]();
 		this[ _ADDON_ + '_initEvents' ]();
+
 		this.$menu[ conf.menuInjectMethod + 'To' ]( conf.menuWrapperSelector );
 	};
 
@@ -332,7 +333,6 @@
 				function( e, $page )
 				{
 					that[ _ADDON_ + '_initPage' ]( $page );
-					that[ _ADDON_ + '_initOpenClose' ]();
 				}
 			);
 	};
@@ -349,7 +349,7 @@
 		{
 			c.pageSelector = '> ' + c.pageNodetype;
 		}
-		
+
 		return c;
 	}