Index: lams_learning/web/includes/javascript/kumalive.js =================================================================== diff -u -r3a30c9806be555d7cc8bff332abd27521cca4145 -r375a15822889954a22d95bd07cd97a1c6e4c3d97 --- lams_learning/web/includes/javascript/kumalive.js (.../kumalive.js) (revision 3a30c9806be555d7cc8bff332abd27521cca4145) +++ lams_learning/web/includes/javascript/kumalive.js (.../kumalive.js) (revision 375a15822889954a22d95bd07cd97a1c6e4c3d97) @@ -18,7 +18,8 @@ learnerDivTemplate = $('
').addClass('learner changing') .append($('
').addClass('profilePictureWrapper').append($('
').addClass('profilePicture profilePictureHidden'))) .append($('
').addClass('name')), - REFRESH_DELAY = 1000; + REFRESH_DELAY = 1000, + ANIMATION_DURATION = 1000; /** * Fetches existing Kumalive session @@ -110,7 +111,7 @@ roleTeacher = message.isTeacher && message.roleTeacher; // hide all buttons and enable ones appropriate for the role - $('table button').hide(); + $('#mainDiv button').hide(); if (roleTeacher) { $('#raiseHandPromptButton').click(raiseHandPrompt); $('#downHandPromptButton').click(downHandPrompt); @@ -134,7 +135,7 @@ // show proper work screen $('#initDiv').hide(); - $('table').show(); + $('#mainDiv').show(); } /** @@ -200,7 +201,6 @@ currentLearnerIds = [], // should refresh be repeated? result = false; - $.each(message.learners, function(index, learner){ if (learner.roleTeacher) { // do not add teachers to learners container @@ -311,7 +311,7 @@ .animate({ 'left' : targetOffset.left, 'top' : targetOffset.top - }, 1000, function(){ + }, ANIMATION_DURATION, function(){ targetLearnerDiv.css('visibility', 'visible'); transitionCopy.remove(); learnerDiv.removeClass('changing'); @@ -426,7 +426,7 @@ 'width' : '200px', 'height' : '200px', 'font-size' : '200px' - }, 1000, function(){ + }, ANIMATION_DURATION, function(){ speaker.css('visibility', 'visible'); transitionCopy.remove(); }); @@ -438,9 +438,9 @@ */ function learnerFadeIn(learnerDiv) { var nameDiv = $('.name', learnerDiv).css('color', 'green'); - learnerDiv.show(); + learnerDiv.css('display', 'inline-block'); - $('.profilePicture', learnerDiv).switchClass('profilePictureHidden', 'profilePictureShown', 1000, function(){ + $('.profilePicture', learnerDiv).switchClass('profilePictureHidden', 'profilePictureShown', ANIMATION_DURATION, function(){ nameDiv.css('color', 'initial'); learnerDiv.removeClass('changing'); }); @@ -456,11 +456,11 @@ learnerDiv.addClass('changing'); var nameDiv = $('.name', learnerDiv).css('color', 'red'); - $('.profilePicture', learnerDiv).switchClass('profilePictureShown', 'profilePictureHidden', 1000, function(){ + $('.profilePicture', learnerDiv).switchClass('profilePictureShown', 'profilePictureHidden', ANIMATION_DURATION, function(){ nameDiv.remove(); learnerDiv.animate({ 'width' : 'toggle' - }, 1000, function(){ + }, ANIMATION_DURATION, function(){ learnerDiv.remove(); }); });