haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "misc: make URL protocol matching regexes non-greedy" 

This reverts commit 7c911eca96.

I'm dumb. We need global mode because otherwise lastIndex is not updated in the
regex object, which we rely upon, so this is intentional.
This commit is contained in:
Saúl Ibarra Corretgé 2019-02-06 13:52:03 +01:00 committed by Saúl Ibarra Corretgé
parent 9f3ef43daa
commit 6f95c50d6e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
react/features/base/util/uri.js
View File

@ -71,7 +71,7 @@ function _fixRoom(room: ?string) {
* @returns {string} * @returns {string}
*/ */
function _fixURIStringScheme(uri: string) { function _fixURIStringScheme(uri: string) {
const regex = new RegExp(`${URI_PROTOCOL_PATTERN}+`, 'i'); const regex = new RegExp(`${URI_PROTOCOL_PATTERN}+`, 'gi');
const match: Array<string> | null = regex.exec(uri); const match: Array<string> | null = regex.exec(uri);
if (match) { if (match) {

2
react/features/deep-linking/functions.js
View File

@ -45,7 +45,7 @@ export function generateDeepLinkingURL() {
const appScheme = interfaceConfig.APP_SCHEME || 'org.jitsi.meet'; const appScheme = interfaceConfig.APP_SCHEME || 'org.jitsi.meet';
const { href } = window.location; const { href } = window.location;
const regex = new RegExp(URI_PROTOCOL_PATTERN, 'i'); const regex = new RegExp(URI_PROTOCOL_PATTERN, 'gi');
// Android: use an intent link, custom schemes don't work in all browsers. // Android: use an intent link, custom schemes don't work in all browsers.
// https://developer.chrome.com/multidevice/android/intents // https://developer.chrome.com/multidevice/android/intents