diff --git a/build/simple-modal.js b/build/simple-modal.js index 2719279..4f7ac16 100755 --- a/build/simple-modal.js +++ b/build/simple-modal.js @@ -98,13 +98,15 @@ var Modal = (function (_React$Component) { key: 'render', value: function render() { if (!this.state.show) return null; + var modalStyle = undefined, + containerStyle = undefined; //completely overwrite if they use a class if (this.props.className) { modalStyle = this.props.style; containerStyle = this.props.containerStyle; } else { - var modalStyle = _extends({}, _styles2['default'].modal, this.props.style); - var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle); + modalStyle = _extends({}, _styles2['default'].modal, this.props.style); + containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle); } if (this.props.transitionSpeed) modalStyle = _extends({}, this.state, modalStyle); diff --git a/dist/simple-react-modal.js b/dist/simple-react-modal.js index 84979db..df4ea1e 100644 --- a/dist/simple-react-modal.js +++ b/dist/simple-react-modal.js @@ -100,13 +100,15 @@ var Modal = (function (_React$Component) { key: 'render', value: function render() { if (!this.state.show) return null; + var modalStyle = undefined, + containerStyle = undefined; //completely overwrite if they use a class if (this.props.className) { modalStyle = this.props.style; containerStyle = this.props.containerStyle; } else { - var modalStyle = _extends({}, _styles2['default'].modal, this.props.style); - var containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle); + modalStyle = _extends({}, _styles2['default'].modal, this.props.style); + containerStyle = _extends({}, _styles2['default'].container, this.props.containerStyle); } if (this.props.transitionSpeed) modalStyle = _extends({}, this.state, modalStyle); diff --git a/dist/simple-react-modal.min.js b/dist/simple-react-modal.min.js index 29f4679..e2af28e 100644 --- a/dist/simple-react-modal.min.js +++ b/dist/simple-react-modal.min.js @@ -1 +1 @@ -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.simpleModal=e()}}(function(){return function e(t,o,n){function i(s,a){if(!o[s]){if(!t[s]){var u="function"==typeof require&&require;if(!a&&u)return u(s,!0);if(r)return r(s,!0);var l=new Error("Cannot find module '"+s+"'");throw l.code="MODULE_NOT_FOUND",l}var f=o[s]={exports:{}};t[s][0].call(f.exports,function(e){var o=t[s][1][e];return i(o?o:e)},f,f.exports,e,t,o,n)}return o[s].exports}for(var r="function"==typeof require&&require,s=0;s