Merge branch 'release/0.2.0'

igorprado · Oct 9, 2015 · 8cf571c · 8cf571c
2 parents 4352762 + 7308b25
commit 8cf571c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.2.0 - Oct 9, 2015
+
+**Implemented enhancements:**
+
+* Now supports React 0.14!
+
 ## 0.1.17 - Oct 9, 2015
 
 **Implemented enhancements, merged pull requrests:**

diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ The notification object has the following properties:
 
 ### Dismissible
 
-If set to false, the notification will not display the dismiss ('x') button and will only be dismissible programmatically. [See more](#removenotificationnotification)
+If set to false, the notification will not display the dismiss ('x') button and will only be dismissible programmatically or after autoDismiss timeout. [See more](#removenotificationnotification)
 
 ### Action
 

diff --git a/example/build/app.js b/example/build/app.js
diff --git a/example/package.json b/example/package.json
@@ -4,7 +4,8 @@
   "description": "",
   "main": "src/app.js",
   "dependencies": {
-    "react": "^0.13.0"
+    "react": "^0.14.0",
+    "react-dom": "^0.14.0"
   },
   "devDependencies": {
     "browserify": "^10.1.0",

diff --git a/example/src/app.js b/example/src/app.js
@@ -1,4 +1,5 @@
 var React = require('react');
+var ReactDOM = require('react-dom');
 var merge = require('object-assign');
 
 var NotificationSystem = require('react-notification-system');
@@ -254,7 +255,7 @@ var NotificationSystemExample = React.createClass({
                           <div className="col-xs-12 col-sm-7">
                             {action}
                           </div>
-                          <small className={error.dismissible}>This notification will be only dismissible programmatically.</small>
+                          <small className={error.dismissible}>This notification will be only dismissible programmatically or after 'autoDismiss' timeout.</small>
                         </div>
 
 
@@ -274,7 +275,7 @@ var NotificationSystemExample = React.createClass({
   }
 });
 
-React.render(
+ReactDOM.render(
   React.createElement(NotificationSystemExample),
   document.getElementById('app')
 );
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-notification-system",
-  "version": "0.1.17",
+  "version": "0.2.0",
   "description": "A React Notification System fully customized",
   "main": "dist/notification-system.js",
   "scripts": {

diff --git a/src/notification-item.js b/src/notification-item.js
@@ -1,4 +1,5 @@
 var React = require('react');
+var ReactDOM = require('react-dom');
 var Constants = require('./constants');
 var Styles = require('./styles');
 var Helpers = require('./helpers');
@@ -149,7 +150,7 @@ var NotificationItem = React.createClass({
 		var transitionEvent = whichTransitionEvent();
     var notification = this.props.notification;
 
-    var element = React.findDOMNode(this);
+    var element = ReactDOM.findDOMNode(this);
 
     this._height = element.offsetHeight;