Merge remote-tracking branch 'origin/master'

Conflicts:
	jquery.slicknav.js

Author: ComputerWolf

README.md

@@ -56,8 +56,10 @@ slicknav.css can be modified to fit website design
 
 ### Callbacks
     'init': function(){}, // Called after SlickNav creation
-    'open': function(trigger){}, // Called after menu or sub-menu opened. 
-    'close': function(trigger){} // Called after menu or sub-menu closed.
+    'beforeOpen': function(trigger){}, // Called before menu or sub-menu opened. 
+    'beforeClose': function(trigger){} // Called before menu or sub-menu closed.
+    'afterOpen': function(trigger){} // Called after menu or sub-menu opened.
+    'afterClose': function(trigger){} // Called after menu or sub-menu closed.
 
 ### Methods
     $('.menu').slicknav('toggle'); // Method to toggle the menu
@@ -92,4 +94,4 @@ More examples at [SlickNav.com](http://slicknav.com)
 * Opera
 * IE7+
 * Android Browser
-* iOS Safari
+* iOS Safari

dist/jquery.slicknav.js

@@ -24,8 +24,10 @@
             removeClasses: false,
 			brand: '',
             init: function () {},
-            open: function () {},
-            close: function () {}
+            beforeOpen: function () {},
+            beforeClose: function () {},
+            afterOpen: function () {},
+            afterClose: function () {}
         },
         mobileMenu = 'slicknav',
         prefix = 'slicknav';
@@ -313,33 +315,45 @@
 
         if (el.hasClass(prefix+'_hidden')) {
             el.removeClass(prefix+'_hidden');
+             //Fire beforeOpen callback
+                if (!init) {
+                    settings.beforeOpen(trigger);
+                }
             el.slideDown(duration, settings.easingOpen, function(){
 
                 $(trigger).removeClass(prefix+'_animating');
                 $(parent).removeClass(prefix+'_animating');
 
-                //Fire open callback
+                //Fire afterOpen callback
                 if (!init) {
-                    settings.open(trigger);
+                    settings.afterOpen(trigger);
                 }
             });
             el.attr('aria-hidden','false');
             items.attr('tabindex', '0');
             $this._setVisAttr(el, false);
         } else {
             el.addClass(prefix+'_hidden');
+            	
+            //Fire init or beforeClose callback
+            if (!init){
+                settings.beforeClose(trigger);
+            }else if (trigger == 'init'){
+                settings.init();
+            }
+            
             el.slideUp(duration, this.settings.easingClose, function() {
                 el.attr('aria-hidden','true');
                 items.attr('tabindex', '-1');
                 $this._setVisAttr(el, true);
                 el.hide(); //jQuery 1.7 bug fix
-
+                
                 $(trigger).removeClass(prefix+'_animating');
                 $(parent).removeClass(prefix+'_animating');
 
-                //Fire init or close callback
+                //Fire init or afterClose callback
                 if (!init){
-                    settings.close(trigger);
+                    settings.afterClose(trigger);
                 }
                 else if (trigger == 'init'){
                     settings.init();
@@ -452,4 +466,4 @@
             return returns !== undefined ? returns : this;
         }
     };
-}(jQuery, document, window));
+}(jQuery, document, window));

dist/jquery.slicknav.min.js

@@ -19,8 +19,10 @@
             removeClasses: false,
 			brand: '',
             init: function () {},
-            open: function () {},
-            close: function () {}
+            beforeOpen: function () {},
+            beforeClose: function () {},
+            afterOpen: function () {},
+            afterClose: function () {}
         },
         mobileMenu = 'slicknav',
         prefix = 'slicknav';
@@ -308,33 +310,45 @@
 
         if (el.hasClass(prefix+'_hidden')) {
             el.removeClass(prefix+'_hidden');
+             //Fire beforeOpen callback
+                if (!init) {
+                    settings.beforeOpen(trigger);
+                }
             el.slideDown(duration, settings.easingOpen, function(){
 
                 $(trigger).removeClass(prefix+'_animating');
                 $(parent).removeClass(prefix+'_animating');
 
-                //Fire open callback
+                //Fire afterOpen callback
                 if (!init) {
-                    settings.open(trigger);
+                    settings.afterOpen(trigger);
                 }
             });
             el.attr('aria-hidden','false');
             items.attr('tabindex', '0');
             $this._setVisAttr(el, false);
         } else {
             el.addClass(prefix+'_hidden');
+            	
+            //Fire init or beforeClose callback
+            if (!init){
+                settings.beforeClose(trigger);
+            }else if (trigger == 'init'){
+                settings.init();
+            }
+            
             el.slideUp(duration, this.settings.easingClose, function() {
                 el.attr('aria-hidden','true');
                 items.attr('tabindex', '-1');
                 $this._setVisAttr(el, true);
                 el.hide(); //jQuery 1.7 bug fix
-
+                
                 $(trigger).removeClass(prefix+'_animating');
                 $(parent).removeClass(prefix+'_animating');
 
-                //Fire init or close callback
+                //Fire init or afterClose callback
                 if (!init){
-                    settings.close(trigger);
+                    settings.afterClose(trigger);
                 }
                 else if (trigger == 'init'){
                     settings.init();
@@ -447,4 +461,4 @@
             return returns !== undefined ? returns : this;
         }
     };
-}(jQuery, document, window));
+}(jQuery, document, window));