diff --git a/ios/app/src/AppDelegate.m b/ios/app/src/AppDelegate.m index 1543981596..00707dc9f9 100644 --- a/ios/app/src/AppDelegate.m +++ b/ios/app/src/AppDelegate.m @@ -51,7 +51,7 @@ if ([FIRUtilities appContainsRealServiceInfoPlist]) { NSLog(@"Enabling Firebase"); [FIRApp configure]; - // Crashlytics defaults to disabled wirth the FirebaseCrashlyticsCollectionEnabled Info.plist key. + // Crashlytics defaults to disabled with the FirebaseCrashlyticsCollectionEnabled Info.plist key. [[FIRCrashlytics crashlytics] setCrashlyticsCollectionEnabled:![jitsiMeet isCrashReportingDisabled]]; } diff --git a/ios/ci/build-ipa.sh b/ios/ci/build-ipa.sh index 011a280fa9..dbe627d9ac 100755 --- a/ios/ci/build-ipa.sh +++ b/ios/ci/build-ipa.sh @@ -35,7 +35,7 @@ fi echo "PR_REPO_SLUG=${PR_REPO_SLUG} PR_BRANCH=${PR_BRANCH}" -# do the marge and git log +# do the merge and git log if [ $PR_BRANCH != "master" ]; then echo "Will merge ${PR_REPO_SLUG}/${PR_BRANCH} into master" diff --git a/ios/ci/setup-certificates.sh b/ios/ci/setup-certificates.sh index 338e4d7982..151b84b7e4 100755 --- a/ios/ci/setup-certificates.sh +++ b/ios/ci/setup-certificates.sh @@ -90,7 +90,7 @@ echo "importing dev-key.p12" security import ${CERT_DIR}/dev-key.p12 -k ios-build.keychain -P $IOS_SIGNING_CERT_PASSWORD -A echo "will set-key-partition-list" -# Fix for OS X Sierra that hungs in the codesign step +# Fix for OS X Sierra that hangs in the codesign step security set-key-partition-list -S apple-tool:,apple: -s -k $ENCRYPTION_PASSWORD ios-build.keychain > /dev/null echo "done set-key-partition-list" diff --git a/ios/sdk/src/JitsiMeetView.m b/ios/sdk/src/JitsiMeetView.m index f4ae19f27d..c8ed2eb7a7 100644 --- a/ios/sdk/src/JitsiMeetView.m +++ b/ios/sdk/src/JitsiMeetView.m @@ -184,7 +184,7 @@ static void initializeViewsMap() { // conference. However, React and, respectively, // appProperties/initialProperties are declarative expressions i.e. one and // the same URL will not trigger an automatic re-render in the JavaScript - // source code. The workaround implemented bellow introduces imperativeness + // source code. The workaround implemented below introduces imperativeness // in React Component props by defining a unique value per invocation. props[@"timestamp"] = @(mach_absolute_time()); diff --git a/ios/sdk/src/callkit/JMCallKitEmitter.swift b/ios/sdk/src/callkit/JMCallKitEmitter.swift index e35fa0d710..3d861584ac 100644 --- a/ios/sdk/src/callkit/JMCallKitEmitter.swift +++ b/ios/sdk/src/callkit/JMCallKitEmitter.swift @@ -76,7 +76,7 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate { // Avoid mute actions ping-pong: if the mute action was caused by // the JS side (we requested a transaction) don't call the delegate - // method. If it was called by the provder itself (when the user presses + // method. If it was called by the provider itself (when the user presses // the mute button in the CallKit view) then call the delegate method. // // NOTE: don't try to be clever and remove this. Been there, done that. diff --git a/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift b/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift index 06310aeef6..079ab08c72 100644 --- a/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift +++ b/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift @@ -29,7 +29,7 @@ public protocol PiPViewCoordinatorDelegate: class { /// when is presented in Picure in Picture mode. public class PiPViewCoordinator { - /// Limits the boundries of view position on screen when minimized + /// Limits the boundaries of view position on screen when minimized public var dragBoundInsets: UIEdgeInsets = UIEdgeInsets(top: 25, left: 5, bottom: 5, diff --git a/ios/travis-ci/build-ipa.sh b/ios/travis-ci/build-ipa.sh index c9311df802..eccca231c9 100755 --- a/ios/travis-ci/build-ipa.sh +++ b/ios/travis-ci/build-ipa.sh @@ -60,7 +60,7 @@ fi echo "PR_REPO_SLUG=${PR_REPO_SLUG} PR_BRANCH=${PR_BRANCH}" -# do the marge and git log +# do the merge and git log if [ $PR_BRANCH != "master" ]; then echo "Will merge ${PR_REPO_SLUG}/${PR_BRANCH} into master" diff --git a/modules/API/external/external_api.js b/modules/API/external/external_api.js index 3f0b956523..ba81824275 100644 --- a/modules/API/external/external_api.js +++ b/modules/API/external/external_api.js @@ -197,7 +197,7 @@ function parseArguments(args) { * @param {any} value - The value to be parsed. * @returns {string|undefined} The parsed value that can be used for setting * sizes through the style property. If invalid value is passed the method - * retuns undefined. + * returns undefined. */ function parseSizeParam(value) { let parsedValue; diff --git a/modules/UI/authentication/AuthHandler.js b/modules/UI/authentication/AuthHandler.js index bc8c9f27a2..82602b6d1c 100644 --- a/modules/UI/authentication/AuthHandler.js +++ b/modules/UI/authentication/AuthHandler.js @@ -63,7 +63,7 @@ function doExternalAuth(room, lockPassword) { /** * Redirect the user to the token authentication service for the login to be - * performed. Once complete it is expected that the service wil bring the user + * performed. Once complete it is expected that the service will bring the user * back with "?jwt={the JWT token}" query parameter added. * @param {string} [roomName] the name of the conference room. */ @@ -76,7 +76,7 @@ function redirectToTokenAuthService(roomName) { /** * Initializes 'message' listener that will wait for a JWT token to be received * from the token authentication service opened in a popup window. - * @param room the name fo the conference room. + * @param room the name of the conference room. */ function initJWTTokenListener(room) { /** @@ -108,7 +108,7 @@ function initJWTTokenListener(room) { roomName, APP.conference._getConferenceOptions()); // Authenticate from the new connection to get - // the session-ID from the focus, which wil then be used + // the session-ID from the focus, which will then be used // to upgrade current connection's user role newRoom.room.moderator.authenticate() @@ -116,7 +116,7 @@ function initJWTTokenListener(room) { connection.disconnect(); // At this point we'll have session-ID stored in - // the settings. It wil be used in the call below + // the settings. It will be used in the call below // to upgrade user's role room.room.moderator.authenticate() .then(() => { diff --git a/modules/UI/shared_video/SharedVideo.js b/modules/UI/shared_video/SharedVideo.js index 38524643f9..349999daa4 100644 --- a/modules/UI/shared_video/SharedVideo.js +++ b/modules/UI/shared_video/SharedVideo.js @@ -498,7 +498,7 @@ export default class SharedVideoManager { * Receives events for local audio mute/unmute by local user. * @param muted boolena whether it is muted or not. * @param {boolean} indicates if this mute was a result of user interaction, - * i.e. pressing the mute button or it was programatically triggerred + * i.e. pressing the mute button or it was programmatically triggered */ onLocalAudioMuted(muted, userInteraction) { if (!this.player) { diff --git a/modules/UI/util/UIUtil.js b/modules/UI/util/UIUtil.js index d70bbe9836..c2a9488836 100644 --- a/modules/UI/util/UIUtil.js +++ b/modules/UI/util/UIUtil.js @@ -37,7 +37,7 @@ const UIUtil = { * @param {string} url - The redirect URL. * NOTE: Currently used to redirect to 3rd party location for * authentication. In most cases redirectWithStoredParams action must be - * used instead of this method in order to preserve curent URL params. + * used instead of this method in order to preserve current URL params. */ redirect(url) { window.location.href = url; diff --git a/modules/UI/videolayout/SmallVideo.js b/modules/UI/videolayout/SmallVideo.js index 6a1a112536..f495305b6b 100644 --- a/modules/UI/videolayout/SmallVideo.js +++ b/modules/UI/videolayout/SmallVideo.js @@ -350,7 +350,7 @@ export default class SmallVideo { } /** - * Initalizes any browser specific properties. Currently sets the overflow + * Initializes any browser specific properties. Currently sets the overflow * property for Qt browsers on Windows to hidden, thus fixing the following * problem: * Some browsers don't have full support of the object-fit property for the @@ -428,9 +428,9 @@ export default class SmallVideo { _shouldTriggerPin(event) { // TODO Checking the classes is a workround to allow events to bubble into // the DisplayName component if it was clicked. React's synthetic events - // will fire after jQuery handlers execute, so stop propogation at this + // will fire after jQuery handlers execute, so stop propagation at this // point will prevent DisplayName from getting click events. This workaround - // should be removeable once LocalVideo is a React Component because then + // should be removable once LocalVideo is a React Component because then // the components share the same eventing system. const $source = $(event.target || event.srcElement); diff --git a/modules/UI/videolayout/VideoContainer.js b/modules/UI/videolayout/VideoContainer.js index b6efac9bd6..da5b6ddbc4 100644 --- a/modules/UI/videolayout/VideoContainer.js +++ b/modules/UI/videolayout/VideoContainer.js @@ -46,7 +46,7 @@ function computeDesktopVideoSize( // eslint-disable-line max-params videoSpaceWidth, videoSpaceHeight) { if (videoWidth === 0 || videoHeight === 0 || videoSpaceWidth === 0 || videoSpaceHeight === 0) { - // Avoid NaN values caused by devision by 0. + // Avoid NaN values caused by division by 0. return [ 0, 0 ]; } @@ -94,7 +94,7 @@ function computeCameraVideoSize( // eslint-disable-line max-params videoSpaceHeight, videoLayoutFit) { if (videoWidth === 0 || videoHeight === 0 || videoSpaceWidth === 0 || videoSpaceHeight === 0) { - // Avoid NaN values caused by devision by 0. + // Avoid NaN values caused by division by 0. return [ 0, 0 ]; } @@ -411,7 +411,7 @@ export class VideoContainer extends LargeContainer { const [ width, height ] = this._getVideoSize(containerWidth, containerHeight); if (width === 0 || height === 0) { - // We don't need to set 0 for width or height since the visibility is controled by the visibility css prop + // We don't need to set 0 for width or height since the visibility is controlled by the visibility css prop // on the largeVideoElementsContainer. Also if the width/height of the video element is 0 the attached // stream won't be played. Normally if we attach a new stream we won't resize the video element until the // stream has been played. But setting width/height to 0 will prevent the video from playing. diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js index c5605759f8..d935602b9c 100644 --- a/modules/UI/videolayout/VideoLayout.js +++ b/modules/UI/videolayout/VideoLayout.js @@ -596,7 +596,7 @@ const VideoLayout = { localVideoThumbnail && localVideoThumbnail.updateDOMLocation(); VideoLayout.resizeVideoArea(); - // Rerender the thumbnails since they are dependant on the layout because of the tooltip positioning. + // Rerender the thumbnails since they are dependent on the layout because of the tooltip positioning. localVideoThumbnail && localVideoThumbnail.rerender(); Object.values(remoteVideos).forEach(remoteVideoThumbnail => remoteVideoThumbnail.rerender()); },