Better popViewToInstance

Author: SonoIo

lib/viewstack.js

@@ -9,6 +9,7 @@ var ViewStack = module.exports = Backbone.View.extend({
 	_stackReplace: null,
 	_current: null,
 	_length: null,
+	_baseZIndex: 0,
 
 	initialize: function initialize(options){
 		if (!options || (!options.context && !options.shared))
@@ -53,6 +54,7 @@ var ViewStack = module.exports = Backbone.View.extend({
 		// Controllo se è la stessa view che sto cercando di pushare
 		if ( this._current === newView ) return this;
 
+		var zIndex = this.getZIndex();
 
 		if ( options && options.replace == true ){
 
@@ -64,16 +66,14 @@ var ViewStack = module.exports = Backbone.View.extend({
 
 				popped.$el.detach();
 
-				// Calcolo il nuovo z-Index che è incrementale
-				var zIndex = (this._stack.length*100) + 100;
 				// Setto lo z-index
 				if ( newView.setZindex )
 					newView.setZindex( zIndex );
 				else
 					newView.$el.css("z-index", zIndex);
 
 				this._stack.push( newView );
-				
+
 				this.$el.append( newView.el );
 
 				// Lancio l'evento onDeactivate se è impostato
@@ -84,14 +84,10 @@ var ViewStack = module.exports = Backbone.View.extend({
 				this._current = newView;
 				// 
 				newView.render();
-
-
 			}
 
 		}else{
 
-			// Calcolo il nuovo z-Index che è incrementale
-			var zIndex = (this._stack.length*100) + 100;
 			// Setto lo z-index
 			if ( newView.setZindex )
 				newView.setZindex( zIndex );
@@ -144,53 +140,39 @@ var ViewStack = module.exports = Backbone.View.extend({
 		if (!poppedView)
 			poppedView = currentView;
 
-		if ( _.isFunction(poppedView.confirmPop) ){
-			return poppedView.confirmPop( function(confirm){ return pop(confirm); } );
-		}else{
-			return pop();
+		if (!options.animated){
+			if ( poppedView.onPop ) poppedView.onPop();
+			poppedView.trigger('pop');
+			return self._popView(poppedView);
 		}
 
-		
-		function pop( confirm ){
-			if ( confirm === false )
-				throw new Error("The popView was interrupted");
-			
-			if (!options.animated){
-				if ( poppedView.onPop ) poppedView.onPop();
-				poppedView.trigger('pop');
-				return self._popView(poppedView);
-			}
-
-			self._popView(poppedView, false);
+		self._popView(poppedView, false);
 
-			if ( !options.animatedName ){
-				poppedView.$el.one('webkitAnimationEnd mozAnimationEnd msAnimationEnd animationend', function (e) {
+		if ( !options.animatedName ){
+			poppedView.$el.one('webkitAnimationEnd mozAnimationEnd msAnimationEnd animationend', function (e) {
+				if ( poppedView.onPop )
+					poppedView.onPop();
+				poppedView.trigger('pop');
+				poppedView.destroy();
+				poppedView.trigger("deactive");
+			});
+		}else{
+			// Viene usata nei casi di più animazioni nella view. Cos' mi assicuro di distruggerla solo dopo aver
+			// terminato l'animazione desiderata
+			poppedView.$el.on('webkitAnimationEnd mozAnimationEnd msAnimationEnd animationend', function (e) {
+				if ( e && e.originalEvent && e.originalEvent.animationName == options.animatedName ){
+					poppedView.$el.off('webkitAnimationEnd mozAnimationEnd msAnimationEnd animationend');
 					if ( poppedView.onPop )
 						poppedView.onPop();
 					poppedView.trigger('pop');
 					poppedView.destroy();
 					poppedView.trigger("deactive");
-				});
-			}else{
-				// Viene usata nei casi di più animazioni nella view. Cos' mi assicuro di distruggerla solo dopo aver
-				// terminato l'animazione desiderata
-				poppedView.$el.on('webkitAnimationEnd mozAnimationEnd msAnimationEnd animationend', function (e) {
-					if ( e && e.originalEvent && e.originalEvent.animationName == options.animatedName ){
-						poppedView.$el.off('webkitAnimationEnd mozAnimationEnd msAnimationEnd animationend');
-						if ( poppedView.onPop )
-							poppedView.onPop();
-						poppedView.trigger('pop');
-						poppedView.destroy();
-						poppedView.trigger("deactive");
-					}
-				});
-			}
-			poppedView.$el.addClass('pop');
-
-			return poppedView;
+				}
+			});
 		}
+		poppedView.$el.addClass('pop');
 
-		return this;
+		return poppedView;
 	},
 
 	// Update page URL
@@ -296,12 +278,37 @@ var ViewStack = module.exports = Backbone.View.extend({
 	},
 
 	popViewToInstance: function popViewToInstance(instance, options) {
+		options = _.defaults(options || {}, {
+			popInstance: true
+		});
 		var indexOfViewToPop = this.indexOf(instance);
 		if (indexOfViewToPop === -1) return;
-		for (var i = this._stack.length - 1; i >= indexOfViewToPop; i--) {
+		for (var i = this._stack.length - 1; shouldPopView(i); i--) {
 			this.popView(this._stack[i], options);
 		}
 		return this;
+
+		function shouldPopView(indexOfView) {
+			if (indexOfView > indexOfViewToPop)
+				return true;
+			else if (options.popInstance && indexOfView === indexOfViewToPop)
+				return true;
+			else
+				return false;
+		}
+	},
+
+	getZIndex: function () {
+		return (this._stack.length * 100) + 100 + this._baseZIndex;
+	},
+
+	setBaseZIndex: function (value) {
+		this._baseZIndex = parseInt(value);
+		return this;
+	},
+
+	getBaseZIndex: function () {
+		return this._baseZIndex;
 	}
 
 });