From f6f37985a5e5aa96fb79244f89ba1c998ce60ae0 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 20 Feb 2013 19:35:51 +0100 Subject: updated bootstrap, fixed tooltips --- module/web/static/js/views/headerView.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/web/static/js/views/headerView.js') diff --git a/module/web/static/js/views/headerView.js b/module/web/static/js/views/headerView.js index 43c66b99f..cfceca6cd 100644 --- a/module/web/static/js/views/headerView.js +++ b/module/web/static/js/views/headerView.js @@ -5,7 +5,7 @@ define(['jquery', 'underscore', 'backbone', 'flot'], function($, _, Backbone) { el: 'header', events: { - 'click i.icon-tasks': 'show_taskList', + 'click i.iconf-list': 'toggle_taskList', 'click .popover .close': 'hide_taskList', 'click .btn-grabber': 'open_grabber' }, @@ -17,8 +17,8 @@ define(['jquery', 'underscore', 'backbone', 'flot'], function($, _, Backbone) { initialize: function() { - this.notifications = this.$('#notification-area').calculateHeight(); - this.selections = this.$('#selection-area').calculateHeight(); + this.notifications = this.$('#notification-area').calculateHeight().height(0); + this.selections = this.$('#selection-area').calculateHeight().height(0); var totalPoints = 100; var data = []; @@ -81,8 +81,8 @@ define(['jquery', 'underscore', 'backbone', 'flot'], function($, _, Backbone) { render: function() { }, - show_taskList: function() { - this.$('.popover').fadeIn(); + toggle_taskList: function() { + this.$('.popover').animate({opacity: 'toggle'}); }, hide_taskList: function() { -- cgit v1.2.3