Skip to content

Commit 1c5b6e3

Browse files
committed
Merge branch 'master' into dev-1.0
* master: Replace url references to rackt/react-tabs with reactjs/react-tabs (#150) Update README.md (#146) v0.8.2 v0.8.1 Publish: build bower distribution Fix jest
2 parents 68729e2 + 6fe3fc2 commit 1c5b6e3

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class App extends Component {
4949
>
5050

5151
{/*
52-
<TabList/> is a composit component and is the container for the <Tab/>s.
52+
<TabList/> is a composite component and is the container for the <Tab/>s.
5353
*/}
5454

5555
<TabList>
@@ -76,8 +76,8 @@ class App extends Component {
7676
There should be an equal number of <Tab/> and <TabPanel/> components.
7777
<Tab/> and <TabPanel/> components are tied together by the order in
7878
which they appear. The first (index 0) <Tab/> will be associated with
79-
the <TabPanel/> of the same index. Running this example when
80-
`selectedIndex` is 0 the tab with the label "Foo" will be selected
79+
the <TabPanel/> of the same index. When you run this example with
80+
`selectedIndex` equal to 0, the tab with the label "Foo" will be selected
8181
and the content shown will be "Hello from Foo".
8282
8383
As with <Tab/> the content of <TabPanel/> will be shown as the content.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "react-tabs",
33
"version": "0.5.3",
4-
"homepage": "https://github.com/rackt/react-tabs",
4+
"homepage": "https://github.com/reactjs/react-tabs",
55
"authors": [
66
"Matt Zabriskie"
77
],

dist/react-tabs.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/react-tabs.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-tabs",
3-
"version": "0.8.0",
3+
"version": "0.8.2",
44
"description": "React tabs component",
55
"main": "lib/main.js",
66
"scripts": {

src/components/Tabs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export default class Tabs extends Component {
155155
// Map children to dynamically setup refs
156156
return React.Children.map(children, (child) => {
157157
// null happens when conditionally rendering TabPanel/Tab
158-
// see https://github.com/rackt/react-tabs/issues/37
158+
// see https://github.com/reactjs/react-tabs/issues/37
159159
if (child === null) {
160160
return null;
161161
}
@@ -168,7 +168,7 @@ export default class Tabs extends Component {
168168
result = cloneElement(child, {
169169
children: React.Children.map(child.props.children, (tab) => {
170170
// null happens when conditionally rendering TabPanel/Tab
171-
// see https://github.com/rackt/react-tabs/issues/37
171+
// see https://github.com/reactjs/react-tabs/issues/37
172172
if (tab === null) {
173173
return null;
174174
}
@@ -318,7 +318,7 @@ export default class Tabs extends Component {
318318
//
319319
// Don't use setState, because we don't want to re-render.
320320
//
321-
// See https://github.com/rackt/react-tabs/pull/7
321+
// See https://github.com/reactjs/react-tabs/pull/7
322322
if (this.state.focus) {
323323
setTimeout(() => {
324324
this.state.focus = false;

src/components/__tests__/Tabs-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ describe('react-tabs', () => {
128128
});
129129

130130
// TODO: Can't seem to make this fail when removing fix :`(
131-
// See https://github.com/rackt/react-tabs/pull/7
131+
// See https://github.com/reactjs/react-tabs/pull/7
132132
// it('should preserve selectedIndex when typing', function () {
133133
// let App = React.createClass({
134134
// handleKeyDown: function () { this.forceUpdate(); },

src/helpers/childrenPropType.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ module.exports = function childrenPropTypes(props, propName) {
1111

1212
React.Children.forEach(children, (child) => {
1313
// null happens when conditionally rendering TabPanel/Tab
14-
// see https://github.com/rackt/react-tabs/issues/37
14+
// see https://github.com/reactjs/react-tabs/issues/37
1515
if (child === null) {
1616
return;
1717
}
1818

1919
if (child.type === TabList) {
2020
React.Children.forEach(child.props.children, (c) => {
2121
// null happens when conditionally rendering TabPanel/Tab
22-
// see https://github.com/rackt/react-tabs/issues/37
22+
// see https://github.com/reactjs/react-tabs/issues/37
2323
if (c === null) {
2424
return;
2525
}

0 commit comments

Comments
 (0)