diff --git a/README.md b/README.md index ff317fa..bed2b99 100644 --- a/README.md +++ b/README.md @@ -23,28 +23,27 @@ Created by [XOXCO](http://xoxco.com) ] }); - $(window).bind('enterBreakpoint320',function() { + $(window).on('enterBreakpoint320',function() { ... }); - $(window).bind('exitBreakpoint320',function() { + $(window).on('exitBreakpoint320',function() { ... }); - $(window).bind('enterBreakpoint768',function() { + $(window).on('enterBreakpoint768',function() { ... }); - $(window).bind('exitBreakpoint768',function() { + $(window).on('exitBreakpoint768',function() { ... }); - - $(window).bind('enterBreakpoint1024',function() { + $(window).on('enterBreakpoint1024',function() { ... }); - $(window).bind('exitBreakpoint1024',function() { + $(window).on('exitBreakpoint1024',function() { ... }); diff --git a/breakpoints.js b/breakpoints.js index 2e73a35..a2243fa 100644 --- a/breakpoints.js +++ b/breakpoints.js @@ -20,7 +20,7 @@ var interval = null; $.fn.resetBreakpoints = function() { - $(window).unbind('resize'); + $(window).off('resize'); if (interval) { clearInterval(interval); } @@ -59,7 +59,7 @@ } // fire onExit when browser contracts out of a larger breakpoint - if (w < options.breakpoints[bp] && lastSize >= options.breakpoints[bp]) { + if (w < options.breakpoints[bp] && (lastSize >= options.breakpoints[bp] || !done)) { $('body').removeClass('breakpoint-' + options.breakpoints[bp]); $(window).trigger('exitBreakpoint' + options.breakpoints[bp]);