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
This commit is contained in:
Adam Bradley
2014-01-13 12:00:12 -06:00
parent 2b2492d2d4 2008a72204
commit 7c1fed40ea
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dist/css/ionic.css vendored
View File

@@ -6063,9 +6063,9 @@ a.button {
animation-name: slideOutToRight; }
.slide-in-up {
-webkit-transform: translate3d(0, 0%, 0);
-moz-transform: translate3d(0, 0%, 0);
transform: translate3d(0, 0%, 0);
-webkit-transform: translate3d(0, 0, 0);
-moz-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
opacity: 1; }
.slide-in-up.ng-enter, .slide-in-up .ng-enter {
-webkit-transform: translate3d(0, 100%, 0);
@@ -6107,9 +6107,9 @@ a.button {
-webkit-animation-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
-moz-animation-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
animation-timing-function: cubic-bezier(0.1, 0.7, 0.1, 1);
-webkit-animation-fill-mode: both;
-moz-animation-fill-mode: both;
animation-fill-mode: both; }
-webkit-animation-fill-mode: forwards;
-moz-animation-fill-mode: forwards;
animation-fill-mode: forwards; }
.slide-in-up-add-active {
-webkit-animation-name: slideInUp;

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

File diff suppressed because one or more lines are too long

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

@@ -309,11 +309,14 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ngAnimate'
var _this = this;
var element = angular.element(this.el);
if(!element.parent().length) {
angular.element($document[0].body).append(element);
element.addClass(this.animation);
$animate.enter(element, angular.element($document[0].body), null, function() {
});
ionic.views.Modal.prototype.show.call(_this);
} else {
$animate.addClass(element, this.animation, function() {
});
}
$animate.addClass(element, this.animation, function() {
});
},
// Hide the modal
hide: function() {

2
dist/js/ionic-angular.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
js/ext/angular/src/service/ionicModal.js vendored
View File

@@ -12,11 +12,14 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ngAnimate'
var _this = this;
var element = angular.element(this.el);
if(!element.parent().length) {
angular.element($document[0].body).append(element);
element.addClass(this.animation);
$animate.enter(element, angular.element($document[0].body), null, function() {
});
ionic.views.Modal.prototype.show.call(_this);
} else {
$animate.addClass(element, this.animation, function() {
});
}
$animate.addClass(element, this.animation, function() {
});
},
// Hide the modal
hide: function() {

4
scss/_animations.scss
View File

@@ -400,7 +400,7 @@ $ios7-transition-duration: 250ms;
.slide-in-up {
// Start it down low
@include translate3d(0, 0%, 0);
@include translate3d(0, 0, 0);
opacity: 1;
&.ng-enter, .ng-enter {
@@ -432,7 +432,7 @@ $ios7-transition-duration: 250ms;
.slide-in-up-add {
@include animation-duration(400ms);
@include animation-timing-function($slide-in-up-function);
@include animation-fill-mode(both);
@include animation-fill-mode(forwards);
}
.slide-in-up-add-active {
@include animation-name(slideInUp);