moparisthebest
/
app-UI
mirror of https://github.com/moparisthebest/app-UI
1
0
Fork 0
Code Issues Releases Wiki Activity

bug fix

This commit is contained in:
Andrew Trice 2012-04-20 11:59:44 -04:00
parent 5911f163e9
commit 932f2502e8
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/viewnavigator/viewnavigator.css
View File

@ -61,8 +61,10 @@ body {
position:absolute;
top:12px;
left:0px;
right:0px;
left:0%;
right:0%;
margin-left:auto;
margin-right:auto;
text-align:center;
font-weight: bold;
color: #FFFFFF;

25
src/viewnavigator/viewnavigator.js
View File

@ -69,21 +69,18 @@ ViewNavigator.prototype.pushView = function( viewDescriptor ) {
ViewNavigator.prototype.popView = function() {
if ( this.history.length > 1 ) {
if (this.animating || this.history.length <= 1 )
return;
var currentViewDescriptor = this.history[ this.history.length-1];
this.history.pop();
if ( currentViewDescriptor.backCallback ) {
currentViewDescriptor.backCallback();
}
var viewDescriptor = this.history[ this.history.length-1 ];
viewDescriptor.animation = "popEffect"
this.updateView( viewDescriptor );
if (this.animating || this.history.length <= 1 )
return;
var currentViewDescriptor = this.history[ this.history.length-1];
if ( currentViewDescriptor.backCallback ) {
currentViewDescriptor.backCallback();
}
this.history.pop();
var viewDescriptor = this.history[ this.history.length-1 ];
viewDescriptor.animation = "popEffect"
this.updateView( viewDescriptor );
}
ViewNavigator.prototype.setHeaderPadding = function( amount ) {