Merge branch 'hotfix/1.7.3'

mmistakes · Jul 18, 2016 · e4462f2 · e4462f2
2 parents 685b205 + 624ca98
commit e4462f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/_sass/_dl-menu.scss b/_sass/_dl-menu.scss
@@ -3,8 +3,6 @@
    ========================================================================== */
 
 .dl-menuwrapper {
-	width: 100%;
-	height: 100%;
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -23,6 +21,11 @@
 		left: 25px;
 	}
 
+	&.dl-menuopen {
+		width: 100%;
+		height: 100%;
+	}
+
 	button {
 		top: 0;
 		left: 0;

diff --git a/assets/js/plugins/jquery.dlmenu.js b/assets/js/plugins/jquery.dlmenu.js
@@ -7,6 +7,8 @@
  * 
  * Copyright 2013, Codrops
  * http://www.codrops.com
+ *
+ * Modified by Michael Rose
  */
 ;( function( $, window, undefined ) {
 
@@ -66,6 +68,7 @@
 		},
 		_config : function() {
 			this.open = false;
+			this.$menuwrapper = $( '#dl-menu' );
 			this.$trigger = this.$el.children( '.dl-trigger' );
 			this.$menu = this.$el.children( 'ul.dl-menu' );
 			this.$menuitems = this.$menu.find( 'li:not(.dl-back)' );
@@ -178,6 +181,7 @@
 					self._resetMenu();
 				};
 
+			this.$menuwrapper.removeClass( 'dl-menuopen' );
 			this.$menu.removeClass( 'dl-menuopen' );
 			this.$menu.addClass( 'dl-menu-toggle' );
 			this.$trigger.removeClass( 'dl-active' );
@@ -202,6 +206,7 @@
 			$body.off( 'click' ).on( 'click.dlmenu', function() {
 				self._closeMenu() ;
 			} );
+			this.$menuwrapper.addClass( 'dl-menuopen' );
 			this.$menu.addClass( 'dl-menuopen dl-menu-toggle' ).on( this.transEndEventName, function() {
 				$( this ).removeClass( 'dl-menu-toggle' );
 			} );