diff --git a/CHANGELOG.md b/CHANGELOG.md index bff4b513d6..bf3927b179 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ +## 0.9.20-alpha (active pre-release) + - Improved transitions between views + - Fixed hide-nav-bar/hide-back-button view attributes + - Removed title attributes from DOM + - Remove nav title if the entering view doesn't have one + + ## 0.9.19 "Alpha Koala" (2014-01-10) - Created ViewState Service to track navigation history - Created navView directive diff --git a/bower.json b/bower.json index ccf7cb018a..673bd3c6bd 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ionic", - "version": "0.9.19", + "version": "0.9.20-alpha", "homepage": "https://github.com/driftyco/ionic", "authors": [ "Max Lynch ", diff --git a/component.json b/component.json index 1edf5d0023..b16e3d11f0 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "repo": "driftyco/ionic", "development": {}, - "version": "0.9.19", + "version": "0.9.20-alpha", "styles": [ "dist/css/ionic.css" ], diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 16bf28b0a6..d6d36f2dbf 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1,9 +1,8 @@ -@charset "UTF-8"; /*! * Copyright 2014 Drifty Co. * http://drifty.com/ * - * Ionic, v0.9.19 + * Ionic, v0.9.20-alpha * A powerful HTML5 mobile app framework. * http://ionicframework.com/ * diff --git a/dist/css/ionic.min.css b/dist/css/ionic.min.css index 7c4270f6e4..4592f9e401 100644 --- a/dist/css/ionic.min.css +++ b/dist/css/ionic.min.css @@ -1,8 +1,8 @@ -@charset "UTF-8";/*! +/*! * Copyright 2014 Drifty Co. * http://drifty.com/ * - * Ionic, v0.9.19 + * Ionic, v0.9.20-alpha * A powerful HTML5 mobile app framework. * http://ionicframework.com/ * diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js index 72473dfe41..06fd71d44b 100644 --- a/dist/js/ionic-angular.js +++ b/dist/js/ionic-angular.js @@ -2212,7 +2212,6 @@ angular.module('ionic.ui.tabs', ['ionic.service.view']) }); $scope.$watch('activeAnimation', function(value) { - //$element.removeClass($scope.animation + ' ' + $scope.animation + '-reverse'); $element.addClass($scope.activeAnimation); }); transclude($scope, function(cloned) { @@ -2225,7 +2224,7 @@ angular.module('ionic.ui.tabs', ['ionic.service.view']) }]) // Generic controller directive -.directive('tab', ['ViewService', '$rootScope', '$animate', '$parse', function(ViewService, $rootScope, $animate, $parse) { +.directive('tab', ['ViewService', '$rootScope', '$parse', function(ViewService, $rootScope, $parse) { return { restrict: 'E', require: '^tabs', @@ -2276,29 +2275,27 @@ angular.module('ionic.ui.tabs', ['ionic.service.view']) $scope.$watch('isVisible', function(value) { if(childElement) { - $animate.leave(childElement); + childElement.remove(); + childElement = null; $scope.$broadcast('tab.hidden'); - childElement = undefined; } if(childScope) { childScope.$destroy(); - childScope = undefined; + childScope = null; } if(value) { childScope = $scope.$new(); transclude(childScope, function(clone) { - childElement = clone; - clone.addClass('pane'); - - $animate.enter(clone, $element.parent(), $element); - + clone.removeAttr('title'); + childElement = clone; + $element.parent().append(childElement); $scope.$broadcast('tab.shown'); }); } }); - // check if it has a ui-view in it + // on link, check if it has a nav-view in it transclude($scope.$new(), function(clone) { var navViewEle = clone[0].getElementsByTagName("nav-view"); $scope.hasNavView = (navViewEle.length > 0); diff --git a/js/ext/angular/src/directive/ionicTabBar.js b/js/ext/angular/src/directive/ionicTabBar.js index 098e185cd2..52c0164259 100644 --- a/js/ext/angular/src/directive/ionicTabBar.js +++ b/js/ext/angular/src/directive/ionicTabBar.js @@ -112,7 +112,6 @@ angular.module('ionic.ui.tabs', ['ionic.service.view']) }); $scope.$watch('activeAnimation', function(value) { - //$element.removeClass($scope.animation + ' ' + $scope.animation + '-reverse'); $element.addClass($scope.activeAnimation); }); transclude($scope, function(cloned) { @@ -125,7 +124,7 @@ angular.module('ionic.ui.tabs', ['ionic.service.view']) }]) // Generic controller directive -.directive('tab', ['ViewService', '$rootScope', '$animate', '$parse', function(ViewService, $rootScope, $animate, $parse) { +.directive('tab', ['ViewService', '$rootScope', '$parse', function(ViewService, $rootScope, $parse) { return { restrict: 'E', require: '^tabs', @@ -176,29 +175,27 @@ angular.module('ionic.ui.tabs', ['ionic.service.view']) $scope.$watch('isVisible', function(value) { if(childElement) { - $animate.leave(childElement); + childElement.remove(); + childElement = null; $scope.$broadcast('tab.hidden'); - childElement = undefined; } if(childScope) { childScope.$destroy(); - childScope = undefined; + childScope = null; } if(value) { childScope = $scope.$new(); transclude(childScope, function(clone) { - childElement = clone; - clone.addClass('pane'); - - $animate.enter(clone, $element.parent(), $element); - + clone.removeAttr('title'); + childElement = clone; + $element.parent().append(childElement); $scope.$broadcast('tab.shown'); }); } }); - // check if it has a ui-view in it + // on link, check if it has a nav-view in it transclude($scope.$new(), function(clone) { var navViewEle = clone[0].getElementsByTagName("nav-view"); $scope.hasNavView = (navViewEle.length > 0); diff --git a/js/ext/angular/test/directive/ionicView.unit.js b/js/ext/angular/test/directive/ionicView.unit.js index 893eccf824..e576f8bdd1 100644 --- a/js/ext/angular/test/directive/ionicView.unit.js +++ b/js/ext/angular/test/directive/ionicView.unit.js @@ -56,13 +56,13 @@ describe('Ionic View', function() { it('should show/hide navBar', function() { var element = compile('')(scope); - expect(element.hasClass('invisible')).toEqual(false); - scope.$broadcast('viewState.showNavBar', false); - scope.$digest(); expect(element.hasClass('invisible')).toEqual(true); scope.$broadcast('viewState.showNavBar', true); scope.$digest(); expect(element.hasClass('invisible')).toEqual(false); + scope.$broadcast('viewState.showNavBar', false); + scope.$digest(); + expect(element.hasClass('invisible')).toEqual(true); }); it('should hide navBar when using view attr', function() { diff --git a/package.json b/package.json index 3cf944da10..1f42d4983e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ionic", "private": false, - "version": "0.9.19", + "version": "0.9.20-alpha", "devDependencies": { "karma": "~0.10", "grunt": "~0.4.1",