From a6efe12857d4d3d7f4aee42210daf7d325c8e662 Mon Sep 17 00:00:00 2001
From: Andrew Trice <triceam@gmail.com>
Date: Thu, 10 May 2012 09:50:52 -0400
Subject: [PATCH] pushed latest code to examples site

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

diff --git a/examples/src/libs/iscroll.js b/examples/src/libs/iscroll.js
index 0957eca..bbf0d42 100755
--- a/examples/src/libs/iscroll.js
+++ b/examples/src/libs/iscroll.js
@@ -175,6 +175,8 @@ iScroll.prototype = {
 		switch(e.type) {
 			case START_EV:
 				if (!hasTouch && e.button !== 0) return;
+				var nodeName = e.target.nodeName.toUpperCase();
+				if (nodeName == "TEXTAREA" || nodeName == "INPUT" || nodeName == "SELECT" ) return;	
 				that._start(e);
 				break;
 			case MOVE_EV: that._move(e); break;
diff --git a/examples/src/viewnavigator/viewnavigator.js b/examples/src/viewnavigator/viewnavigator.js
index bc438a9..fe09548 100644
--- a/examples/src/viewnavigator/viewnavigator.js
+++ b/examples/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(); 
 		}
 	}
 }
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001