summaryrefslogtreecommitdiffstats
path: root/module/web/static/js
diff options
context:
space:
mode:
Diffstat (limited to 'module/web/static/js')
-rw-r--r--module/web/static/js/app.js2
-rw-r--r--module/web/static/js/utils/animations.js1
-rw-r--r--module/web/static/js/views/abstract/itemView.js4
-rw-r--r--module/web/static/js/views/headerView.js5
4 files changed, 5 insertions, 7 deletions
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() {