javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #166

Browse Source
This commit is contained in:
Max Lynch
2013-11-25 17:01:06 -06:00
parent a8bb330c82
commit 0c3d1bf93d
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dist/js/ionic-angular.js vendored
View File

@@ -1429,10 +1429,12 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
return;
}
if(back) {
reverseTransition();
} else {
forwardTransition();
if($rootScope.stackCursorPosition > 0) {
if(back) {
reverseTransition();
} else {
forwardTransition();
}
}
});
@@ -1450,7 +1452,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
$scope.$watch(function () { return $location.path() }, function (newLocation, oldLocation) {
if($rootScope.actualLocation === newLocation) {
if(oldLocation == '' && newLocation == '/') {
if(oldLocation == '' || newLocation == '/') {
// initial route, skip this
return;
}
@@ -1580,8 +1582,6 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
$element.addClass($scope.type);
var updateHeaderData = function(data) {
console.log('Header data changed', data);
var oldTitle = $scope.currentTitle;
$scope.oldTitle = oldTitle;

14
js/ext/angular/src/directive/ionicNavRouter.js vendored
View File

@@ -71,10 +71,12 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
return;
}
if(back) {
reverseTransition();
} else {
forwardTransition();
if($rootScope.stackCursorPosition > 0) {
if(back) {
reverseTransition();
} else {
forwardTransition();
}
}
});
@@ -92,7 +94,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
$scope.$watch(function () { return $location.path() }, function (newLocation, oldLocation) {
if($rootScope.actualLocation === newLocation) {
if(oldLocation == '' && newLocation == '/') {
if(oldLocation == '' || newLocation == '/') {
// initial route, skip this
return;
}
@@ -222,8 +224,6 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
$element.addClass($scope.type);
var updateHeaderData = function(data) {
console.log('Header data changed', data);
var oldTitle = $scope.currentTitle;
$scope.oldTitle = oldTitle;

6
js/ext/angular/test/navRouter.html
View File

@@ -46,7 +46,7 @@
.config(function($routeProvider, $locationProvider) {
$routeProvider.when('/', {
$routeProvider.when('/cats', {
templateUrl: 'page1.html',
controller: 'Page1Ctrl'
});
@@ -59,6 +59,10 @@
templateUrl: 'page3.html',
});
$routeProvider.otherwise({
redirectTo: '/cats'
});
// configure html5 to get links working on jsfiddle
//$locationProvider.html5Mode(true);

2
scss/_platform.scss
View File

@@ -24,4 +24,4 @@
.has-subheader {
top: 108px;
}
}
}