Skip to content

Commit

Permalink
Merge pull request #31 from jumasheff/master
Browse files Browse the repository at this point in the history
Fix import statements for case-sensitive OSs
  • Loading branch information
mderrick committed Jun 8, 2016
2 parents 325cb0f + f5cf6a7 commit ec0e0d8
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions demo/src/components/index/Index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Header from './header/header';
import Main from './main/main';
import Header from './header/Header';
import Main from './main/Main';

var Index = React.createClass({

Expand Down
2 changes: 1 addition & 1 deletion demo/src/components/index/header/Header.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import Icon from './../../icon/icon';
import Icon from './../../icon/Icon';

var Header = React.createClass({

Expand Down
4 changes: 2 additions & 2 deletions demo/src/components/index/main/Main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import ReactDOM from 'react-dom';
import Button from './../../button/button';
import Button from './../../button/Button';
import browserStackLogo from './../../../../browserstack.png';
import {default as Video, Controls, Overlay} from './../../../../../src/components/video/video';
import {default as Video, Controls, Overlay} from './../../../../../src/components/video/Video';

var videos = [
// TODO: Don't hot link these. upload them somewhere.
Expand Down
2 changes: 1 addition & 1 deletion demo/src/entry.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import Index from './components/index/index';
import Index from './components/index/Index';

// For hot reloading to work it is essential
// that our entry point only contains this render
Expand Down
10 changes: 5 additions & 5 deletions src/components/controls/Controls.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import Play from './play/play';
import Seek from './seek/seek';
import Mute from './mute/mute';
import Time from './time/time';
import Fullscreen from './fullscreen/fullscreen';
import Play from './play/Play';
import Seek from './seek/Seek';
import Mute from './mute/Mute';
import Time from './time/Time';
import Fullscreen from './fullscreen/Fullscreen';

var Controls = React.createClass({

Expand Down
2 changes: 1 addition & 1 deletion src/components/controls/fullscreen/Fullscreen.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import Icon from './../../icon/icon';
import Icon from './../../icon/Icon';

var Fullscreen = React.createClass({

Expand Down
4 changes: 2 additions & 2 deletions src/components/controls/mute/Mute.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Icon from './../../icon/icon';
import ProgressBar from './../../progressbar/progressbar';
import Icon from './../../icon/Icon';
import ProgressBar from './../../progressbar/ProgressBar';

var Mute = React.createClass({

Expand Down
2 changes: 1 addition & 1 deletion src/components/controls/play/Play.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import Icon from './../../icon/icon';
import Icon from './../../icon/Icon';

var Play = React.createClass({

Expand Down
4 changes: 2 additions & 2 deletions src/components/controls/seek/Seek.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import ProgressBar from './../../progressbar/progressbar';
import ProgressBar from './../../progressbar/ProgressBar';

var Seek = React.createClass({

Expand All @@ -15,7 +15,7 @@ var Seek = React.createClass({
return {
// When the child range input becomes focused,
// we need to set this custom seek bar to look
// 'focused' with the correct styles. Need to
// 'focused' with the correct styles. Need to
// do this via a class.
focused: false
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/controls/time/Time.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import Icon from './../../icon/icon';
import Icon from './../../icon/Icon';

var Time = React.createClass({

Expand Down
14 changes: 7 additions & 7 deletions src/components/video/Video.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
import Overlay from './overlay/overlay';
import Controls from './../controls/controls';
import Seek from './../controls/seek/seek';
import Play from './../controls/play/play';
import Mute from './../controls/mute/mute';
import Fullscreen from './../controls/fullscreen/fullscreen';
import Time from './../controls/time/time';
import Overlay from './overlay/Overlay';
import Controls from './../controls/Controls';
import Seek from './../controls/seek/Seek';
import Play from './../controls/play/Play';
import Mute from './../controls/mute/Mute';
import Fullscreen from './../controls/fullscreen/Fullscreen';
import Time from './../controls/time/Time';
import throttle from 'lodash.throttle';
import copy from './../../assets/copy';

Expand Down
4 changes: 2 additions & 2 deletions src/components/video/overlay/Overlay.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Icon from './../../icon/icon';
import Spinner from './../../spinner/spinner';
import Icon from './../../icon/Icon';
import Spinner from './../../spinner/Spinner';

var Overlay = React.createClass({

Expand Down

0 comments on commit ec0e0d8

Please sign in to comment.