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

Patch for updated Gemini dependency. #12

Merged
merged 1 commit into from
Nov 19, 2015
Merged

Patch for updated Gemini dependency. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ var GeminiScrollbar = require('react-gemini-scrollbar');
```

## Props
* `autoshow`: show scrollbars upon hovering
* `autoshow`: show scrollbars upon hovering
* `forceGemini`: add option to force Gemini scrollbars even if native overlay-scrollbars are available


## Customization
Expand Down Expand Up @@ -90,4 +91,4 @@ alternative is to pass a `className` to the component. Then you can use that
MIT © [Noel Delgado][0]

[0]: http://pixelia.me/
[1]: https://github.com/noeldelgado/gemini-scrollbar
[1]: https://github.com/noeldelgado/gemini-scrollbar
7 changes: 5 additions & 2 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ module.exports = React.createClass({
displayName: 'GeminiScrollbar',

propTypes: {
autoshow: React.PropTypes.bool
autoshow: React.PropTypes.bool,
forceGemini: React.PropTypes.bool
},

getDefaultProps: function getDefaultProps() {
return {
autoshow: false
autoshow: false,
forceGemini: false
};
},

Expand All @@ -31,6 +33,7 @@ module.exports = React.createClass({
this.scrollbar = new GeminiScrollbar({
element: ReactDOM.findDOMNode(this),
autoshow: this.props.autoshow,
forceGemini: this.props.forceGemini,
createElements: false
}).create();
},
Expand Down
7 changes: 5 additions & 2 deletions src/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ module.exports = React.createClass({
displayName: 'GeminiScrollbar',

propTypes: {
autoshow: React.PropTypes.bool
autoshow: React.PropTypes.bool,
forceGemini: React.PropTypes.bool
},

getDefaultProps() {
return {
autoshow: false
autoshow: false,
forceGemini: false
}
},

Expand All @@ -25,6 +27,7 @@ module.exports = React.createClass({
this.scrollbar = new GeminiScrollbar({
element: ReactDOM.findDOMNode(this),
autoshow: this.props.autoshow,
forceGemini: this.props.forceGemini,
createElements: false
}).create();
},
Expand Down