From 90e41fb577a90ae2b1ca5e06dd627dbb6166e3e4 Mon Sep 17 00:00:00 2001 From: Tim Tischler Date: Thu, 30 Jul 2015 21:15:00 -0700 Subject: [PATCH 1/5] Fixing 'Warning: module.exports.type is deprecated. Please use module.exports instead' by making react component comparisons directly. --- dist/react-menu.js | 6 +++--- lib/components/Menu.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/react-menu.js b/dist/react-menu.js index b38e85e..70f7d77 100644 --- a/dist/react-menu.js +++ b/dist/react-menu.js @@ -106,7 +106,7 @@ var Menu = module.exports = React.createClass({ var trigger; if(this.verifyTwoChildren()) { React.Children.forEach(this.props.children, function(child){ - if (child.type === MenuTrigger.type) { + if (child === MenuTrigger) { trigger = cloneWithProps(child, { ref: 'trigger', onToggleActive: this.handleTriggerToggle @@ -121,7 +121,7 @@ var Menu = module.exports = React.createClass({ var options; if(this.verifyTwoChildren()) { React.Children.forEach(this.props.children, function(child){ - if (child.type === MenuOptions.type) { + if (child === MenuOptions) { options = cloneWithProps(child, { ref: 'options', horizontalPlacement: this.state.horizontalPlacement, @@ -1340,4 +1340,4 @@ module.exports = warning; },{"./emptyFunction":16}]},{},[7]) (7) -}); \ No newline at end of file +}); diff --git a/lib/components/Menu.js b/lib/components/Menu.js index ee29c59..7c2870d 100644 --- a/lib/components/Menu.js +++ b/lib/components/Menu.js @@ -105,7 +105,7 @@ var Menu = module.exports = React.createClass({ var trigger; if(this.verifyTwoChildren()) { React.Children.forEach(this.props.children, function(child){ - if (child.type === MenuTrigger.type) { + if (child === MenuTrigger) { trigger = cloneWithProps(child, { ref: 'trigger', onToggleActive: this.handleTriggerToggle @@ -120,7 +120,7 @@ var Menu = module.exports = React.createClass({ var options; if(this.verifyTwoChildren()) { React.Children.forEach(this.props.children, function(child){ - if (child.type === MenuOptions.type) { + if (child === MenuOptions) { options = cloneWithProps(child, { ref: 'options', horizontalPlacement: this.state.horizontalPlacement, From d18bf44462a5bf6e9d5245d3d3808fbe135c59b3 Mon Sep 17 00:00:00 2001 From: John Lynch Date: Tue, 21 Jul 2015 11:55:08 -0700 Subject: [PATCH 2/5] Update Menu.js --- lib/components/Menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/components/Menu.js b/lib/components/Menu.js index 7c2870d..6f0d7aa 100644 --- a/lib/components/Menu.js +++ b/lib/components/Menu.js @@ -2,7 +2,7 @@ var React = require('react'); -var cloneWithProps = require('react/lib/cloneWithProps'); +var cloneWithProps = React.addons.cloneWithProps; var MenuTrigger = require('./MenuTrigger'); var MenuOptions = require('./MenuOptions'); var MenuOption = require('./MenuOption'); From 0491e8a5e2acfcadea9f7c27491e49ca86f10ef0 Mon Sep 17 00:00:00 2001 From: John Lynch Date: Tue, 21 Jul 2015 11:55:48 -0700 Subject: [PATCH 3/5] Update MenuOptions.js --- lib/components/MenuOptions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/components/MenuOptions.js b/lib/components/MenuOptions.js index e440b56..4e536a2 100644 --- a/lib/components/MenuOptions.js +++ b/lib/components/MenuOptions.js @@ -1,8 +1,8 @@ /** @jsx React.DOM */ var React = require('react'); +var cloneWithProps = React.addons.cloneWithProps; var MenuOption = require('./MenuOption'); -var cloneWithProps = require('react/lib/cloneWithProps') var buildClassName = require('../mixins/buildClassName'); var MenuOptions = module.exports = React.createClass({ From 2a66f9339694b792b9c5d060ae619b163c910b79 Mon Sep 17 00:00:00 2001 From: John Lynch Date: Wed, 22 Jul 2015 09:33:08 -0700 Subject: [PATCH 4/5] Update buildClassName.js --- lib/mixins/buildClassName.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mixins/buildClassName.js b/lib/mixins/buildClassName.js index f117033..1067ff5 100644 --- a/lib/mixins/buildClassName.js +++ b/lib/mixins/buildClassName.js @@ -6,5 +6,5 @@ module.exports = { name += ' ' + this.props.className; } return name; - }, + } }; From 684a089f4f922dda0ebe6f6bb091cf2f394637a4 Mon Sep 17 00:00:00 2001 From: John Lynch Date: Wed, 22 Jul 2015 09:36:21 -0700 Subject: [PATCH 5/5] Update injectCSS.js --- lib/helpers/injectCSS.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/helpers/injectCSS.js b/lib/helpers/injectCSS.js index 9a50be2..7a7947e 100644 --- a/lib/helpers/injectCSS.js +++ b/lib/helpers/injectCSS.js @@ -18,10 +18,10 @@ module.exports = function() { cursor: 'pointer' }, '.Menu__MenuOption--disabled': { - 'background-color': '#eee', + 'background-color': '#eee' }, '.Menu__MenuOption--active': { - 'background-color': '#0aafff', + 'background-color': '#0aafff' }, '.Menu__MenuOption--active.Menu__MenuOption--disabled': { 'background-color': '#ccc'