Skip to content
Browse files

update license

change video to vimeo
  • Loading branch information...
1 parent c05d56c commit cffd756c4764e7a43fa39a4da20de4ff61d75709 @BerkeleyTrue BerkeleyTrue committed
Showing with 31 additions and 14 deletions.
  1. +0 −7 LICENSE
  2. +18 −0 LICENSE.md
  3. +1 −1 src/Play-Button.jsx
  4. +3 −1 src/Spinner.jsx
  5. +9 −5 src/Vimeo.jsx
View
7 LICENSE
@@ -1,7 +0,0 @@
-(The MIT License)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
18 LICENSE.md
@@ -0,0 +1,18 @@
+Copyright (c) 2015 Berkeley Martinez
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</copyright></year>
View
2 src/Play-Button.jsx
@@ -11,7 +11,7 @@ export default React.createClass({
render() {
return (
<button
- className='video-play-button'
+ className='vimeo-play-button'
onClick={ this.props.onClick }
type='button'>
<svg
View
4 src/Spinner.jsx
@@ -2,9 +2,11 @@
import React from 'react';
export default React.createClass({
+ displayName: 'Spinner',
+
render() {
return (
- <div className='video-loading'>
+ <div className='vimeo-loading'>
<svg
height='32'
viewBox='0 0 32 32'
View
14 src/Vimeo.jsx
@@ -1,9 +1,12 @@
import React, { PropTypes } from 'react';
+import debugFactory from 'debug';
import PlayButton from './Play-Button.jsx';
import Spinner from './Spinner.jsx';
-import ajax from './ajax';
+import { get } from './ajax';
+
+const debug = debugFactory('vimeo:player');
export default React.createClass({
displayName: 'Vimeo',
@@ -18,7 +21,7 @@ export default React.createClass({
getDefaultProps() {
return {
- className: 'video'
+ className: 'vimeo'
};
},
@@ -66,9 +69,10 @@ export default React.createClass({
}
const id = this.props.videoId;
- ajax.get({
+ get({
url: `//vimeo.com/api/v2/video/${id}.json`,
onSuccess: (res) => {
+ debug('ajax response', res);
this.setState({
thumb: res[0].thumbnail_large,
imageLoaded: true
@@ -91,7 +95,7 @@ export default React.createClass({
};
return (
- <div className='video-image' style={ style }>
+ <div className='vimeo-image' style={ style }>
<PlayButton onClick={ this.playVideo } />
</div>
);
@@ -109,7 +113,7 @@ export default React.createClass({
};
return (
- <div className='video-embed' style={ embedVideoStyle }>
+ <div className='vimeo-embed' style={ embedVideoStyle }>
<iframe frameBorder='0' src={ this.getIframeUrl() }></iframe>
</div>
);

0 comments on commit cffd756

Please sign in to comment.
Something went wrong with that request. Please try again.