From 43906a4e300bc46aff68093412823ad41c074561 Mon Sep 17 00:00:00 2001 From: yanas Date: Mon, 17 Oct 2016 15:59:35 -0500 Subject: [PATCH] Fix undefined check. --- interface_config.js | 7 ++++++- modules/UI/toolbars/Toolbar.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/interface_config.js b/interface_config.js index c0dbecf94..adff2c338 100644 --- a/interface_config.js +++ b/interface_config.js @@ -20,7 +20,12 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars // the toolbar buttons line is intentionally left in one line, to be able // to easily override values or remove them using regex MAIN_TOOLBAR_BUTTONS: ['microphone', 'camera', 'desktop', 'invite', 'fullscreen', 'hangup'], // jshint ignore:line - MAIN_TOOLBAR_SPLITTER_INDEX: -1, + /** + * The index of the splitter button in the main toolbar. The splitter + * button is a button in the toolbar that will be applied a special styling + * visually dividing the toolbar buttons. + */ + //MAIN_TOOLBAR_SPLITTER_INDEX: -1, TOOLBAR_BUTTONS: ['profile', 'authentication', 'microphone', 'camera', 'desktop', 'recording', 'security', 'raisehand', 'chat', 'etherpad', 'sharedvideo', 'sip', 'dialpad', 'settings', 'hangup', 'filmstrip', 'contacts'], // jshint ignore:line SETTINGS_SECTIONS: ['language', 'devices', 'moderator'], // Determines how the video would fit the screen. 'both' would fit the whole diff --git a/modules/UI/toolbars/Toolbar.js b/modules/UI/toolbars/Toolbar.js index bb7a00720..3d346b163 100644 --- a/modules/UI/toolbars/Toolbar.js +++ b/modules/UI/toolbars/Toolbar.js @@ -711,7 +711,7 @@ Toolbar = { button, (index === 0), (index === interfaceConfig.MAIN_TOOLBAR_BUTTONS.length -1), - (interfaceConfig.MAIN_TOOLBAR_SPLITTER_INDEX + (interfaceConfig.MAIN_TOOLBAR_SPLITTER_INDEX !== undefined && index === interfaceConfig.MAIN_TOOLBAR_SPLITTER_INDEX)); }