refactor ToolbarToggler

modules/UI/UI.js

@@ -539,7 +539,7 @@ UI.showToolbar = function () {
 
 //Used by torture
 UI.dockToolbar = function (isDock) {
-    return ToolbarToggler.dockToolbar(isDock);
+    ToolbarToggler.dockToolbar(isDock);
 };
 
 UI.setUserAvatar = function (id, email) {

modules/UI/prezi/Prezi.js

@@ -1,4 +1,3 @@
-var ToolbarToggler = require("../toolbars/ToolbarToggler");
 var UIUtil = require("../util/UIUtil");
 var VideoLayout = require("../videolayout/VideoLayout");
 var messageHandler = require("../util/MessageHandler");

modules/UI/toolbars/ToolbarToggler.js

@@ -1,8 +1,9 @@
 /* global APP, config, $, interfaceConfig */
 
-var toolbarTimeoutObject,
+import UIUtil from '../util/UIUtil';
-    toolbarTimeout = interfaceConfig.INITIAL_TOOLBAR_TIMEOUT,
+
-    UIUtil = require("../util/UIUtil");
+let toolbarTimeoutObject;
+let toolbarTimeout = interfaceConfig.INITIAL_TOOLBAR_TIMEOUT;
 
 function showDesktopSharingButton() {
     if (APP.desktopsharing.isDesktopSharingEnabled() &&
@@ -13,19 +14,24 @@ function showDesktopSharingButton() {
     }
 }
 
+function isToolbarVisible () {
+    return $('#header').is(':visible');
+}
+
 /**
  * Hides the toolbar.
  */
 function hideToolbar() {
-    if(config.alwaysVisibleToolbar)
+    if (config.alwaysVisibleToolbar) {
         return;
+    }
 
-    var header = $("#header"),
+    let header = $("#header");
-        bottomToolbar = $("#bottomToolbar");
+    let bottomToolbar = $("#bottomToolbar");
-    var isToolbarHover = false;
+    let isToolbarHover = false;
     header.find('*').each(function () {
-        var id = $(this).attr('id');
+        let id = $(this).attr('id');
-        if ($("#" + id + ":hover").length > 0) {
+        if ($(`#${id}:hover`).length > 0) {
             isToolbarHover = true;
         }
     });
@@ -36,34 +42,36 @@ function hideToolbar() {
     clearTimeout(toolbarTimeoutObject);
     toolbarTimeoutObject = null;
 
-    if (!isToolbarHover) {
+    if (isToolbarHover) {
+        toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
+    } else {
         header.hide("slide", { direction: "up", duration: 300});
         $('#subject').animate({top: "-=40"}, 300);
         if ($("#remoteVideos").hasClass("hidden")) {
             bottomToolbar.hide(
-                "slide", {direction: "right", duration: 300});
+                "slide", {direction: "right", duration: 300}
+            );
         }
     }
-    else {
-        toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
-    }
 }
 
-var ToolbarToggler = {
+const ToolbarToggler = {
     /**
      * Shows the main toolbar.
      */
-    showToolbar: function () {
+    showToolbar () {
-        if (interfaceConfig.filmStripOnly)
+        if (interfaceConfig.filmStripOnly) {
             return;
-        var header = $("#header"),
+        }
-            bottomToolbar = $("#bottomToolbar");
+        let header = $("#header");
+        let bottomToolbar = $("#bottomToolbar");
         if (!header.is(':visible') || !bottomToolbar.is(":visible")) {
             header.show("slide", { direction: "up", duration: 300});
             $('#subject').animate({top: "+=40"}, 300);
             if (!bottomToolbar.is(":visible")) {
                 bottomToolbar.show(
-                    "slide", {direction: "right", duration: 300});
+                    "slide", {direction: "right", duration: 300}
+                );
             }
 
             if (toolbarTimeoutObject) {
@@ -83,33 +91,28 @@ var ToolbarToggler = {
      *
      * @param isDock indicates what operation to perform
      */
-    dockToolbar: function (isDock) {
+    dockToolbar (isDock) {
-        if (interfaceConfig.filmStripOnly)
+        if (interfaceConfig.filmStripOnly) {
             return;
+        }
 
         if (isDock) {
             // First make sure the toolbar is shown.
-            if (!$('#header').is(':visible')) {
+            if (!isToolbarVisible()) {
                 this.showToolbar();
             }
 
             // Then clear the time out, to dock the toolbar.
-            if (toolbarTimeoutObject) {
             clearTimeout(toolbarTimeoutObject);
             toolbarTimeoutObject = null;
-            }
+        } else {
-        }
+            if (isToolbarVisible()) {
-        else {
+                toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
-            if (!$('#header').is(':visible')) {
+            } else {
                 this.showToolbar();
             }
-            else {
-                toolbarTimeoutObject = setTimeout(hideToolbar, toolbarTimeout);
         }
     }
-    },
-
-    showDesktopSharingButton: showDesktopSharingButton
 };
 
 module.exports = ToolbarToggler;