From db4d649907fc6eb93f12667743b8c3b4fcbf02cd Mon Sep 17 00:00:00 2001
From: Andrew Trice <triceam@gmail.com>
Date: Mon, 7 May 2012 21:49:16 -0400
Subject: [PATCH] fixed bug where scroll wasn't being disabled by "scroll"
 attribute of view descriptor, fixed bug where event listeners were being lost
 on child views

---
 .DS_Store                          | Bin 6148 -> 6148 bytes
 .gitignore                         |   2 ++
 src/viewnavigator/viewnavigator.js |   8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.DS_Store b/.DS_Store
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..69cce95cb53da6ed18fffb3d3f714c351c3158bc 100644
GIT binary patch
delta 279
zcmZoMXfc=|#>B`mF;Q%yo}wrt0|NsP3osNHB<18M0eS0_3MM8lpKKt)QqRm#%uvLT
zoK%i1nUh&uVqkEMk%^gwm5rT)laqrdCOk7QCBNJ$zceqUI662ZzdSfIB{eCrC>G2v
zNh~QXc1kP)%LF8rWB_Hr?2!EY93VResyaL~r6eO>K%%<Z(85ed!O+>vs8&az+T7eg
zN5RC{qPCWkgM(9G9fzoro{dLHVohybeFM<JK)?v{1_<y%C^*@)G0}_-<d@Cd9NZj0
cZ*NTe&ODi4M3I#Vs77J3p@{Hi50O300JjN982|tP

delta 70
zcmZoMXfc=|#>AjHu~2NHo+1YW5HK<@2yDK{XvVhr0b>>8W_AvK4xj>{$am(+{342+
UKzW7)kiy9(Jj$D6L{=~Z06T*Zn*aa+

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ac015e1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+src/.DS_Store
diff --git a/src/viewnavigator/viewnavigator.js b/src/viewnavigator/viewnavigator.js
index bc438a9..fe09548 100644
--- a/src/viewnavigator/viewnavigator.js
+++ b/src/viewnavigator/viewnavigator.js
@@ -229,12 +229,14 @@ ViewNavigator.prototype.updateView = function( viewDescriptor ) {
 ViewNavigator.prototype.resetScroller = function() {
     
     var id = this.contentViewHolder.attr( "id" );
+    var currentViewDescriptor = this.history[ this.history.length-1];
     
 	if ( !this.winPhone ) {
 		if ( this.scroller != null ) {
 			this.scroller.destroy();
+			this.scroller = null;
 		}
-		if ( id && !(this.currentViewDescriptor && this.currentViewDescriptor.scroll == false)) {
+		if ( id && !(currentViewDescriptor && currentViewDescriptor.scroll === false)) {
 			var self = this;
 			setTimeout( function() { self.scroller = new iScroll( id ); }, 10 );
 			//this.scroller = new iScroll( id );
@@ -259,11 +261,11 @@ ViewNavigator.prototype.animationCompleteHandler = function(removalTarget, heade
         self.resetScroller();
 		if ( removalTarget ) {
 			removalTarget.unbind( "click" );
-			removalTarget.remove();
+			removalTarget.detach();
 		}
 		if ( headerRemovalTarget ) {
 			headerRemovalTarget.unbind( "click" );
-			headerRemovalTarget.remove(); 
+			headerRemovalTarget.detach(); 
 		}
 	}
 }