Skip to content

Commit

Permalink
updated to latest dependecies, sample can't be easily backwards compa…
Browse files Browse the repository at this point in the history
…tible with old react versions so we focus on the latest react
  • Loading branch information
pekeler committed Jan 8, 2016
1 parent 29d0d08 commit 5cd9036
Show file tree
Hide file tree
Showing 9 changed files with 28,877 additions and 22,850 deletions.
27,227 changes: 17,150 additions & 10,077 deletions dist/react-responsive.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/react-responsive.js.map

Large diffs are not rendered by default.

45 changes: 23 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,33 @@
],
"dependencies": {
"hyphenate-style-name": "^1.0.0",
"lodash.omit": "^3.0.0",
"matchmedia": "^0.1.1",
"object-assign": "^2.0.0"
"lodash.omit": "^3.1.0",
"matchmedia": "^0.1.2",
"object-assign": "^4.0.1"
},
"peerDependencies": {
"react": "^0.12.0 || ^0.13.0 || ^0.14.0"
"react": "^0.14.0"
},
"devDependencies": {
"browserify": "^5.8.0",
"ecstatic": "^0.5.4",
"gulp": "^3.8.6",
"gulp-autowatch": "0.0.1",
"gulp-cached": "^1.0.1",
"gulp-gh-pages": "^0.3.3",
"gulp-jshint": "^1.7.1",
"gulp-livereload": "^2.1.0",
"gulp-sourcemaps": "^1.1.0",
"jshint": "^2.4.1",
"jshint-stylish": "^0.4.0",
"merge-stream": "^0.1.5",
"mocha": "^1.20.1",
"reactify": "^1.0.0",
"should": "^4.0.4",
"vinyl-buffer": "0.0.0",
"vinyl-source-stream": "^0.1.1",
"watchify": "^1.0.0"
"browserify": "^12.0.1",
"ecstatic": "^1.4.0",
"gulp": "^3.9.0",
"gulp-autowatch": "1.0.2",
"gulp-cached": "^1.1.0",
"gulp-gh-pages": "^0.5.4",
"gulp-jshint": "^2.0.0",
"gulp-livereload": "^3.8.1",
"gulp-sourcemaps": "^1.6.0",
"jshint": "^2.x",
"jshint-stylish": "^2.1.0",
"merge-stream": "^1.0.0",
"mocha": "^2.3.4",
"react-dom": "^0.14.0",
"reactify": "^1.1.1",
"should": "^8.0.2",
"vinyl-buffer": "1.0.0",
"vinyl-source-stream": "^1.1.0",
"watchify": "^3.6.1"
},
"scripts": {
"lint": "jshint ./src --reporter node_modules/jshint-stylish/stylish.js --exclude node_modules",
Expand Down
4 changes: 3 additions & 1 deletion samples/sandbox/dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<link rel='stylesheet' type='text/css' href='sample.css'>
</head>
<body>
If you see this then something is wrong.
<div id="main">
If you see this then something is wrongly.
</div>
<script src='sample.js'></script>
</body>
</html>
34 changes: 17 additions & 17 deletions samples/sandbox/dist/index.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/** @jsx React.DOM */
/* global document, window */

'use strict';

var mq = require('../../../src');
var MediaQuery = require('../../../src');
var React = require('react');
var ReactDOM = require('react-dom');
window.React = React; // for dev

var App = React.createClass({
Expand All @@ -13,31 +13,31 @@ var App = React.createClass({
return (
<div>
<div>Device Test!</div>
<mq minDeviceWidth={1224}>
<MediaQuery minDeviceWidth={1224}>
<div>You are a desktop or laptop</div>
<mq minDeviceWidth={1824}>
<MediaQuery minDeviceWidth={1824}>
<div>You also have a huge screen</div>
</mq>
<mq maxWidth={1224}>
</MediaQuery>
<MediaQuery maxWidth={1224}>
<div>You are sized like a tablet or mobile phone though</div>
</mq>
</mq>
<mq maxDeviceWidth={1224}>
</MediaQuery>
</MediaQuery>
<MediaQuery maxDeviceWidth={1224}>
<div>You are a tablet or mobile phone</div>
</mq>
</MediaQuery>

<mq orientation='portrait'>
<MediaQuery orientation='portrait'>
<div>You are portrait</div>
</mq>
<mq orientation='landscape'>
</MediaQuery>
<MediaQuery orientation='landscape'>
<div>You are landscape</div>
</mq>
<mq minResolution='2dppx'>
</MediaQuery>
<MediaQuery minResolution='2dppx'>
<div>You are retina</div>
</mq>
</MediaQuery>
</div>
);
}
});

React.renderComponent(App(), document.body);
ReactDOM.render(<App/>, document.getElementById('main'));

0 comments on commit 5cd9036

Please sign in to comment.