ref(tooltips): remove old tooltips

roy-loomy · Aug 21, 2017 · 28b4595 · 28b4595
1 parent e3361e2
commit 28b4595
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 164 deletions.
diff --git a/css/_base.scss b/css/_base.scss
@@ -119,21 +119,6 @@ form {
     font-size: 12px;
 }
 
-/**
-* Tooltips
-**/
-.tipsy {
-    z-index: $tooltipsZ;
-    &-inner {
-        background-color: $tooltipBg;
-        max-width: 350px;
-    }
-
-    &-arrow {
-        border-color: $tooltipBg;
-    }
-}
-
 /**
 * Dialogs fade
 */

diff --git a/css/_variables.scss b/css/_variables.scss
@@ -28,7 +28,6 @@ $defaultColor: #F1F1F1;
 $defaultSideBarFontColor: #44A5FF;
 $defaultSemiDarkColor: #ACACAC;
 $defaultDarkColor: #2b3d5c;
-$tooltipBg: rgba(0,0,0, 0.7);
 
 /**
  * Toolbar

diff --git a/modules/UI/UI.js b/modules/UI/UI.js
@@ -10,7 +10,6 @@ import Avatar from "./avatar/Avatar";
 import SideContainerToggler from "./side_pannels/SideContainerToggler";
 import messageHandler from "./util/MessageHandler";
 import UIUtil from "./util/UIUtil";
-import { activateTooltips } from './util/Tooltip';
 import UIEvents from "../../service/UI/UIEvents";
 import EtherpadManager from './etherpad/Etherpad';
 import SharedVideoManager from './shared_video/SharedVideo';
@@ -232,8 +231,6 @@ UI.initConference = function () {
     // to the UI (depending on the moderator role of the local participant) and
     // (2) APP.conference as means of communication between the participants.
     followMeHandler = new FollowMe(APP.conference, UI);
-
-    activateTooltips();
 };
 
 UI.mucJoined = function () {
@@ -249,22 +246,6 @@ UI.mucJoined = function () {
  */
 UI.handleToggleFilmstrip = () => UI.toggleFilmstrip();
 
-/**
- * Sets tooltip defaults.
- *
- * @private
- */
-function _setTooltipDefaults() {
-    $.fn.tooltip.defaults = {
-        opacity: 1, //defaults to 1
-        offset: 1,
-        delayIn: 0, //defaults to 500
-        hoverable: true,
-        hideOnClick: true,
-        aria: true
-    };
-}
-
 /**
  * Returns the shared document manager object.
  * @return {EtherpadManager} the shared document manager object
@@ -285,8 +266,6 @@ UI.start = function () {
     // Set the defaults for prompt dialogs.
     $.prompt.setDefaults({persistent: false});
 
-    // Set the defaults for tooltips.
-    _setTooltipDefaults();
 
     SideContainerToggler.init(eventEmitter);
     Filmstrip.init(eventEmitter);

diff --git a/modules/UI/util/Tooltip.js b/modules/UI/util/Tooltip.js
diff --git a/package.json b/package.json
@@ -121,8 +121,6 @@
     "aui-experimental-css": "./node_modules/@atlassian/aui/dist/aui/css/aui-experimental.min.css",
     "autosize": "./node_modules/autosize/build/jquery.autosize.js",
     "jQuery-Impromptu": "jQuery-Impromptu/src/jquery-impromptu.js",
-    "popover": "./node_modules/bootstrap/js/popover.js",
-    "strophe-disco": "./node_modules/strophejs-plugins/disco/strophe.disco.js",
-    "tooltip": "./node_modules/bootstrap/js/tooltip.js"
+    "strophe-disco": "./node_modules/strophejs-plugins/disco/strophe.disco.js"
   }
 }
diff --git a/react/features/toolbox/actions.web.js b/react/features/toolbox/actions.web.js
@@ -4,7 +4,6 @@ import Recording from '../../../modules/UI/recording/Recording';
 import SideContainerToggler
     from '../../../modules/UI/side_pannels/SideContainerToggler';
 
-import { removeTooltip } from '../../../modules/UI/util/Tooltip';
 import UIEvents from '../../../service/UI/UIEvents';
 
 import {
@@ -272,8 +271,6 @@ export function setProfileButtonUnclickable(unclickable: boolean): Function {
         dispatch(setToolbarButton(buttonName, {
             unclickable
         }));
-
-        removeTooltip(document.getElementById('toolbar_button_profile'));
     };
 }
 

diff --git a/react/features/toolbox/functions.web.js b/react/features/toolbox/functions.web.js
@@ -3,8 +3,6 @@ import SideContainerToggler
 
 import defaultToolbarButtons from './defaultToolbarButtons';
 
-declare var $: Function;
-declare var AJS: Object;
 declare var interfaceConfig: Object;
 
 export { abstractMapStateToProps, getButton } from './functions.native';
@@ -107,39 +105,6 @@ export function isButtonEnabled(name) {
             || interfaceConfig.MAIN_TOOLBAR_BUTTONS.indexOf(name) !== -1;
 }
 
-/**
- * Show custom popup/tooltip for a specified button.
- *
- * @param {string} popupSelectorID - The selector id of the popup to show.
- * @param {boolean} show - True or false/show or hide the popup.
- * @param {number} timeout - The time to show the popup.
- * @returns {void}
- */
-export function showCustomToolbarPopup(
-        popupSelectorID: string,
-        show: boolean,
-        timeout: number) {
-    AJS.$(popupSelectorID).tooltip({
-        gravity: $(popupSelectorID).attr('data-popup'),
-        html: true,
-        title: 'title',
-        trigger: 'manual'
-    });
-
-    if (show) {
-        AJS.$(popupSelectorID).tooltip('show');
-
-        setTimeout(
-            () => {
-                // hide the tooltip
-                AJS.$(popupSelectorID).tooltip('hide');
-            },
-            timeout);
-    } else {
-        AJS.$(popupSelectorID).tooltip('hide');
-    }
-}
-
 /**
  * Get place for toolbar button. Now it can be in the primary Toolbar or in the
  * secondary Toolbar.