Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix rte scroll handler firing on child scroll #430

Merged
merged 2 commits into from
May 25, 2017
Merged

fix rte scroll handler firing on child scroll #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e958f5e
fix rte scroll handler firing on child scroll
erquhart May 23, 2017
cd75b93
fix in-publish for CI, just remove prepublish hook
erquhart May 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"test:watch": "jest --watch",
"build": "NODE_ENV=production webpack --config webpack.prod.js",
"build:scripts": "NODE_ENV=production webpack --config webpack.cli.js",
"prepublish": "in-publish && npm run build || not-in-publish",
Copy link
Contributor

@Benaiah Benaiah May 23, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes don't look related to this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually did add this on purpose, I'll update the PR subject so that's clear.

"storybook": "start-storybook -p 9001",
"storybook-build": "build-storybook -o dist",
"lint": "npm run lint:js & npm run lint:css",
Expand Down Expand Up @@ -68,7 +67,6 @@
"file-loader": "^0.8.5",
"identity-obj-proxy": "^3.0.0",
"imports-loader": "^0.6.5",
"in-publish": "^2.0.0",
Copy link
Contributor

@Benaiah Benaiah May 23, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes don't look related to this PR.

"jest": "19.1.0-alpha.eed82034",
"jest-cli": "19.1.0-alpha.eed82034",
"lint-staged": "^3.1.0",
Expand Down
4 changes: 3 additions & 1 deletion src/components/UI/Sticky/Sticky.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ export class StickyContext extends Component {
}

handleScroll = (event) => {
this.updateStickies(event.target);
if (event.target === this.ref) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

this.updateStickies(this.ref);
}
};

render() {
Expand Down
Loading