Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fisshy/react-scroll
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: markomatic/react-scroll
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 12, 2016

  1. * Element location is not cached

    @vhazdovac
    vhazdovac committed Mar 12, 2016
    Configuration menu
    Copy the full SHA
    6277ca1 View commit details
    Browse the repository at this point in the history

  2. * Position for link check

    @vhazdovac
    vhazdovac committed Mar 12, 2016
    Configuration menu
    Copy the full SHA
    309d52a View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2016

  1. * Set active link with props

    @vhazdovac
    vhazdovac committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    ef97403 View commit details
    Browse the repository at this point in the history

  2. * Activate all scroll components that scrolls to the same element, no… 

    …t the first only
    @markomatic
    markomatic committed Mar 24, 2016
    Configuration menu
    Copy the full SHA
    6a00ac8 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2016

  1. Merge branch 'master' of https://github.com/fisshy/react-scroll 

    * 'master' of https://github.com/fisshy/react-scroll: (60 commits)
  Added missing DirectLink variable
  do not fail when there is no element to scroll to
  published new version
  Allowing to pass a function as the duration prop.
  Added idea to gitignore
  scroller.scrollTo() can take no props now. Improve readme
  publish v15
  duplications of package
  upgraded to react v15.0.1
  added dependencies
  published v1.0.12
  Add missing dep `object-assign`
  published v1.0.11
  user props as options
  publish v1.0.9
  new version v1.0.9
  removed duplication
  publish v1.0.8
  updated readme
  updated readme
  ...

# Conflicts:
#	modules/mixins/Helpers.js
    @markomatic
    markomatic committed May 28, 2016
    Configuration menu
    Copy the full SHA
    9afa04b View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. Merge branch 'master' of https://github.com/fisshy/react-scroll 

    * 'master' of https://github.com/fisshy/react-scroll: (32 commits)
  BUGFIX: while 'elemTopBound' is decimal, the 'isInside' would be false, and no 'ScrollLink' would be 'active'; (#112)
  fixes missing semicolon
  published v1.0.24
  fixed set container incase of no options.
  published v1.023
  ES6 where it shouldn't be
  possible to pass any native property
  published v1.0.21
  invalid null/undefined check
  Gets container when calling scrollToBottom and scrollMore
  published v1.ed v1.0.20
  published v1.0.19
  Clarifies example with container
  fixed readme
  published v 1.0.18
  check if scrollspycontainer is null or undefined
  fixed alignment
  increased duration time
  only set absolute if it's within a container
  unnecessary spacing
  ...

# Conflicts:
#	modules/mixins/Helpers.js
#	modules/mixins/animate-scroll.js
    @markomatic
    markomatic committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    5bff9ff View commit details
    Browse the repository at this point in the history
Loading