Ensured calls to the scroll public function emits scrollStart and scrollEnd events.

d4nyll · d4nyll · commit bcf1cd6273a1 · 2015-12-25T00:45:39.000+08:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # smartscroll
 
-smartscroll is a tiny (1632b minfied + gzipped) jQuery plugin that has these *independent* features:
+smartscroll is a tiny (1665b minfied + gzipped) jQuery plugin that has these *independent* features:
 
 1. Section scrolling - Scrolljacking
 2. Auto-hash - Updates the URL hash based on current position on page
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
     "smartscroll.js",
     "sass/smartscroll.scss"
   ],
-  "version": "2.3.0",
+  "version": "2.3.1",
   "homepage": "https://github.com/d4nyll/smartscroll",
   "repository": {
     "type": "git",
diff --git a/examples/auto-hash/index.html b/examples/auto-hash/index.html
@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Auto-Hash</h1>
-				<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
diff --git a/examples/different-heights-hybrid-scroll/index.html b/examples/different-heights-hybrid-scroll/index.html
@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll - Different Heights &amp; Hybrid Scroll</h1>
-			<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
diff --git a/examples/different-heights-inner-section-scroll/index.html b/examples/different-heights-inner-section-scroll/index.html
@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Different Heights</h1>
-				<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
diff --git a/examples/different-heights/index.html b/examples/different-heights/index.html
@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Different Heights</h1>
-				<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
diff --git a/examples/hybrid-scroll/index.html b/examples/hybrid-scroll/index.html
@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll - Hybrid Scroll</h1>
-			<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
diff --git a/examples/index.html b/examples/index.html
@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll</h1>
-			<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
diff --git a/examples/keep-history/index.html b/examples/keep-history/index.html
@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Keep History</h1>
-				<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
diff --git a/examples/permalink/index.html b/examples/permalink/index.html
@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Permalink</h1>
-				<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
diff --git a/examples/responsive/index.html b/examples/responsive/index.html
@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll - Responsive</h1>
-			<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
diff --git a/examples/touch-events/index.html b/examples/touch-events/index.html
@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll</h1>
-			<p>A tiny (1632b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1665b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "smartscroll",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Scrolljacking jQuery plugin",
   "main": "smartscroll.js",
   "directories": {
diff --git a/smartscroll.js b/smartscroll.js
@@ -164,13 +164,21 @@
 		this.scroll = function (down) {
 			if(sections) {
 				var windowTop = getWindowTop();
+				if (options.eventEmitter) {
+					var sectionIndexAtWindowMiddle = getSectionIndexAt(windowTop + ($(window).height() / 2));
+					var nextSlideNumber = down ? (sectionIndexAtWindowMiddle + 1) : (sectionIndexAtWindowMiddle - 1);
+					options.eventEmitter.emitEvent("scrollStart", [nextSlideNumber]);
+				}
 				for (var i = 0; i < sections.length; i++ ) {
 					if (windowTop < sections[i]) {
 						if(!!down) {
 							scrollToPixel(sections[i], 700);
 						} else {
 							scrollToPixel(sections[i - 1] - $(window).height(), 700);
 						}
+						if (options.eventEmitter) {
+							options.eventEmitter.emitEvent("scrollEnd");
+						}
 						return false;
 					}
 				}
diff --git a/smartscroll.min.js b/smartscroll.min.js
