Merge branch 'release/1.7.5'

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.7.5 - 2017-10-24
+##Changed
+- Fixed the **Modal**'s `closeButton` boolean condition. 
+
 ## 1.7.4 - 2017-10-23
 ##Changed
 - Updated **Modal** to work a little more like the **Drawwer**.

docs/src/js/components/ModulesModal.react.js

@@ -332,9 +332,9 @@ export default class ModulesModal extends React.Component {
                 allowedTypes: ''
             }, {
                 name: 'closeButton',
-                type: 'string || object',
+                type: 'bool || string || object',
                 default: '',
-                description: 'A Modal\'s close button can be changed using a string or giving custom JSX.',
+                description: 'A Modal\'s close button can be disabled or or the icon type can be changed using a string or giving custom JSX.',
                 allowedTypes: ''
             }, {
                 name: 'height',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-cm-ui",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "React UI for Church management",
   "main": "lib/",
   "jsnext:main": "src/",

src/Modules/Modal.react.js

@@ -33,7 +33,7 @@ class ModalHeader extends Component {
                 <Header as="h2" className={titleClass} title={title}>{title}</Header>
 
                 <div className="modal-close-button-container">
-                    {!closeButton || _.isString(closeButton) ? (
+                    {_.isUndefined(closeButton) || _.isString(closeButton) ? (
                         <Button
                             className="modal-close-button"
                             color={inverse ? 'transparent' : 'alternate'}