diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-12-28 21:25:37 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-12-28 21:25:37 +0100 |
| commit | 7b48db556bf5d9f91f2f0e61d60cd79b0e3d5da0 (patch) | |
| tree | a12ebc68164f1503d985be196f03b50c876d7b5a /module | |
| parent | added animate-enhanced (diff) | |
| download | pyload-7b48db556bf5d9f91f2f0e61d60cd79b0e3d5da0.tar.xz | |
fixed some animations
Diffstat (limited to 'module')
| -rw-r--r-- | module/web/static/css/default/dashboard.less | 1 | ||||
| -rw-r--r-- | module/web/static/js/app.js | 2 | ||||
| -rw-r--r-- | module/web/static/js/utils/animations.js | 1 | ||||
| -rw-r--r-- | module/web/static/js/views/abstract/itemView.js | 4 | ||||
| -rw-r--r-- | module/web/static/js/views/headerView.js | 5 |
5 files changed, 6 insertions, 7 deletions
diff --git a/module/web/static/css/default/dashboard.less b/module/web/static/css/default/dashboard.less index 0c749eb36..764fbfa96 100644 --- a/module/web/static/css/default/dashboard.less +++ b/module/web/static/css/default/dashboard.less @@ -55,6 +55,7 @@ .package-view {
margin-bottom: 3px;
+ overflow: hidden;
}
.package-view > div {
diff --git a/module/web/static/js/app.js b/module/web/static/js/app.js index 59098e8ca..d39ef6a63 100644 --- a/module/web/static/js/app.js +++ b/module/web/static/js/app.js @@ -10,7 +10,7 @@ define([ 'underscore', 'backbone', 'utils/initHB', -// 'utils/animations', + 'utils/animations', 'utils/lazyRequire', 'wreqr', 'bootstrap', diff --git a/module/web/static/js/utils/animations.js b/module/web/static/js/utils/animations.js index 2840bba66..a1ec5d5e1 100644 --- a/module/web/static/js/utils/animations.js +++ b/module/web/static/js/utils/animations.js @@ -66,7 +66,6 @@ define(['jquery', 'underscore', 'transit'], function(jQuery, _) { var self = this; var cb = callback; var newprops = _.extend({}, props); - console.log(newprops); if (newprops && (newprops.opacity === 'hide')) { newprops.opacity = 0; diff --git a/module/web/static/js/views/abstract/itemView.js b/module/web/static/js/views/abstract/itemView.js index 77c6bb5e4..7740abe5e 100644 --- a/module/web/static/js/views/abstract/itemView.js +++ b/module/web/static/js/views/abstract/itemView.js @@ -17,11 +17,11 @@ define(['jquery', 'backbone', 'underscore'], function($, Backbone, _) { hide: function() { - this.$el.zapOut(); + this.$el.slideUp(); }, show: function() { - this.$el.zapIn(); + this.$el.slideDown(); }, diff --git a/module/web/static/js/views/headerView.js b/module/web/static/js/views/headerView.js index dd1030220..7effcf79d 100644 --- a/module/web/static/js/views/headerView.js +++ b/module/web/static/js/views/headerView.js @@ -77,12 +77,11 @@ define(['jquery', 'backbone', 'flot'], function($, Backbone) { }, show_taskList: function() { - // TODO: fix animation - this.$('.popover').transit({'opacity': 'show'}); + this.$('.popover').fadeIn(); }, hide_taskList: function() { - this.$('.popover').transit({'opacity': 'hide'}); + this.$('.popover').fadeOut(); }, open_grabber: function() { |