react-responsive
Advanced tools
Comparing version 0.0.3 to 0.0.4
{ | ||
"name": "react-responsive", | ||
"description": "Media queries in react for responsive design", | ||
"version": "0.0.3", | ||
"version": "0.0.4", | ||
"homepage": "http://github.com/wearefractal/react-responsive", | ||
@@ -6,0 +6,0 @@ "repository": { |
@@ -10,3 +10,3 @@ /* global window */ | ||
var toQuery = require('./toQuery'); | ||
var matchMedia = window ? window.matchMedia : null; | ||
var matchMedia = typeof window !== 'undefined' ? window.matchMedia : null; | ||
@@ -83,2 +83,2 @@ var defaultTypes = { | ||
module.exports = mq; | ||
module.exports = mq; |
var PropTypes = require('react/lib/ReactPropTypes'); | ||
var mergeInto = require('react/lib/mergeInto'); | ||
var assign = require('object-assign'); | ||
@@ -74,4 +74,4 @@ var stringOrNumber = PropTypes.oneOfType([ | ||
var all = {}; | ||
mergeInto(all, types); | ||
mergeInto(all, features); | ||
assign(all, types); | ||
assign(all, features); | ||
@@ -82,2 +82,2 @@ module.exports = { | ||
features: features | ||
}; | ||
}; |
1054047
12965