Bug fixes and version bump.

VoliJS · Sep 9, 2015 · 95b4f59 · 95b4f59
1 parent 01363ef
commit 95b4f59
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
   ],
 
   "license": "MIT",
-  "version": "0.1.0",
+  "version": "0.1.1",
 
   "scripts": {
     "make:backbone:win" : "type .\\umd\\copyright.js .\\umd\\backbone-head.js .\\src\\glue.js .\\umd\\tail.js > .\\react-backbone.js",

diff --git a/react-backbone.js b/react-backbone.js
@@ -1,5 +1,5 @@
 /**
- * React-Backbone.Glue 0.1.0 <https://github.com/Volicon/react-backbone.glue>
+ * React-Backbone.Glue 0.1.1 <https://github.com/Volicon/react-backbone.glue>
  * (c) 2015 Vlad Balin & Volicon
  * Released under MIT @license
  */
@@ -172,12 +172,7 @@
             // new element instance needs to be created on next render...
             if( this.element ){
                 this.element = null;
-
-                if( this.component && this.component.trigger ){
-                    this.stopListening( this.component );
-                }
-
-                this.component = null;
+                this.unmountComponent();
             }
 
             return Backbone.View.prototype.setElement.apply( this, arguments );
@@ -186,6 +181,17 @@
         // cached instance of react component...
         component : null,
 
+        unmountComponent : function(){
+            if( this.component ){
+                if( this.component.trigger ){
+                    this.stopListening( this.component );
+                }
+
+                React.unmountComponentAtNode( this.el );
+                this.component = null;
+            }
+        },
+
         render : function(){
             if( !this.element ){
                 this.element = React.createElement.apply( React, this._args );
@@ -199,6 +205,11 @@
                     this.trigger.apply( this, arguments );
                 });
             }
+        },
+
+        dispose : function(){
+            this.unmountComponent();
+            Backbone.View.prototype.dispose.apply( this, arguments );
         }
     });
 

diff --git a/react-backbone.min.js b/react-backbone.min.js
diff --git a/react-nested.min.js b/react-nested.min.js
diff --git a/src/glue.js b/src/glue.js
@@ -157,12 +157,7 @@ function reactBackboneGlue( Backbone, React ){
             // new element instance needs to be created on next render...
             if( this.element ){
                 this.element = null;
-
-                if( this.component && this.component.trigger ){
-                    this.stopListening( this.component );
-                }
-
-                this.component = null;
+                this.unmountComponent();
             }
 
             return Backbone.View.prototype.setElement.apply( this, arguments );
@@ -171,6 +166,17 @@ function reactBackboneGlue( Backbone, React ){
         // cached instance of react component...
         component : null,
 
+        unmountComponent : function(){
+            if( this.component ){
+                if( this.component.trigger ){
+                    this.stopListening( this.component );
+                }
+
+                React.unmountComponentAtNode( this.el );
+                this.component = null;
+            }
+        },
+
         render : function(){
             if( !this.element ){
                 this.element = React.createElement.apply( React, this._args );
@@ -184,6 +190,11 @@ function reactBackboneGlue( Backbone, React ){
                     this.trigger.apply( this, arguments );
                 });
             }
+        },
+
+        dispose : function(){
+            this.unmountComponent();
+            Backbone.View.prototype.dispose.apply( this, arguments );
         }
     });
 

diff --git a/umd/copyright.js b/umd/copyright.js
@@ -1,5 +1,5 @@
 /**
- * React-Backbone.Glue 0.1.0 <https://github.com/Volicon/react-backbone.glue>
+ * React-Backbone.Glue 0.1.1 <https://github.com/Volicon/react-backbone.glue>
  * (c) 2015 Vlad Balin & Volicon
  * Released under MIT @license
  */