Skip to content

Commit 0105127

Browse files
committedApr 28, 2015
[changed] Renamed Collapsable* => Collapsible*
CollapsableMixin => CollaplibleMixin CollapsableNav => CollaplibleNav More here react-bootstrap#425 Exactly this commit: Add CollapsibleMixin to src/index.js Refactor deprecationWarning() for general use.
1 parent 0967d5a commit 0105127

5 files changed

+23
-9
lines changed
 

‎src/CollapsableMixin.js

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,37 @@ import assign from './utils/Object.assign';
22
import deprecationWarning from './utils/deprecationWarning';
33
import CollapsibleMixin from './CollapsibleMixin';
44

5+
let link = 'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963';
6+
57
const CollapsableMixin = assign({}, CollapsibleMixin, {
68
getCollapsableClassSet(className) {
79
deprecationWarning(
810
'CollapsableMixin.getCollapsableClassSet()',
9-
'CollapsibleMixin.getCollapsibleClassSet()'
11+
'CollapsibleMixin.getCollapsibleClassSet()',
12+
link
1013
);
1114
return CollapsibleMixin.getCollapsibleClassSet.call(this, className);
1215
},
1316

1417
getCollapsibleDOMNode() {
1518
deprecationWarning(
1619
'CollapsableMixin.getCollapsableDOMNode()',
17-
'CollapsibleMixin.getCollapsibleDOMNode()'
20+
'CollapsibleMixin.getCollapsibleDOMNode()',
21+
link
1822
);
1923
return this.getCollapsableDOMNode();
2024
},
2125

2226
getCollapsibleDimensionValue() {
2327
deprecationWarning(
2428
'CollapsableMixin.getCollapsableDimensionValue()',
25-
'CollapsibleMixin.getCollapsibleDimensionValue()'
29+
'CollapsibleMixin.getCollapsibleDimensionValue()',
30+
link
2631
);
2732
return this.getCollapsableDimensionValue();
2833
}
2934
});
3035

31-
deprecationWarning('CollapsableMixin', 'CollapsibleMixin');
36+
deprecationWarning('CollapsableMixin', 'CollapsibleMixin', link);
3237

3338
export default CollapsableMixin;

‎src/CollapsableNav.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import CollapsibleNav from './CollapsibleNav';
33

44
let CollapsableNav = CollapsibleNav;
55

6-
deprecationWarning('CollapsableNav', 'CollapsibleNav');
6+
deprecationWarning(
7+
'CollapsableNav',
8+
'CollapsibleNav',
9+
'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963'
10+
);
711

812
export default CollapsableNav;

‎src/CollapsibleMixin.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ const CollapsibleMixin = {
141141
if (typeof this.getCollapsableDimension === 'function') {
142142
deprecationWarning(
143143
'CollapsableMixin.getCollapsableDimension()',
144-
'CollapsibleMixin.getCollapsibleDimension()'
144+
'CollapsibleMixin.getCollapsibleDimension()',
145+
'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963'
145146
);
146147
return this.getCollapsableDimension();
147148
}

‎src/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import Carousel from './Carousel';
1313
import CarouselItem from './CarouselItem';
1414
import Col from './Col';
1515
import CollapsableMixin from './CollapsableMixin';
16+
import CollapsibleMixin from './CollapsibleMixin';
1617
import DropdownButton from './DropdownButton';
1718
import DropdownMenu from './DropdownMenu';
1819
import DropdownStateMixin from './DropdownStateMixin';
@@ -66,6 +67,7 @@ export default {
6667
CarouselItem,
6768
Col,
6869
CollapsableMixin,
70+
CollapsibleMixin,
6971
DropdownButton,
7072
DropdownMenu,
7173
DropdownStateMixin,

‎src/utils/deprecationWarning.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
export default function deprecationWarning(oldname, newname) {
1+
export default function deprecationWarning(oldname, newname, link) {
22
if (process.env.NODE_ENV !== 'production') {
33
let message = `${oldname} is deprecated. Use ${newname} instead.`;
44
console.warn(message);
5-
let link = 'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963';
6-
console.warn(`You can read more about it here ${link}`);
5+
6+
if (link) {
7+
console.warn(`You can read more about it here ${link}`);
8+
}
79
}
810
}

0 commit comments

Comments
 (0)