Skip to content

Commit

Permalink
Merge pull request #20 from yahoo/restore-width
Browse files Browse the repository at this point in the history
restore width
  • Loading branch information
hankhsiao committed Mar 3, 2016
2 parents 3e79866 + f4b16de commit 77117fb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 47 deletions.
13 changes: 13 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
plugins:
- "react"
env: {
es6: true
}
ecmaFeatures: {
modules: true,
jsx: true
}
rules:
valid-jsdoc: [2, { "requireReturn": false }]
'react/jsx-uses-react': [1]
46 changes: 0 additions & 46 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,52 +63,6 @@
"react": "^0.14.2",
"xunit-file": "~0.0.9"
},
"eslintConfig": {
"rules": {
"space-before-function-paren": 2,
"valid-jsdoc": [
2,
{
"requireReturn": false,
"requireReturnDescription": false
}
],
"no-else-return": 2,
"no-extra-bind": 2,
"no-multi-spaces": 2,
"no-useless-call": 2,
"radix": 2,
"handle-callback-err": [
2,
"^(err|error)$"
],
"array-bracket-spacing": 2,
"block-spacing": 2,
"comma-spacing": 2,
"jsx-quotes": [
2,
"prefer-single"
],
"no-multiple-empty-lines": 2,
"no-trailing-spaces": 2,
"sort-vars": 2,
"space-after-keywords": 2,
"space-before-blocks": 2,
"space-infix-ops": 2,
"space-return-throw-case": 2,
"wrap-regex": 2,
"new-cap": 0
},
"plugins": [
"react"
],
"ecmaFeatures": {
"jsx": true
},
"env": {
"es6": true
}
},
"peerDependencies": {
"react": "^0.14.2",
"react-dom": "^0.14.2"
Expand Down
2 changes: 1 addition & 1 deletion src/Sticky.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class Sticky extends Component {
var outerRect = outer.getBoundingClientRect();
var innerRect = inner.getBoundingClientRect();

var width = innerRect.width || innerRect.right - innerRect.left;
var width = outerRect.width || outerRect.right - outerRect.left;
var height = innerRect.height || innerRect.bottom - innerRect.top;;
var outerY = outerRect.top + scrollTop;

Expand Down

0 comments on commit 77117fb

Please sign in to comment.