moparisthebest/app-UI
1
0
Fork 0
mirror of https://github.com/moparisthebest/app-UI synced 2024-08-13 16:54:00 -04:00
Code Issues Releases Wiki Activity

pushed latest code to examples site

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/src/libs/iscroll.js
View File

@ -175,6 +175,8 @@ iScroll.prototype = {
switch(e.type) { switch(e.type) {
case START_EV: case START_EV:
if (!hasTouch && e.button !== 0) return; if (!hasTouch && e.button !== 0) return;
var nodeName = e.target.nodeName.toUpperCase();
if (nodeName == "TEXTAREA" || nodeName == "INPUT" || nodeName == "SELECT" ) return;
that._start(e); that._start(e);
break; break;
case MOVE_EV: that._move(e); break; case MOVE_EV: that._move(e); break;

8
examples/src/viewnavigator/viewnavigator.js
View File

@ -229,12 +229,14 @@ ViewNavigator.prototype.updateView = function( viewDescriptor ) {
ViewNavigator.prototype.resetScroller = function() { ViewNavigator.prototype.resetScroller = function() {
var id = this.contentViewHolder.attr( "id" ); var id = this.contentViewHolder.attr( "id" );
var currentViewDescriptor = this.history[ this.history.length-1];
if ( !this.winPhone ) { if ( !this.winPhone ) {
if ( this.scroller != null ) { if ( this.scroller != null ) {
this.scroller.destroy(); this.scroller.destroy();
this.scroller = null;
} }
if ( id && !(this.currentViewDescriptor && this.currentViewDescriptor.scroll == false)) { if ( id && !(currentViewDescriptor && currentViewDescriptor.scroll === false)) {
var self = this; var self = this;
setTimeout( function() { self.scroller = new iScroll( id ); }, 10 ); setTimeout( function() { self.scroller = new iScroll( id ); }, 10 );
//this.scroller = new iScroll( id ); //this.scroller = new iScroll( id );
@ -259,11 +261,11 @@ ViewNavigator.prototype.animationCompleteHandler = function(removalTarget, heade
self.resetScroller(); self.resetScroller();
if ( removalTarget ) { if ( removalTarget ) {
removalTarget.unbind( "click" ); removalTarget.unbind( "click" );
removalTarget.remove(); removalTarget.detach();
} }
if ( headerRemovalTarget ) { if ( headerRemovalTarget ) {
headerRemovalTarget.unbind( "click" ); headerRemovalTarget.unbind( "click" );
headerRemovalTarget.remove(); headerRemovalTarget.detach();
} }
} }
} }

BIN
src/.DS_Store vendored Normal file
View File

Binary file not shown.