Skip to content

Commit

Permalink
react 0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
Contra committed Jan 27, 2015
1 parent d6c4a4b commit f5674b6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
"responsive",
"component"
],

"dependencies": {
"lodash.omit": "^2.4.1",
"react": "^0.11.0"
"lodash.omit": "^3.0.0",
"object-assign": "^2.0.0"
},
"peerDependencies": {
"react": "^0.12.0"
},
"devDependencies": {
"browserify": "^5.8.0",
Expand Down
18 changes: 8 additions & 10 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,29 @@

'use strict';

var ReactCompositeComponent = require('react/lib/ReactCompositeComponent');
var DOM = require('react/lib/ReactDOM');
var mergeInto = require('react/lib/mergeInto');
var PropTypes = require('react/lib/ReactPropTypes');
var React = require('react');
var assign = require('object-assign');
var omit = require('lodash.omit');
var mediaQuery = require('./mediaQuery');
var toQuery = require('./toQuery');
var matchMedia = window ? window.matchMedia : null;

var types = {
component: PropTypes.func,
query: PropTypes.string
var defaultTypes = {
component: React.PropTypes.func,
query: React.PropTypes.string
};
var excludedQueryKeys = Object.keys(types);
var mediaKeys = Object.keys(mediaQuery.all);
var excludedPropKeys = excludedQueryKeys.concat(mediaKeys);
mergeInto(types, mediaQuery.all);
var types = assign(defaultTypes, mediaQuery.all);

var mq = ReactCompositeComponent.createClass({
var mq = React.createClass({
displayName: 'MediaQuery',
propTypes: types,

getDefaultProps: function(){
return {
component: DOM.div
component: React.DOM.div
};
},

Expand Down

0 comments on commit f5674b6

Please sign in to comment.