diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 1e93d1671d..10aa8e7e86 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -2934,8 +2934,7 @@ a.button {
-webkit-transform: translate3d(0, 0, 0); }
.slide-left-right > .ng-leave.ng-leave-active, .slide-left-right.ng-leave.ng-leave-active {
-webkit-transform: translate3d(-100%, 0, 0); }
-
-.slide-left-right-reverse > .ng-enter, .slide-left-right-reverse.ng-enter, .slide-left-right-reverse > .ng-leave, .slide-left-right-reverse.ng-leave {
+.slide-left-right.reverse > .ng-enter, .slide-left-right.reverse.ng-enter, .slide-left-right.reverse > .ng-leave, .slide-left-right.reverse.ng-leave {
position: absolute;
top: 0;
left: 0;
@@ -2943,11 +2942,11 @@ a.button {
bottom: 0;
-webkit-transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;
transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms; }
-.slide-left-right-reverse > .ng-enter, .slide-left-right-reverse.ng-enter {
+.slide-left-right.reverse > .ng-enter, .slide-left-right.reverse.ng-enter {
-webkit-transform: translate3d(-100%, 0, 0); }
-.slide-left-right-reverse > .ng-enter.ng-enter-active, .slide-left-right-reverse.ng-enter.ng-enter-active {
+.slide-left-right.reverse > .ng-enter.ng-enter-active, .slide-left-right.reverse.ng-enter.ng-enter-active {
-webkit-transform: translate3d(0, 0, 0); }
-.slide-left-right-reverse > .ng-leave.ng-leave-active, .slide-left-right-reverse.ng-leave.ng-leave-active {
+.slide-left-right.reverse > .ng-leave.ng-leave-active, .slide-left-right.reverse.ng-leave.ng-leave-active {
-webkit-transform: translate3d(100%, 0, 0); }
.slide-left-right-ios7 > .ng-enter, .slide-left-right-ios7.ng-enter, .slide-left-right-ios7 > .ng-leave, .slide-left-right-ios7.ng-leave {
@@ -2968,8 +2967,7 @@ a.button {
-webkit-transform: translate3d(0, 0, 0); }
.slide-left-right-ios7 > .ng-leave.ng-leave-active, .slide-left-right-ios7.ng-leave.ng-leave-active {
-webkit-transform: translate3d(-20%, 0, 0); }
-
-.slide-left-right-ios7-reverse > .ng-enter, .slide-left-right-ios7-reverse.ng-enter, .slide-left-right-ios7-reverse > .ng-leave, .slide-left-right-ios7-reverse.ng-leave {
+.slide-left-right-ios7.reverse > .ng-enter, .slide-left-right-ios7.reverse.ng-enter, .slide-left-right-ios7.reverse > .ng-leave, .slide-left-right-ios7.reverse.ng-leave {
position: absolute;
top: 0;
left: 0;
@@ -2979,11 +2977,11 @@ a.button {
-webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;
transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1); }
-.slide-left-right-ios7-reverse > .ng-enter, .slide-left-right-ios7-reverse.ng-enter {
+.slide-left-right-ios7.reverse > .ng-enter, .slide-left-right-ios7.reverse.ng-enter {
-webkit-transform: translate3d(-20%, 0, 0); }
-.slide-left-right-ios7-reverse > .ng-enter.ng-enter-active, .slide-left-right-ios7-reverse.ng-enter.ng-enter-active {
+.slide-left-right-ios7.reverse > .ng-enter.ng-enter-active, .slide-left-right-ios7.reverse.ng-enter.ng-enter-active {
-webkit-transform: translate3d(0, 0, 0); }
-.slide-left-right-ios7-reverse > .ng-leave.ng-leave-active, .slide-left-right-ios7-reverse.ng-leave.ng-leave-active {
+.slide-left-right-ios7.reverse > .ng-leave.ng-leave-active, .slide-left-right-ios7.reverse.ng-leave.ng-leave-active {
-webkit-transform: translate3d(100%, 0, 0); }
@-webkit-keyframes slideInLeft {
@@ -3209,6 +3207,43 @@ a.button {
-webkit-transform: rotate(360deg);
transform: rotate(360deg); } }
+/**
+ * Some component specific animations
+ */
+.nav-title-slide-ios7 > .ng-enter, .nav-title-slide-ios7.ng-enter, .nav-title-slide-ios7 > .ng-leave, .nav-title-slide-ios7.ng-leave {
+ -webkit-transition: all 250ms;
+ -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
+ transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;
+ transition: all 250ms;
+ transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
+ opacity: 1; }
+.nav-title-slide-ios7 > .ng-enter, .nav-title-slide-ios7.ng-enter {
+ opacity: 0;
+ -webkit-transform: translate3d(30%, 0, 0); }
+.nav-title-slide-ios7 > .ng-enter.ng-enter-active, .nav-title-slide-ios7.ng-enter.ng-enter-active {
+ opacity: 1;
+ -webkit-transform: translate3d(0, 0, 0); }
+.nav-title-slide-ios7 > .ng-leave.ng-leave-active, .nav-title-slide-ios7.ng-leave.ng-leave-active {
+ opacity: 0;
+ -webkit-transform: translate3d(-30%, 0, 0); }
+
+.reverse .nav-title-slide-ios7 > .ng-enter, .reverse .nav-title-slide-ios7.ng-enter, .reverse .nav-title-slide-ios7 > .ng-leave, .reverse .nav-title-slide-ios7.ng-leave {
+ -webkit-transition: all 250ms;
+ -webkit-transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
+ transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;
+ transition: all 250ms;
+ transition-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
+ opacity: 1; }
+.reverse .nav-title-slide-ios7 > .ng-enter, .reverse .nav-title-slide-ios7.ng-enter {
+ opacity: 0;
+ -webkit-transform: translate3d(-30%, 0, 0); }
+.reverse .nav-title-slide-ios7 > .ng-enter.ng-enter-active, .reverse .nav-title-slide-ios7.ng-enter.ng-enter-active {
+ opacity: 1;
+ -webkit-transform: translate3d(0, 0, 0); }
+.reverse .nav-title-slide-ios7 > .ng-leave.ng-leave-active, .reverse .nav-title-slide-ios7.ng-leave.ng-leave-active {
+ opacity: 0;
+ -webkit-transform: translate3d(30%, 0, 0); }
+
/**
* Grid
* --------------------------------------------------
diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 5089183fb8..a916d718f7 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -25293,8 +25293,13 @@ angular.module('ionic.ui.navRouter', [])
isVisible: true
};
+ this.setTitle = function(value) {
+ $scope.$broadcast('navRouter.titleChanged', value);
+ };
+
$scope.navController = this;
}],
+
link: function($scope, $element, $attr) {
$scope.animation = $attr.animation;
@@ -25309,27 +25314,27 @@ angular.module('ionic.ui.navRouter', [])
var reverseTransition = function() {
console.log('REVERSE');
$element.removeClass('noop-animation');
- $element.removeClass($scope.animation);
- $element.addClass($scope.animation + '-reverse');
+ $element.addClass($scope.animation);
+ $element.addClass('reverse');
};
var forwardTransition = function() {
console.log('FORWARD');
$element.removeClass('noop-animation');
- $element.removeClass($scope.animation + '-reverse');
+ $element.removeClass('reverse');
$element.addClass($scope.animation);
};
$scope.$on('$routeChangeSuccess', function(e, a) {
console.log('ROUTE CHANGED', a, e);
});
- $scope.$on('$routeChangeStart', function(e, a) {
- console.log('ROUTE START', a, e);
+ $scope.$on('$routeChangeStart', function(e, next, current) {
+ console.log('ROUTE START', e, next, current);
var back, historyState = $window.history.state;
back = !!(historyState && historyState.position <= $rootScope.stackCursorPosition);
- if(isFirst) {
+ if(isFirst || (next && next.$$route.originalPath === "")) {
// Don't animate
return;
}
@@ -25341,9 +25346,9 @@ angular.module('ionic.ui.navRouter', [])
}
});
- $scope.$on('$locationChangeSuccess', function() {
+ $scope.$on('$locationChangeSuccess', function(a, b, c) {
// Store the new location
- console.log('LOCATION CHANGE SUCCESS');
+ console.log('LOCATION CHANGE SUCCESS', a, b, c);
$rootScope.actualLocation = $location.path();
if(isFirst) {
isFirst = false;
@@ -25389,7 +25394,30 @@ angular.module('ionic.ui.navRouter', [])
/**
* Our Nav Bar directive which updates as the controller state changes.
*/
-.directive('navBar', ['$rootScope', function($rootScope) {
+.directive('navBar', ['$rootScope', '$animate', function($rootScope, $animate) {
+ var animate = function($element, oldTitle, newTitle, cb) {
+ if(!oldTitle || oldTitle === newTitle) {
+ cb();
+ return;
+ }
+
+ var title, nTitle, titles = $element[0].querySelectorAll('.title');
+ if(titles.length > 1) {
+ nTitle = titles[0];
+ title = titles[1];
+ } else if(titles.length) {
+ title = titles[0];
+ nTitle = document.createElement('h1');
+ nTitle.className = 'title';
+ nTitle.appendChild(document.createTextNode(newTitle));
+
+ $animate.enter(angular.element(nTitle), $element, angular.element($element[0].firstElementChild));
+ $animate.leave(angular.element(title), function() {
+ cb();
+ });
+ }
+ };
+
return {
restrict: 'E',
require: '^navRouter',
@@ -25402,12 +25430,11 @@ angular.module('ionic.ui.navRouter', [])
alignTitle: '@',
},
template: '{{navController.getTopController().scope.title}}
' +
+ '' +
+ '' +
'{{navController.getTopController().scope.title}}
' +
+ '' +
+ '' +
'