From 401a783d6a7e7a12f5be415ac26473d5c071d21f Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Wed, 15 Feb 2017 11:19:36 -0600 Subject: [PATCH] Coding style consistency Includes automatic recommended Xcode project file fixes. --- .../project.pbxproj | 53 ++++++++++++++----- react/features/base/conference/functions.js | 4 +- .../native/polyfills-browser.js | 27 +++++----- 3 files changed, 53 insertions(+), 31 deletions(-) diff --git a/ios/jitsi-meet-react.xcodeproj/project.pbxproj b/ios/jitsi-meet-react.xcodeproj/project.pbxproj index 866bbddea..71a903501 100644 --- a/ios/jitsi-meet-react.xcodeproj/project.pbxproj +++ b/ios/jitsi-meet-react.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 002AF788986B412780935607 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B96AF9B6FBC0453798399985 /* FontAwesome.ttf */; }; 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; @@ -24,6 +25,7 @@ 2602576C1D0A7703001E3363 /* jitsi.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2602576B1D0A7703001E3363 /* jitsi.ttf */; }; 3847F11906B4479A9162628F /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 821D8ABD506944B4BDBB069B /* libRNVectorIcons.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; + 7FAD39BE09A84D6AB0ABACA8 /* libRNBackgroundTimer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A0018BBB2C4FD5A4F9CE71 /* libRNBackgroundTimer.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; 901FE90FA5744B5B94DCDC41 /* libKCKeepAwake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0EA8C046B2BF46279796F07D /* libKCKeepAwake.a */; }; B30EF2311DC0ED7C00690F45 /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B30EF2301DC0ED7C00690F45 /* WebRTC.framework */; }; @@ -40,7 +42,6 @@ BF9643921C34FBF100B0BBDF /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BF9643911C34FBF100B0BBDF /* libsqlite3.tbd */; }; BF9643941C34FBF900B0BBDF /* libstdc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = BF9643931C34FBF900B0BBDF /* libstdc++.tbd */; }; BFC745141CB829B300673F38 /* libRCTWebRTC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BFC745131CB829A700673F38 /* libRCTWebRTC.a */; }; - 7FAD39BE09A84D6AB0ABACA8 /* libRNBackgroundTimer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27A0018BBB2C4FD5A4F9CE71 /* libRNBackgroundTimer.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -184,6 +185,13 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; + B332D04E1E54E3170086EA16 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 0965153BB98645B4A8B6AA10 /* RNBackgroundTimer.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = RNBackgroundTimer; + }; B3BA19D41DC6B37B00BCD481 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; @@ -263,6 +271,7 @@ 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; + 0965153BB98645B4A8B6AA10 /* RNBackgroundTimer.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNBackgroundTimer.xcodeproj; path = "../node_modules/react-native-background-timer/ios/RNBackgroundTimer.xcodeproj"; sourceTree = ""; }; 0B42DFAD1E2FD90700111B12 /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AudioMode.m; path = app/AudioMode.m; sourceTree = ""; }; 0EA8C046B2BF46279796F07D /* libKCKeepAwake.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libKCKeepAwake.a; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; @@ -277,6 +286,7 @@ 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; 22418656B14845609F953A42 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; }; 2602576B1D0A7703001E3363 /* jitsi.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = jitsi.ttf; path = ../android/app/src/main/assets/fonts/jitsi.ttf; sourceTree = ""; }; + 27A0018BBB2C4FD5A4F9CE71 /* libRNBackgroundTimer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNBackgroundTimer.a; sourceTree = ""; }; 5B09C20C78C74A548AAAC1FA /* KCKeepAwake.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = KCKeepAwake.xcodeproj; path = "../node_modules/react-native-keep-awake/ios/KCKeepAwake.xcodeproj"; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; @@ -297,8 +307,6 @@ BF9643911C34FBF100B0BBDF /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; BF9643931C34FBF900B0BBDF /* libstdc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.tbd"; path = "usr/lib/libstdc++.tbd"; sourceTree = SDKROOT; }; BFC7450D1CB829A700673F38 /* RCTWebRTC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebRTC.xcodeproj; path = "../node_modules/react-native-webrtc/ios/RCTWebRTC.xcodeproj"; sourceTree = ""; }; - 0965153BB98645B4A8B6AA10 /* RNBackgroundTimer.xcodeproj */ = {isa = PBXFileReference; name = "RNBackgroundTimer.xcodeproj"; path = "../node_modules/react-native-background-timer/ios/RNBackgroundTimer.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; - 27A0018BBB2C4FD5A4F9CE71 /* libRNBackgroundTimer.a */ = {isa = PBXFileReference; name = "libRNBackgroundTimer.a"; path = "libRNBackgroundTimer.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -317,7 +325,7 @@ BF9643881C34FBC800B0BBDF /* GLKit.framework in Frameworks */, B30EF2311DC0ED7C00690F45 /* WebRTC.framework in Frameworks */, BF96438E1C34FBE100B0BBDF /* VideoToolbox.framework in Frameworks */, - 146834051AC3E58100842450 /* libReact.a in Frameworks */, + 901FE90FA5744B5B94DCDC41 /* libKCKeepAwake.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, @@ -329,9 +337,9 @@ 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, BFC745141CB829B300673F38 /* libRCTWebRTC.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, - 3847F11906B4479A9162628F /* libRNVectorIcons.a in Frameworks */, - 901FE90FA5744B5B94DCDC41 /* libKCKeepAwake.a in Frameworks */, + 146834051AC3E58100842450 /* libReact.a in Frameworks */, 7FAD39BE09A84D6AB0ABACA8 /* libRNBackgroundTimer.a in Frameworks */, + 3847F11906B4479A9162628F /* libRNVectorIcons.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -491,8 +499,8 @@ BFC7450D1CB829A700673F38 /* RCTWebRTC.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, - 22418656B14845609F953A42 /* RNVectorIcons.xcodeproj */, 0965153BB98645B4A8B6AA10 /* RNBackgroundTimer.xcodeproj */, + 22418656B14845609F953A42 /* RNVectorIcons.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -528,6 +536,14 @@ name = Products; sourceTree = ""; }; + B332D0301E54E3170086EA16 /* Products */ = { + isa = PBXGroup; + children = ( + B332D04F1E54E3170086EA16 /* libRNBackgroundTimer.a */, + ); + name = Products; + sourceTree = ""; + }; B3BA19B71DC6B02F00BCD481 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -580,7 +596,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 820; + LastUpgradeCheck = 0820; ORGANIZATIONNAME = Facebook; TargetAttributes = { 13B07F861A680F5B00A75B9A = { @@ -657,6 +673,10 @@ ProductGroup = 146834001AC3E56700842450 /* Products */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, + { + ProductGroup = B332D0301E54E3170086EA16 /* Products */; + ProjectRef = 0965153BB98645B4A8B6AA10 /* RNBackgroundTimer.xcodeproj */; + }, { ProductGroup = 26D589F81D0B42EE00FC396B /* Products */; ProjectRef = 22418656B14845609F953A42 /* RNVectorIcons.xcodeproj */; @@ -810,6 +830,13 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + B332D04F1E54E3170086EA16 /* libRNBackgroundTimer.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRNBackgroundTimer.a; + remoteRef = B332D04E1E54E3170086EA16 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; B3BA19D51DC6B37B00BCD481 /* libRCTImage-tvOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -956,9 +983,9 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", "$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS/**", + "$(SRCROOT)/../node_modules/react-native-background-timer/ios", "$(SRCROOT)/../node_modules/react-native-keep-awake/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../node_modules/react-native-background-timer/ios", ); INFOPLIST_FILE = app/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -966,7 +993,6 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-webrtc/**", - "\"$(SRCROOT)/jitsi-meet-react\"", ); OTHER_LDFLAGS = ( "$(inherited)", @@ -994,9 +1020,9 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", "$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS/**", + "$(SRCROOT)/../node_modules/react-native-background-timer/ios", "$(SRCROOT)/../node_modules/react-native-keep-awake/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../node_modules/react-native-background-timer/ios", ); INFOPLIST_FILE = app/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -1004,7 +1030,6 @@ LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../node_modules/react-native-webrtc/**", - "\"$(SRCROOT)/jitsi-meet-react\"", ); OTHER_LDFLAGS = ( "$(inherited)", @@ -1058,9 +1083,9 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", + "$(SRCROOT)/../node_modules/react-native-background-timer/ios", "$(SRCROOT)/../node_modules/react-native-keep-awake/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../node_modules/react-native-background-timer/ios", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -1104,9 +1129,9 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", + "$(SRCROOT)/../node_modules/react-native-background-timer/ios", "$(SRCROOT)/../node_modules/react-native-keep-awake/ios", "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", - "$(SRCROOT)/../node_modules/react-native-background-timer/ios", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/react/features/base/conference/functions.js b/react/features/base/conference/functions.js index dfdb66ea7..b79730601 100644 --- a/react/features/base/conference/functions.js +++ b/react/features/base/conference/functions.js @@ -19,8 +19,8 @@ export function _addLocalTracksToConference(conference, localTracks) { // XXX The library lib-jitsi-meet may be draconian, for example, when // adding one and the same video track multiple times. if (conferenceLocalTracks.indexOf(track) === -1) { - promises.push(conference.addTrack(track) - .catch(err => { + promises.push( + conference.addTrack(track).catch(err => { _reportError( 'Failed to add local track to conference', err); diff --git a/react/features/base/lib-jitsi-meet/native/polyfills-browser.js b/react/features/base/lib-jitsi-meet/native/polyfills-browser.js index 381c5a0d8..903b82928 100644 --- a/react/features/base/lib-jitsi-meet/native/polyfills-browser.js +++ b/react/features/base/lib-jitsi-meet/native/polyfills-browser.js @@ -1,4 +1,5 @@ import BackgroundTimer from 'react-native-background-timer'; +import 'url-polyfill'; // Polyfill for URL constructor /** * Gets the first common prototype of two specified Objects (treating the @@ -86,10 +87,6 @@ function _visitNode(node, callback) { } (global => { - - // Polyfill for URL constructor - require('url-polyfill'); - const DOMParser = require('xmldom').DOMParser; // addEventListener @@ -110,8 +107,8 @@ function _visitNode(node, callback) { if (typeof global.document === 'undefined') { const document = new DOMParser().parseFromString( - /* source */ '', - /* mineType */ 'text/xml'); + '', + 'text/xml'); // document.addEventListener // @@ -334,17 +331,17 @@ function _visitNode(node, callback) { // // Required by: // - Strophe - if (prototype && typeof prototype.responseXML === 'undefined') { + if (prototype && !prototype.hasOwnProperty('responseXML')) { Object.defineProperty(prototype, 'responseXML', { - configurable: true, - enumerable: true, get() { const responseText = this.responseText; let responseXML; if (responseText) { - responseXML = new DOMParser() - .parseFromString(responseText); + responseXML + = new DOMParser().parseFromString( + responseText, + 'text/xml'); } return responseXML; @@ -355,16 +352,16 @@ function _visitNode(node, callback) { // Timers // - // React Native's timers won't run while the app is in the background, - // this is a known limitation. Replace them with a background-friendly + // React Native's timers won't run while the app is in the background, this + // is a known limitation. Replace them with a background-friendly // alternative. // // Required by: // - lib-jitsi-meet // - Strophe - global.setTimeout = window.setTimeout = BackgroundTimer.setTimeout; global.clearTimeout = window.clearTimeout = BackgroundTimer.clearTimeout; - global.setInterval = window.setInterval = BackgroundTimer.setInterval; global.clearInterval = window.clearInterval = BackgroundTimer.clearInterval; + global.setInterval = window.setInterval = BackgroundTimer.setInterval; + global.setTimeout = window.setTimeout = BackgroundTimer.setTimeout; })(global || window || this); // eslint-disable-line no-invalid-this