pushed latest code to examples site

This commit is contained in:
Andrew Trice 2012-05-10 09:50:52 -04:00
parent 4e0357a193
commit a6efe12857
3 changed files with 7 additions and 3 deletions

View File

@ -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;

View File

@ -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();
}
}
}

BIN
src/.DS_Store vendored Normal file

Binary file not shown.