Skip to content

Commit

Permalink
Merge branch 'master' of github.com:reactjs/react-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
Ives van Hoorne committed May 10, 2017
2 parents 1a559bc + c184ddf commit c014b92
Show file tree
Hide file tree
Showing 54 changed files with 7,906 additions and 1,855 deletions.
5 changes: 3 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"presets": ["es2015", "react"]
}
"presets": ["react", "latest", "stage-2"],
"plugins": ["babel-plugin-transform-object-assign"]
}
17 changes: 17 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
engines:
eslint:
enabled: true
channel: "eslint-3"
duplication:
enabled: true
config:
languages:
javascript:
ratings:
paths:
- lib/**
- "**.js"
exclude_paths:
- "specs/"
- "dist/"
- "examples/"
26 changes: 26 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module.exports = {
"env": {
"es6": true,
"browser": true
},
"extends": "airbnb",
"parserOptions": {
"ecmaVersion": 7,
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"jsx": true
},
"sourceType": "module"
},
"parser": "babel-eslint",
rules: {
"comma-dangle": [2, "only-multiline"],
"max-len": [1, {"code": 140}],
"no-continue": [0],
"no-plusplus": [0],
"space-before-function-paren": [2, "always"],
"import/no-extraneous-dependencies": [2, {"devDependencies": true}],
"react/jsx-filename-extension": ["error", {"extensions": [".js"]}],
"react/require-default-props": [0]
},
};
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
examples/**/*-bundle.js
node_modules/
.idea/
_book
coverage
lib
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ karma.conf.js
script
specs
.idea/
src
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
language: node_js
node_js:
- "0.10"
- "7"
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
after_success:
- cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
script: npm run test:full
cache: yarn
addons:
sauce_connect:
username: "cd-reactmodal"
jwt:
secure: PpSLvFVrzYYh5zn4SXSkhDsQ3lRxCa4yOwjbVCy3C3smQxgJLKDCHTBp4OcwDlDfPjSsq4nKaQcsOJa9DlduAxMIW98t6pQelqLD9aaEGDbdzyJ4qx5G3fTs6AdU8WJuvVY145zaRcgUdejs5Ii9j1rMna3yS9HfGRE5r4aHNhE=
109 changes: 109 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,112 @@
v1.7.6 - Thu, 13 Apr 2017 14:41:16 GMT
--------------------------------------

- [048ef2d](../../commit/048ef2d) [fixed] remove additional es2015 from refCount


v1.7.5 - Thu, 13 Apr 2017 14:20:34 GMT
--------------------------------------

- [1db0ee1](../../commit/1db0ee1) [fixed] remove es2015 from v1 branch


v1.7.4 - Thu, 13 Apr 2017 13:37:19 GMT
--------------------------------------

- [e579a0d](../../commit/e579a0d) [fix] keep references of modals. (#358)
- Removes deprecation warnings when used with React 15.5


v1.7.3 - Tue, 14 Mar 2017 01:22:00 GMT
--------------------------------------

- [e1df119](../../commit/e1df119) [fixed] remove portal context in timeout (#353)


v1.7.2 - Thu, 09 Mar 2017 03:59:52 GMT
--------------------------------------

- Fixes issue with backporting to v1 branch


v1.7.1 - Thu, 02 Mar 2017 14:49:30 GMT
--------------------------------------

- [a1d29c6](../../commit/a1d29c6) [fixed] rewrite removePortal as es5 function


v1.7.0 - Thu, 02 Mar 2017 03:54:08 GMT
--------------------------------------

- [ea4f37a](../../commit/ea4f37a) [fixed] respect closeTimeoutMS during unmount
- [4232477](../../commit/4232477) [fixed] Enable click to close in iOS (#301) (#304) (#313)

v1.6.5 - Sat, 31 Dec 2016 17:14:28 GMT
--------------------------------------

- [c50f19a](../../commit/c50f19a) [fixed] Add file extention to entry point (#294)
- [08bf920](../../commit/08bf920) [fixed] closeTimeoutMS doesn't work without onRequestClose (#278)


v1.6.4 - Thu, 15 Dec 2016 05:48:59 GMT
--------------------------------------

- [694cb87](../../commit/694cb87) [fixed] updated references from rackt to reactjs. (#244)
- [ad0b071](../../commit/ad0b071) Bumps lodash.assign dependency to version 4.2.0


v1.6.3 - Mon, 12 Dec 2016 14:03:43 GMT
--------------------------------------

- Removes some files that were inadvertently published in 1.6.2 reducing the npm install size.


v1.6.2 - Sun, 11 Dec 2016 17:32:03 GMT
--------------------------------------

- This version only added the `dist/` versions which were omitted from 1.5.2 -> 1.6.1


v1.6.1 - Tue, 06 Dec 2016 17:16:10 GMT
--------------------------------------

- [62d87e1](../../commit/62d87e1) [fixed] Remove arrow function from ES5 source


v1.6.0 - Tue, 06 Dec 2016 15:09:25 GMT
--------------------------------------

- [de14816](../../commit/de14816) [added] Ability for modal to be appended to arbitrary elements (#183)
- [3d8e5a0](../../commit/3d8e5a0) [added] Add contentLabel prop to put aria-label on modal content


v1.5.2 - Sat, 08 Oct 2016 14:29:09 GMT
--------------------------------------

- [d78428b](../../commit/d78428b) [fixed] Remove remaining reference to role dialog


v1.5.1 - Sat, 08 Oct 2016 04:11:39 GMT
--------------------------------------

- This version only added the `dist/` versions which were omitted from 1.4.0 -> 1.5.0


v1.5.0 - Sat, 08 Oct 2016 02:18:52 GMT
--------------------------------------

- [919daa3](../../commit/919daa3) [fixed] Remove the default aria role dialog
- [2e806c7](../../commit/2e806c7) [added] Make modal portal have the dialog role (#223)
- [5429f7c](../../commit/5429f7c) [fixed] Don't steal focus from a descendent when rendering (#222)
- [8e767e9](../../commit/8e767e9) [fixed] Add react-dom as a peer dependency
- [ff09b49](../../commit/ff09b49) [fixed] Close modal when mouseDown and MouseUp happen only on the overlay (#217)
- [6550b87](../../commit/6550b87) Revert "[fixed] Dont change body class if isOpen not change (#201)"
- [8e5f5b7](../../commit/8e5f5b7) [fixed] Fix incorrect details in the README
- [e5b0181](../../commit/e5b0181) [added] ability to change default 'ReactModalPortal' class (#208)
- [1e29e4f](../../commit/1e29e4f) [fixed] Dont change body class if isOpen not change (#201)
- [d347547](../../commit/d347547) [fixed] Updates webpack distribution config to reference the correct externals (#210)


v1.4.0 - Thu, 30 Jun 2016 19:12:02 GMT
--------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2014 Ryan Florence
Copyright (c) 2017 Ryan Florence

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down

0 comments on commit c014b92

Please sign in to comment.