Skip to content

Commit bf0743b

Browse files
author
raimund-schluessler
committed
Fix animations with AngularJS 1.3.0-beta.5
1 parent f7a8ba0 commit bf0743b

14 files changed

+2320
-346
lines changed

Diff for: css/style.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -1086,8 +1086,8 @@ li.ui-draggable-dragging {
10861086
li.ui-draggable-dragging .duedate {
10871087
display: none;
10881088
}
1089-
.animate-enter,
1090-
.animate-leave {
1089+
.ng-enter,
1090+
.ng-leave {
10911091
-webkit-transition: 200ms cubic-bezier(0.25, 0.25, 0.75, 0.75) all;
10921092
-moz-transition: 200ms cubic-bezier(0.25, 0.25, 0.75, 0.75) all;
10931093
-ms-transition: 200ms cubic-bezier(0.25, 0.25, 0.75, 0.75) all;
@@ -1096,13 +1096,13 @@ li.ui-draggable-dragging .duedate {
10961096
position: relative;
10971097
display: block;
10981098
}
1099-
.animate-enter.animate-enter-active,
1100-
.animate-leave {
1099+
.ng-enter.ng-enter-active,
1100+
.ng-leave {
11011101
opacity: 1;
11021102
height: 37px !important;
11031103
}
1104-
.animate-leave.animate-leave-active,
1105-
.animate-enter {
1104+
.ng-leave.ng-leave-active,
1105+
.ng-enter {
11061106
opacity: 0;
11071107
height: 0px !important;
11081108
}

Diff for: css/style.less

+6-6
Original file line numberDiff line numberDiff line change
@@ -1113,8 +1113,8 @@ li.ui-draggable-dragging{
11131113
}
11141114
}
11151115

1116-
.animate-enter,
1117-
.animate-leave
1116+
.ng-enter,
1117+
.ng-leave
11181118
{
11191119
-webkit-transition: 200ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all;
11201120
-moz-transition: 200ms cubic-bezier(0.250, 0.250, 0.750, 0.750) all;
@@ -1125,14 +1125,14 @@ li.ui-draggable-dragging{
11251125
display: block;
11261126
}
11271127

1128-
.animate-enter.animate-enter-active,
1129-
.animate-leave {
1128+
.ng-enter.ng-enter-active,
1129+
.ng-leave {
11301130
opacity: 1;
11311131
height: 37px !important;
11321132
}
11331133

1134-
.animate-leave.animate-leave-active,
1135-
.animate-enter {
1134+
.ng-leave.ng-leave-active,
1135+
.ng-enter {
11361136
opacity: 0;
11371137
height: 0px !important;
11381138
}

Diff for: js/app/app.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public
1919
License along with this library. If not, see <http://www.gnu.org/licenses/>.
2020
2121
###
22-
angular.module('Tasks',['OC','ngRoute'])
22+
angular.module('Tasks',['OC','ngRoute','ngAnimate'])
2323
.config ['$provide','$routeProvider', '$interpolateProvider',
2424
($provide, $routeProvider, $interpolateProvider) ->
2525
$provide.value 'Config', config =

Diff for: js/public/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
(function() {
15-
angular.module('Tasks', ['OC', 'ngRoute']).config([
15+
angular.module('Tasks', ['OC', 'ngRoute', 'ngAnimate']).config([
1616
'$provide', '$routeProvider', '$interpolateProvider', function($provide, $routeProvider, $interpolateProvider) {
1717
var config;
1818
$provide.value('Config', config = {

Diff for: js/vendor/angularjs/angular-animate.js

+1,633
Large diffs are not rendered by default.

Diff for: js/vendor/angularjs/angular-animate.min.js

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: js/vendor/angularjs/angular-route.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.3.0-beta.3
2+
* @license AngularJS v1.3.0-beta.5
33
* (c) 2010-2014 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

Diff for: js/vendor/angularjs/angular-route.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)