From 2347f2b1faf7290fd69f7c0cb65a51758e1b22fe Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 27 Jun 2014 19:01:58 +0200 Subject: [PATCH] Don't reload etherpad iframe when setting name if etherpad hasn't been loaded yet --- public/js/vroom.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/vroom.js b/public/js/vroom.js index affd585..2f8d617 100644 --- a/public/js/vroom.js +++ b/public/js/vroom.js @@ -1461,7 +1461,7 @@ function initVroom(room) { if (etherpad.enabled){ // Wait ~3 sec and reload etherpad setTimeout(function(){ - if (lastNameChange && lastNameChange + 3000 < +new Date){ + if (lastNameChange && lastNameChange + 3000 < +new Date && $('#etherpadContainer').html() != ''){ loadEtherpadIframe(); } }, 3100);