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

Merge branch 'master' of https://github.com/driftyco/ionic

Browse Source 
Conflicts:
	dist/js/ionic-angular.min.js
This commit is contained in:
Max Lynch
2014-01-13 10:17:45 -06:00
parent d90ae2c9af 0d592d7063
commit 5c414bbf00
9 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -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

2
bower.json
View File

@@ -1,6 +1,6 @@
{
"name": "ionic",
"version": "0.9.19",
"version": "0.9.20-alpha",
"homepage": "https://github.com/driftyco/ionic",
"authors": [
"Max Lynch <max@drifty.com>",

2
component.json
View File

@@ -1,7 +1,7 @@
{
"repo": "driftyco/ionic",
"development": {},
"version": "0.9.19",
"version": "0.9.20-alpha",
"styles": [
"dist/css/ionic.css"
],

3
dist/css/ionic.css vendored
View File

@@ -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/
*

4
dist/css/ionic.min.css vendored
View File

@@ -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/
*

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

@@ -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);

19
js/ext/angular/src/directive/ionicTabBar.js vendored
View File

@@ -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);

6
js/ext/angular/test/directive/ionicView.unit.js
View File

@@ -56,13 +56,13 @@ describe('Ionic View', function() {
it('should show/hide navBar', function() {
var element = compile('<nav-bar></nav-bar>')(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() {

2
package.json
View File

@@ -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",