ref(base/util): move getSymbolDescription to util

This commit is contained in:
paweldomas 2018-07-05 13:33:06 -05:00 committed by Lyubo Marinov
parent 9972e88b67
commit 01c2786c95
2 changed files with 29 additions and 29 deletions

View File

@ -19,6 +19,29 @@ export function getJitsiMeetGlobalNS() {
return window.JitsiMeetJS.app; return window.JitsiMeetJS.app;
} }
/**
* Gets the description of a specific {@code Symbol}.
*
* @param {Symbol} symbol - The {@code Symbol} to retrieve the description of.
* @private
* @returns {string} The description of {@code symbol}.
*/
export function getSymbolDescription(symbol: ?Symbol) {
let description = symbol ? symbol.toString() : 'undefined';
if (description.startsWith('Symbol(') && description.endsWith(')')) {
description = description.slice(7, -1);
}
// The polyfill es6-symbol that we use does not appear to comply with the
// Symbol standard and, merely, adds @@ at the beginning of the description.
if (description.startsWith('@@')) {
description = description.slice(2);
}
return description;
}
/** /**
* A helper function that behaves similar to Object.assign, but only reassigns a * A helper function that behaves similar to Object.assign, but only reassigns a
* property in target if it's defined in source. * property in target if it's defined in source.

View File

@ -17,7 +17,7 @@ import {
import { LOAD_CONFIG_ERROR } from '../../base/config'; import { LOAD_CONFIG_ERROR } from '../../base/config';
import { CONNECTION_FAILED } from '../../base/connection'; import { CONNECTION_FAILED } from '../../base/connection';
import { MiddlewareRegistry } from '../../base/redux'; import { MiddlewareRegistry } from '../../base/redux';
import { toURLString } from '../../base/util'; import { getSymbolDescription, toURLString } from '../../base/util';
import { ENTER_PICTURE_IN_PICTURE } from '../picture-in-picture'; import { ENTER_PICTURE_IN_PICTURE } from '../picture-in-picture';
/** /**
@ -66,7 +66,7 @@ MiddlewareRegistry.register(store => next => action => {
break; break;
case ENTER_PICTURE_IN_PICTURE: case ENTER_PICTURE_IN_PICTURE:
_sendEvent(store, _getSymbolDescription(type), /* data */ {}); _sendEvent(store, getSymbolDescription(type), /* data */ {});
break; break;
case LOAD_CONFIG_ERROR: { case LOAD_CONFIG_ERROR: {
@ -74,7 +74,7 @@ MiddlewareRegistry.register(store => next => action => {
_sendEvent( _sendEvent(
store, store,
_getSymbolDescription(type), getSymbolDescription(type),
/* data */ { /* data */ {
error: _toErrorString(error), error: _toErrorString(error),
url: toURLString(locationURL) url: toURLString(locationURL)
@ -110,29 +110,6 @@ function _toErrorString(
: ''); : '');
} }
/**
* Gets the description of a specific {@code Symbol}.
*
* @param {Symbol} symbol - The {@code Symbol} to retrieve the description of.
* @private
* @returns {string} The description of {@code symbol}.
*/
function _getSymbolDescription(symbol: Symbol) {
let description = symbol.toString();
if (description.startsWith('Symbol(') && description.endsWith(')')) {
description = description.slice(7, -1);
}
// The polyfill es6-symbol that we use does not appear to comply with the
// Symbol standard and, merely, adds @@ at the beginning of the description.
if (description.startsWith('@@')) {
description = description.slice(2);
}
return description;
}
/** /**
* If {@link SET_ROOM} action happens for a valid conference room this method * If {@link SET_ROOM} action happens for a valid conference room this method
* will emit an early {@link CONFERENCE_WILL_JOIN} event to let the external API * will emit an early {@link CONFERENCE_WILL_JOIN} event to let the external API
@ -153,7 +130,7 @@ function _maybeTriggerEarlyConferenceWillJoin(store, action) {
isRoomValid(room) && locationURL && _sendEvent( isRoomValid(room) && locationURL && _sendEvent(
store, store,
_getSymbolDescription(CONFERENCE_WILL_JOIN), getSymbolDescription(CONFERENCE_WILL_JOIN),
/* data */ { /* data */ {
url: toURLString(locationURL) url: toURLString(locationURL)
}); });
@ -184,7 +161,7 @@ function _sendConferenceEvent(
} }
_swallowEvent(store, action, data) _swallowEvent(store, action, data)
|| _sendEvent(store, _getSymbolDescription(type), data); || _sendEvent(store, getSymbolDescription(type), data);
} }
/** /**
@ -210,7 +187,7 @@ function _sendConferenceFailedOnConnectionError(store, action) {
conference => conference.getConnection() !== connection) conference => conference.getConnection() !== connection)
&& _sendEvent( && _sendEvent(
store, store,
_getSymbolDescription(CONFERENCE_FAILED), getSymbolDescription(CONFERENCE_FAILED),
/* data */ { /* data */ {
url: toURLString(locationURL), url: toURLString(locationURL),
error: action.error.name error: action.error.name