Skip to content

Commit

Permalink
Fix React 0.14 inheritance warning
Browse files Browse the repository at this point in the history
  • Loading branch information
syranide committed Sep 16, 2015
1 parent 7f7c4ec commit 056f561
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 89 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-swf",
"version": "0.12.2",
"version": "0.12.3",
"license": "MIT",
"description": "Shockwave Flash Player component for React",
"authors": ["Andreas Svensson <[email protected]>"],
Expand Down
2 changes: 1 addition & 1 deletion npm-react-swf/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-swf",
"version": "0.12.2",
"version": "0.12.3",
"license": "MIT",
"description": "Shockwave Flash Player component for React",
"author": "Andreas Svensson <[email protected]>",
Expand Down
68 changes: 26 additions & 42 deletions npm-react-swf/react-swf.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/*! react-swf v0.12.2 | @syranide | MIT license */
/*! react-swf v0.12.3 | @syranide | MIT license */

'use strict';

var React = require('react');
var PropTypes = React.PropTypes;

var mimeTypeFP = 'application/x-shockwave-flash';

Expand Down Expand Up @@ -228,53 +229,36 @@ function ReactSWF(props) {
};
}

Object.assign(ReactSWF, React.Component);
ReactSWF.prototype = Object.create(React.Component.prototype);
ReactSWF.prototype.constructor = ReactSWF;

ReactSWF.getFPVersion = getMemoizedFPVersion;
ReactSWF.isFPVersionSupported = isFPVersionSupported;

ReactSWF.propTypes = {
src: React.PropTypes.string.isRequired,

flashVars: React.PropTypes.oneOfType([
React.PropTypes.object, React.PropTypes.string
]),

allowFullScreen: React.PropTypes.bool,
allowNetworking: React.PropTypes.oneOf([
'all', 'internal', 'none'
]),
allowScriptAccess: React.PropTypes.oneOf([
'always', 'sameDomain', 'never'
]),

align: React.PropTypes.oneOf([
'l', 't', 'r'
]),
base: React.PropTypes.string,
bgcolor: React.PropTypes.string,
fullScreenAspectRatio: React.PropTypes.oneOf([
'portrait', 'landscape'
]),
loop: React.PropTypes.bool,
menu: React.PropTypes.bool,
play: React.PropTypes.bool,
quality: React.PropTypes.oneOf([
'low', 'autolow', 'autohigh', 'medium', 'high', 'best'
]),
salign: React.PropTypes.oneOf([
'l', 't', 'r', 'tl', 'tr'
]),
scale: React.PropTypes.oneOf([
'default', 'noborder', 'exactfit', 'noscale'
]),
seamlessTabbing: React.PropTypes.bool,
wmode: React.PropTypes.oneOf([
'window', 'direct', 'opaque', 'transparent', 'gpu'
])
src: PropTypes.string.isRequired,

flashVars: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),

allowFullScreen: PropTypes.bool,
allowNetworking: PropTypes.oneOf(['all', 'internal', 'none']),
allowScriptAccess: PropTypes.oneOf(['always', 'sameDomain', 'never']),

align: PropTypes.oneOf(['l', 't', 'r']),
base: PropTypes.string,
bgcolor: PropTypes.string,
fullScreenAspectRatio: PropTypes.oneOf(['portrait', 'landscape']),
loop: PropTypes.bool,
menu: PropTypes.bool,
play: PropTypes.bool,
quality: PropTypes.oneOf(['low', 'autolow', 'autohigh', 'medium', 'high', 'best']),
salign: PropTypes.oneOf(['l', 't', 'r', 'tl', 'tr']),
scale: PropTypes.oneOf(['default', 'noborder', 'exactfit', 'noscale']),
seamlessTabbing: PropTypes.bool,
wmode: PropTypes.oneOf(['window', 'direct', 'opaque', 'transparent', 'gpu'])
};

