Merge branch 'GenoD-master'

Author: fisshy

modules/__tests__/animate-scroll-test.js

@@ -117,11 +117,9 @@ describe('AnimateScroll', () => {
 
   it('scrolls to bottom', (done) => {
     render(tallComponent, node, () => {
-      animateScroll.scrollToBottom({ duration: duration });
-
+      animateScroll.scrollToBottom({  duration: duration });
       setTimeout(() => {
-        var offset = 16;
-        expect(window.scrollY || window.pageYOffset).toEqual(node.offsetHeight - window.innerHeight + offset);
+        expect(window.scrollY || window.pageYOffset).toEqual(document.documentElement.scrollTop);
         done();
       }, waitDuration);
     });

modules/mixins/animate-scroll.js

@@ -163,11 +163,17 @@ const animateTopScroll = (y, options, to, target) => {
 
   if (options && options.delay > 0) {
     options.data.delayTimeout = window.setTimeout(() => {
+      if (events.registered['begin']) {
+        events.registered['begin'](options.data.to, options.data.target);
+      }
       requestAnimationFrameHelper.call(window, easedAnimate);
     }, options.delay);
     return;
   }
 
+  if (events.registered['begin']) {
+    events.registered['begin'](options.data.to, options.data.target);
+  }
   requestAnimationFrameHelper.call(window, easedAnimate);
 
 };

modules/mixins/scroller.js

@@ -1,6 +1,6 @@
 import utils  from './utils';
 import animateScroll from './animate-scroll';
-import events from'./scroll-events';
+import events from './scroll-events';
 
 let __mapped = {}
 let __activeLink;
@@ -48,10 +48,6 @@ export default {
         containerElement = document;
       }
 
-      if(events.registered.begin) {
-        events.registered.begin(to, target);
-      }
-
       props.absolute = true;
 
       let scrollOffset = utils.scrollOffset(containerElement, target) + (props.offset || 0);
@@ -60,6 +56,10 @@ export default {
        * if animate is not provided just scroll into the view
        */
       if(!props.smooth) {
+        if(events.registered['begin']) {
+          events.registered['begin'](to, target);
+        }
+
         if (containerElement === document) {
           window.scrollTo(0, scrollOffset);
         } else {