Skip to content

Commit 4de3403

Browse files
committed
Removing animation from header and stuff
1 parent 196e015 commit 4de3403

File tree

5 files changed

+23
-2
lines changed

5 files changed

+23
-2
lines changed

dist/css/ionic.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5701,6 +5701,11 @@ a.button {
57015701
100% {
57025702
transform: rotate(360deg); } }
57035703

5704+
.no-animation > .ng-enter, .no-animation.ng-enter, .no-animation > .ng-leave, .no-animation.ng-leave {
5705+
-webkit-transition: none;
5706+
-moz-transition: none;
5707+
transition: none; }
5708+
57045709
.noop-animation > .ng-enter, .noop-animation.ng-enter, .noop-animation > .ng-leave, .noop-animation.ng-leave {
57055710
-webkit-transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;
57065711
-moz-transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;

dist/js/ionic-angular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ angular.module('ionic.ui.header', ['ngAnimate'])
512512
</div>\
513513
<h1 class="title" ng-bind-html="title"></h1>\
514514
<div class="buttons">\
515-
<button ng-repeat="button in rightButtons" class="button" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
515+
<button ng-repeat="button in rightButtons" class="button no-animation" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
516516
</button>\
517517
</div>\
518518
</header>',

js/ext/angular/src/directive/ionicBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ angular.module('ionic.ui.header', ['ngAnimate'])
1616
</div>\
1717
<h1 class="title" ng-bind-html="title"></h1>\
1818
<div class="buttons">\
19-
<button ng-repeat="button in rightButtons" class="button" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
19+
<button ng-repeat="button in rightButtons" class="button no-animation" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
2020
</button>\
2121
</div>\
2222
</header>',

js/ext/angular/test/slideBox.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ <h3>Thank you for choosing my app!</h3>
7070
angular.module('slideBoxTest', ['ionic'])
7171

7272
.controller('SlideCtrl', function($scope) {
73+
$scope.next = function() {
74+
};
75+
$scope.rightButtons = [
76+
{
77+
content: 'Next',
78+
type: 'button-positive button-clear',
79+
onTap: function(e) {
80+
$scope.next();
81+
}
82+
}
83+
];
7384
$scope.leftButtons = [
7485
{
7586
content: 'Skip',

scss/_animations.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@ $slide-in-up-function: cubic-bezier(.1, .7, .1, 1);
151151
100% { transform: rotate(360deg); }
152152
}
153153

154+
.no-animation {
155+
> .ng-enter, &.ng-enter, > .ng-leave, &.ng-leave {
156+
@include transition(none);
157+
}
158+
}
154159
.noop-animation {
155160
> .ng-enter, &.ng-enter, > .ng-leave, &.ng-leave {
156161
@include transition(all cubic-bezier(0.250, 0.460, 0.450, 0.940) $transition-duration);

0 commit comments

Comments
 (0)