release v1.4.0

CHANGELOG.md

@@ -1,3 +1,10 @@
+v1.4.0 - Thu, 30 Jun 2016 19:12:02 GMT
+--------------------------------------
+
+- [13bd46e](../../commit/13bd46e) [fixed] clear the delayed close timer when modal opens again. (#189)
+- [70d91eb](../../commit/70d91eb) [fixed] Add missing envify npm dependency. Closes #193 (#194)
+
+
 v1.3.0 - Tue, 17 May 2016 16:04:50 GMT
 --------------------------------------
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "react-modal",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "homepage": "https://github.com/rackt/react-modal",
   "authors": [
     "Ryan Florence",

dist/react-modal.js

@@ -311,15 +311,20 @@ return /******/ (function(modules) { // webpackBootstrap
 	  },
 
 	  open: function open() {
-	    focusManager.setupScopedFocus(this.node);
-	    focusManager.markForFocusLater();
-	    this.setState({ isOpen: true }, function () {
-	      this.setState({ afterOpen: true });
-
-	      if (this.props.isOpen && this.props.onAfterOpen) {
-	        this.props.onAfterOpen();
-	      }
-	    }.bind(this));
+	    if (this.state.afterOpen && this.state.beforeClose) {
+	      clearTimeout(this.closeTimer);
+	      this.setState({ beforeClose: false });
+	    } else {
+	      focusManager.setupScopedFocus(this.node);
+	      focusManager.markForFocusLater();
+	      this.setState({ isOpen: true }, function () {
+	        this.setState({ afterOpen: true });
+
+	        if (this.props.isOpen && this.props.onAfterOpen) {
+	          this.props.onAfterOpen();
+	        }
+	      }.bind(this));
+	    }
 	  },
 
 	  close: function close() {
@@ -339,8 +344,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  closeWithoutTimeout: function closeWithoutTimeout() {
 	    this.setState({
-	      afterOpen: false,
-	      beforeClose: false
+	      beforeClose: false,
+	      isOpen: false,
+	      afterOpen: false
 	    }, this.afterClose);
 	  },