Call method onActivation after popped view

vash15 · Jun 25, 2014 · d0e096b · d0e096b
1 parent d77d52a
commit d0e096b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone.viewstack",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "homepage": "https://github.com/vash15/backbone.viewstack",
   "authors": [
     "Michele Belluco <[email protected]>"

diff --git a/lib/viewstack.js b/lib/viewstack.js
@@ -161,11 +161,14 @@ var ViewStack = module.exports = BackBone.View.extend({
             popped.trigger("deactive");
         }
 
-        // Assegno la nuova view corrente
-        this._current = this._stack[ this._stack.length-1 ];
-
+        // Stack replace
         if ( this._stackReplace.length > 0 ){
         	this.pushView( this._stackReplace.pop() );
+        }else{
+        	// Assegno la nuova view corrente
+	        this._current = this._stack[ this._stack.length-1 ];
+	        if ( this._current && this._current.onActivate ) 
+				this._current.onActivate();
         }
 
         this