ReactSWF.prototype = Object.create(React.Component.prototype);
ReactSWF.prototype.constructor = ReactSWF;

ReactSWF.prototype.getFPDOMNode = function() {
return this._node;
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-swf",
"version": "0.12.2",
"version": "0.12.3",
"license": "MIT",
"description": "Shockwave Flash Player component for React",
"author": "Andreas Svensson <[email protected]>",
Expand Down
69 changes: 27 additions & 42 deletions react-swf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! react-swf v0.12.2 | @syranide | MIT license */
/*! react-swf v0.12.3 | @syranide | MIT license */

(function(root, factory) {
if (typeof define === 'function' && define.amd) {
Expand All @@ -11,6 +11,8 @@
}(this, function(React) {
'use strict';

var PropTypes = React.PropTypes;

var mimeTypeFP = 'application/x-shockwave-flash';

/*
Expand Down Expand Up @@ -235,53 +237,36 @@
};
}

Object.assign(ReactSWF, React.Component);
ReactSWF.prototype = Object.create(React.Component.prototype);
ReactSWF.prototype.constructor = ReactSWF;

ReactSWF.getFPVersion = getMemoizedFPVersion;
ReactSWF.isFPVersionSupported = isFPVersionSupported;

ReactSWF.propTypes = {
src: React.PropTypes.string.isRequired,

flashVars: React.PropTypes.oneOfType([
React.PropTypes.object, React.PropTypes.string
]),

allowFullScreen: React.PropTypes.bool,
allowNetworking: React.PropTypes.oneOf([
'all', 'internal', 'none'
]),
allowScriptAccess: React.PropTypes.oneOf([
'always', 'sameDomain', 'never'
]),

align: React.PropTypes.oneOf([
'l', 't', 'r'
]),
base: React.PropTypes.string,
bgcolor: React.PropTypes.string,
fullScreenAspectRatio: React.PropTypes.oneOf([
'portrait', 'landscape'
]),
loop: React.PropTypes.bool,
menu: React.PropTypes.bool,
play: React.PropTypes.bool,
quality: React.PropTypes.oneOf([
'low', 'autolow', 'autohigh', 'medium', 'high', 'best'
]),
salign: React.PropTypes.oneOf([
'l', 't', 'r', 'tl', 'tr'
]),
scale: React.PropTypes.oneOf([
'default', 'noborder', 'exactfit', 'noscale'
]),
seamlessTabbing: React.PropTypes.bool,
wmode: React.PropTypes.oneOf([
'window', 'direct', 'opaque', 'transparent', 'gpu'
])
src: PropTypes.string.isRequired,

flashVars: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),

allowFullScreen: PropTypes.bool,
allowNetworking: PropTypes.oneOf(['all', 'internal', 'none']),
allowScriptAccess: PropTypes.oneOf(['always', 'sameDomain', 'never']),

align: PropTypes.oneOf(['l', 't', 'r']),
base: PropTypes.string,
bgcolor: PropTypes.string,
fullScreenAspectRatio: PropTypes.oneOf(['portrait', 'landscape']),
loop: PropTypes.bool,
menu: PropTypes.bool,
play: PropTypes.bool,
quality: PropTypes.oneOf(['low', 'autolow', 'autohigh', 'medium', 'high', 'best']),
salign: PropTypes.oneOf(['l', 't', 'r', 'tl', 'tr']),
scale: PropTypes.oneOf(['default', 'noborder', 'exactfit', 'noscale']),
seamlessTabbing: PropTypes.bool,
wmode: PropTypes.oneOf(['window', 'direct', 'opaque', 'transparent', 'gpu'])
};

ReactSWF.prototype = Object.create(React.Component.prototype);
ReactSWF.prototype.constructor = ReactSWF;

ReactSWF.prototype.getFPDOMNode = function() {
return this._node;
};
Expand Down
4 changes: 2 additions & 2 deletions react-swf.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 056f561

Please sign in to comment.