浏览代码

Removes hardcoded defaulting to US number from the code.

master
damencho 6 年前
父节点
当前提交
384f0d4317
共有 1 个文件被更改,包括 2 次插入16 次删除
  1. 2
    16
      react/features/invite/functions.js

+ 2
- 16
react/features/invite/functions.js 查看文件

518
  */
518
  */
519
 export function _getDefaultPhoneNumber(
519
 export function _getDefaultPhoneNumber(
520
         dialInNumbers: Object): ?string {
520
         dialInNumbers: Object): ?string {
521
-    const defValueForDefaultCountry = 'US';
522
 
521
 
523
     if (Array.isArray(dialInNumbers)) {
522
     if (Array.isArray(dialInNumbers)) {
524
         // new syntax follows
523
         // new syntax follows
525
         // find the default country inside dialInNumbers, US one
524
         // find the default country inside dialInNumbers, US one
526
         // or return the first one
525
         // or return the first one
527
-        let defaultNumber = dialInNumbers.find(number => number.default);
528
-
529
-        if (!defaultNumber) {
530
-            defaultNumber = dialInNumbers.find(({ countryCode }) =>
531
-                countryCode === defValueForDefaultCountry);
532
-        }
526
+        const defaultNumber = dialInNumbers.find(number => number.default);
533
 
527
 
534
         if (defaultNumber) {
528
         if (defaultNumber) {
535
             return defaultNumber.formattedNumber;
529
             return defaultNumber.formattedNumber;
539
             ? dialInNumbers[0].formattedNumber : null;
533
             ? dialInNumbers[0].formattedNumber : null;
540
     }
534
     }
541
 
535
 
542
-    const {
543
-        defaultCountry = defValueForDefaultCountry,
544
-        numbers } = dialInNumbers;
536
+    const { numbers } = dialInNumbers;
545
 
537
 
546
     if (numbers && Object.keys(numbers).length > 0) {
538
     if (numbers && Object.keys(numbers).length > 0) {
547
         // deprecated and will be removed
539
         // deprecated and will be removed
548
-        const defaultNumbers = numbers[defaultCountry];
549
-
550
-        if (defaultNumbers) {
551
-            return defaultNumbers[0];
552
-        }
553
-
554
         const firstRegion = Object.keys(numbers)[0];
540
         const firstRegion = Object.keys(numbers)[0];
555
 
541
 
556
         return firstRegion && numbers[firstRegion][0];
542
         return firstRegion && numbers[firstRegion][0];

正在加载...
取消
保存