From c9b402a689b3a0940792cec9af60544e289bc8ee Mon Sep 17 00:00:00 2001 From: Andreas Svensson Date: Fri, 13 Oct 2017 14:42:29 +0200 Subject: [PATCH] Change React.PropTypes to require('prop-types') --- bower.json | 5 +++-- npm-react-swf/compat.js | 4 ++-- npm-react-swf/package.json | 5 +++-- npm-react-swf/react-swf.js | 4 ++-- package.json | 5 +++-- react-swf-compat.js | 12 +++++------- react-swf-compat.min.js | 4 ++-- react-swf.js | 12 +++++------- react-swf.min.js | 4 ++-- 9 files changed, 27 insertions(+), 28 deletions(-) diff --git a/bower.json b/bower.json index d9e62a6..7e8cd9f 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "react-swf", - "version": "1.0.6", + "version": "1.0.7", "license": "MIT", "description": "Shockwave Flash Player component for React", "authors": ["Andreas Svensson "], @@ -12,7 +12,8 @@ "url": "https://github.com/syranide/react-swf" }, "dependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" + "react": "^15.0.0-0 || ^16.0.0-0", + "prop-types": "^15.0.0-0" }, "keywords": [ "react", diff --git a/npm-react-swf/compat.js b/npm-react-swf/compat.js index 26930f7..8f8d2b3 100644 --- a/npm-react-swf/compat.js +++ b/npm-react-swf/compat.js @@ -1,12 +1,12 @@ -/*! react-swf v1.0.6 | @syranide | MIT license */ +/*! react-swf v1.0.7 | @syranide | MIT license */ 'use strict'; +var PropTypes = require('prop-types'); var React = require('react'); var ReactDOM = require('react-dom'); var ReactDOMServer = require('react-dom/server'); var ReactSWF = require('react-swf'); -var PropTypes = React.PropTypes; function ReactSWFCompat(props) { React.Component.call(this, props); diff --git a/npm-react-swf/package.json b/npm-react-swf/package.json index 269c75d..8d5b574 100644 --- a/npm-react-swf/package.json +++ b/npm-react-swf/package.json @@ -1,6 +1,6 @@ { "name": "react-swf", - "version": "1.0.6", + "version": "1.0.7", "license": "MIT", "description": "Shockwave Flash Player component for React", "author": "Andreas Svensson ", @@ -12,7 +12,8 @@ "url": "https://github.com/syranide/react-swf" }, "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" + "react": "^15.0.0-0 || ^16.0.0-0", + "prop-types": "^15.0.0-0" }, "keywords": [ "react", diff --git a/npm-react-swf/react-swf.js b/npm-react-swf/react-swf.js index 5e466c2..6b2521a 100644 --- a/npm-react-swf/react-swf.js +++ b/npm-react-swf/react-swf.js @@ -1,9 +1,9 @@ -/*! react-swf v1.0.6 | @syranide | MIT license */ +/*! react-swf v1.0.7 | @syranide | MIT license */ 'use strict'; +var PropTypes = require('prop-types'); var React = require('react'); -var PropTypes = React.PropTypes; /* flashVars = {key: string} or "key=value&..." diff --git a/package.json b/package.json index 269c75d..8d5b574 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-swf", - "version": "1.0.6", + "version": "1.0.7", "license": "MIT", "description": "Shockwave Flash Player component for React", "author": "Andreas Svensson ", @@ -12,7 +12,8 @@ "url": "https://github.com/syranide/react-swf" }, "peerDependencies": { - "react": "^15.0.0-0 || ^16.0.0-0" + "react": "^15.0.0-0 || ^16.0.0-0", + "prop-types": "^15.0.0-0" }, "keywords": [ "react", diff --git a/react-swf-compat.js b/react-swf-compat.js index 47d5d5d..6a0b8b5 100644 --- a/react-swf-compat.js +++ b/react-swf-compat.js @@ -1,18 +1,16 @@ -/*! react-swf v1.0.6 | @syranide | MIT license */ +/*! react-swf v1.0.7 | @syranide | MIT license */ (function(root, factory) { if (typeof define === 'function' && define.amd) { - define(['react', 'react-dom', 'react-dom/server', 'react-swf'], factory); + define(['prop-types', 'react', 'react-dom', 'react-dom/server', 'react-swf'], factory); } else if (typeof exports === 'object') { - module.exports = factory(require('react'), require('react-dom'), require('react-dom/server'), require('react-swf')); + module.exports = factory(require('prop-types'), require('react'), require('react-dom'), require('react-dom/server'), require('react-swf')); } else { - root.ReactSWFCompat = factory(root.React, root.ReactDOM, root.ReactDOMServer, root.ReactSWF); + root.ReactSWFCompat = factory(root.PropTypes, root.React, root.ReactDOM, root.ReactDOMServer, root.ReactSWF); } -}(this, function(React, ReactDOM, ReactDOMServer, ReactSWF) { +}(this, function(PropTypes, React, ReactDOM, ReactDOMServer, ReactSWF) { 'use strict'; - var PropTypes = React.PropTypes; - function ReactSWFCompat(props) { React.Component.call(this, props); diff --git a/react-swf-compat.min.js b/react-swf-compat.min.js index 216746d..f118363 100644 --- a/react-swf-compat.min.js +++ b/react-swf-compat.min.js @@ -1,2 +1,2 @@ -/*! react-swf v1.0.6 | @syranide | MIT license */ -!function(e,t){"function"==typeof define&&define.amd?define(["react","react-dom","react-dom/server","react-swf"],t):"object"==typeof exports?module.exports=t(require("react"),require("react-dom"),require("react-dom/server"),require("react-swf")):e.ReactSWFCompat=t(e.React,e.ReactDOM,e.ReactDOMServer,e.ReactSWF)}(this,function(e,t,n,r){"use strict";function o(t){e.Component.call(this,t);var n=this;this._containerRefCallback=function(e){n._container=e},this._swfRefCallback=function(e){n._swf=e}}var c=e.PropTypes;return o.prototype=Object.create(e.Component.prototype),o.prototype.constructor=o,Object.assign(o,e.Component),o.propTypes={container:c.element.isRequired},o.prototype._createSWFElement=function(){var t=Object.assign({},this.props);return delete t.container,t.movie=t.src,t.ref=this._swfRefCallback,e.createElement(r,t)},o.prototype.getFPDOMNode=function(){return this._swf.getFPDOMNode()},o.prototype.componentDidMount=function(){var e=this._createSWFElement();this._container.innerHTML=n.renderToString(e),t.render(e,this._container)},o.prototype.componentDidUpdate=function(){var e=this._createSWFElement();t.render(e,this._container)},o.prototype.componentWillUnmount=function(){if(document.documentMode<9){var e=this.getFPDOMNode();for(var t in e)"function"==typeof e[t]&&(e[t]=null)}},o.prototype.render=function(){var t={ref:this._containerRefCallback};return e.cloneElement(this.props.container,t,null)},o}); +/*! react-swf v1.0.7 | @syranide | MIT license */ +!function(e,t){"function"==typeof define&&define.amd?define(["prop-types","react","react-dom","react-dom/server","react-swf"],t):"object"==typeof exports?module.exports=t(require("prop-types"),require("react"),require("react-dom"),require("react-dom/server"),require("react-swf")):e.ReactSWFCompat=t(e.PropTypes,e.React,e.ReactDOM,e.ReactDOMServer,e.ReactSWF)}(this,function(e,t,n,r,o){"use strict";function c(e){t.Component.call(this,e);var n=this;this._containerRefCallback=function(e){n._container=e},this._swfRefCallback=function(e){n._swf=e}}return c.prototype=Object.create(t.Component.prototype),c.prototype.constructor=c,Object.assign(c,t.Component),c.propTypes={container:e.element.isRequired},c.prototype._createSWFElement=function(){var e=Object.assign({},this.props);return delete e.container,e.movie=e.src,e.ref=this._swfRefCallback,t.createElement(o,e)},c.prototype.getFPDOMNode=function(){return this._swf.getFPDOMNode()},c.prototype.componentDidMount=function(){var e=this._createSWFElement();this._container.innerHTML=r.renderToString(e),n.render(e,this._container)},c.prototype.componentDidUpdate=function(){var e=this._createSWFElement();n.render(e,this._container)},c.prototype.componentWillUnmount=function(){if(document.documentMode<9){var e=this.getFPDOMNode();for(var t in e)"function"==typeof e[t]&&(e[t]=null)}},c.prototype.render=function(){var e={ref:this._containerRefCallback};return t.cloneElement(this.props.container,e,null)},c}); diff --git a/react-swf.js b/react-swf.js index 4d9d816..4e2cb54 100644 --- a/react-swf.js +++ b/react-swf.js @@ -1,18 +1,16 @@ -/*! react-swf v1.0.6 | @syranide | MIT license */ +/*! react-swf v1.0.7 | @syranide | MIT license */ (function(root, factory) { if (typeof define === 'function' && define.amd) { - define(['react'], factory); + define(['prop-types', 'react'], factory); } else if (typeof exports === 'object') { - module.exports = factory(require('react')); + module.exports = factory(require('prop-types'), require('react')); } else { - root.ReactSWF = factory(root.React); + root.ReactSWF = factory(root.PropTypes, root.React); } -}(this, function(React) { +}(this, function(PropTypes, React) { 'use strict'; - var PropTypes = React.PropTypes; - /* flashVars = {key: string} or "key=value&..." diff --git a/react-swf.min.js b/react-swf.min.js index 309eedb..44a3c6b 100644 --- a/react-swf.min.js +++ b/react-swf.min.js @@ -1,2 +1,2 @@ -/*! react-swf v1.0.6 | @syranide | MIT license */ -!function(e,r){"function"==typeof define&&define.amd?define(["react"],r):"object"==typeof exports?module.exports=r(require("react")):e.ReactSWF=r(e.React)}(this,function(e){"use strict";function r(e){return c[e]}function o(e){return(""+e).replace(i,r)}function n(e){var r=[];for(var n in e)if(e.hasOwnProperty(n)){var a=e[n];null!=a&&r.push(o(n)+"="+o(a))}return r.join("&")}function a(r){e.Component.call(this,r);var o=this;this._refCallback=function(e){o._node=e};var a={};for(var t in l)if(l.hasOwnProperty(t)&&r.hasOwnProperty(t)){var i=r[t];if(null!=i){var c=l[t];"flashvars"===c&&"object"==typeof i?i=n(i):s.hasOwnProperty(t)&&(i=!!i),a[c]=""+i}}this._node=null,this.state={src:r.src,params:a}}var t=e.PropTypes,l={flashVars:"flashvars",allowFullScreen:"allowfullscreen",allowFullScreenInteractive:"allowfullscreeninteractive",allowNetworking:"allownetworking",allowScriptAccess:"allowscriptaccess",align:"align",base:"base",bgcolor:"bgcolor",browserZoom:"browserzoom",fullScreenAspectRatio:"fullscreenaspectratio",loop:"loop",menu:"menu",play:"play",quality:"quality",salign:"salign",scale:"scale",seamlessTabbing:"seamlesstabbing",wmode:"wmode"},s={allowFullScreen:!0,allowFullScreenInteractive:!0,loop:!0,menu:!0,play:!0,seamlessTabbing:!0},i=/[\r%&+=]/g,c={"\r":"%0D","%":"%25","&":"%26","+":"%2B","=":"%3D"};return a.prototype=Object.create(e.Component.prototype),a.prototype.constructor=a,Object.assign(a,e.Component),a.propTypes={src:t.string.isRequired,flashVars:t.oneOfType([t.object,t.string]),allowFullScreen:t.bool,allowFullScreenInteractive:t.bool,allowNetworking:t.oneOf(["all","internal","none"]),allowScriptAccess:t.oneOf(["always","sameDomain","never"]),align:t.oneOf(["l","t","r"]),base:t.string,bgcolor:t.string,browserZoom:t.oneOf(["scale","noscale"]),fullScreenAspectRatio:t.oneOf(["portrait","landscape"]),loop:t.bool,menu:t.bool,play:t.bool,quality:t.oneOf(["low","autolow","autohigh","medium","high","best"]),salign:t.oneOf(["l","t","r","tl","tr"]),scale:t.oneOf(["default","noborder","exactfit","noscale"]),seamlessTabbing:t.bool,wmode:t.oneOf(["window","direct","opaque","transparent","gpu"])},a.prototype.getFPDOMNode=function(){return this._node},a.prototype.shouldComponentUpdate=function(e){var r=this.props;for(var o in r)if(r.hasOwnProperty(o)&&!l.hasOwnProperty(o)&&(!e.hasOwnProperty(o)||!Object.is(r[o],e[o])))return!0;for(var o in e)if(e.hasOwnProperty(o)&&!l.hasOwnProperty(o)&&!r.hasOwnProperty(o))return!0;return!1},a.prototype.render=function(){var r=this.props,o=this.state,n={ref:this._refCallback,children:[],type:"application/x-shockwave-flash",data:o.src,src:null};for(var a in r)!r.hasOwnProperty(a)||l.hasOwnProperty(a)||n.hasOwnProperty(a)||(n[a]=r[a]);var t=n.children;for(var s in o.params)t.push(e.createElement("param",{key:s,name:s,value:o.params[s]}));return null!=r.children&&t.push(r.children),e.createElement("object",n)},a}); +/*! react-swf v1.0.7 | @syranide | MIT license */ +!function(e,r){"function"==typeof define&&define.amd?define(["prop-types","react"],r):"object"==typeof exports?module.exports=r(require("prop-types"),require("react")):e.ReactSWF=r(e.PropTypes,e.React)}(this,function(e,r){"use strict";function o(e){return c[e]}function n(e){return(""+e).replace(i,o)}function a(e){var r=[];for(var o in e)if(e.hasOwnProperty(o)){var a=e[o];null!=a&&r.push(n(o)+"="+n(a))}return r.join("&")}function t(e){r.Component.call(this,e);var o=this;this._refCallback=function(e){o._node=e};var n={};for(var t in l)if(l.hasOwnProperty(t)&&e.hasOwnProperty(t)){var i=e[t];if(null!=i){var c=l[t];"flashvars"===c&&"object"==typeof i?i=a(i):s.hasOwnProperty(t)&&(i=!!i),n[c]=""+i}}this._node=null,this.state={src:e.src,params:n}}var l={flashVars:"flashvars",allowFullScreen:"allowfullscreen",allowFullScreenInteractive:"allowfullscreeninteractive",allowNetworking:"allownetworking",allowScriptAccess:"allowscriptaccess",align:"align",base:"base",bgcolor:"bgcolor",browserZoom:"browserzoom",fullScreenAspectRatio:"fullscreenaspectratio",loop:"loop",menu:"menu",play:"play",quality:"quality",salign:"salign",scale:"scale",seamlessTabbing:"seamlesstabbing",wmode:"wmode"},s={allowFullScreen:!0,allowFullScreenInteractive:!0,loop:!0,menu:!0,play:!0,seamlessTabbing:!0},i=/[\r%&+=]/g,c={"\r":"%0D","%":"%25","&":"%26","+":"%2B","=":"%3D"};return t.prototype=Object.create(r.Component.prototype),t.prototype.constructor=t,Object.assign(t,r.Component),t.propTypes={src:e.string.isRequired,flashVars:e.oneOfType([e.object,e.string]),allowFullScreen:e.bool,allowFullScreenInteractive:e.bool,allowNetworking:e.oneOf(["all","internal","none"]),allowScriptAccess:e.oneOf(["always","sameDomain","never"]),align:e.oneOf(["l","t","r"]),base:e.string,bgcolor:e.string,browserZoom:e.oneOf(["scale","noscale"]),fullScreenAspectRatio:e.oneOf(["portrait","landscape"]),loop:e.bool,menu:e.bool,play:e.bool,quality:e.oneOf(["low","autolow","autohigh","medium","high","best"]),salign:e.oneOf(["l","t","r","tl","tr"]),scale:e.oneOf(["default","noborder","exactfit","noscale"]),seamlessTabbing:e.bool,wmode:e.oneOf(["window","direct","opaque","transparent","gpu"])},t.prototype.getFPDOMNode=function(){return this._node},t.prototype.shouldComponentUpdate=function(e){var r=this.props;for(var o in r)if(r.hasOwnProperty(o)&&!l.hasOwnProperty(o)&&(!e.hasOwnProperty(o)||!Object.is(r[o],e[o])))return!0;for(var o in e)if(e.hasOwnProperty(o)&&!l.hasOwnProperty(o)&&!r.hasOwnProperty(o))return!0;return!1},t.prototype.render=function(){var e=this.props,o=this.state,n={ref:this._refCallback,children:[],type:"application/x-shockwave-flash",data:o.src,src:null};for(var a in e)!e.hasOwnProperty(a)||l.hasOwnProperty(a)||n.hasOwnProperty(a)||(n[a]=e[a]);var t=n.children;for(var s in o.params)t.push(r.createElement("param",{key:s,name:s,value:o.params[s]}));return null!=e.children&&t.push(e.children),r.createElement("object",n)},t});