From b511bc37fb6863f63762748a41721000d31b08e6 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sat, 15 Nov 2014 14:47:22 -0500 Subject: [PATCH] don't initialize taskbar until dom is ready --- public/src/app.js | 4 ++++ public/src/modules/taskbar.js | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 4f71588ce0..e34eb4617f 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -585,6 +585,10 @@ var socket, }); } }); + + require(['taskbar'], function(taskbar) { + taskbar.init(); + }); }); }; diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js index 6404ea34b3..4114f0d184 100644 --- a/public/src/modules/taskbar.js +++ b/public/src/modules/taskbar.js @@ -103,16 +103,13 @@ define('taskbar', function() { } }; - if (!taskbar.initialized) { - taskbar.init(); - } - return { push: taskbar.push, discard: taskbar.discard, minimize: taskbar.minimize, toggleNew: taskbar.toggleNew, updateActive: taskbar.updateActive, - isActive: taskbar.isActive + isActive: taskbar.isActive, + init: taskbar.init } });