diff --git a/Frameworks/Cocoa Extensions b/Frameworks/Cocoa Extensions index 82f634a30..bdb76ffc3 160000 --- a/Frameworks/Cocoa Extensions +++ b/Frameworks/Cocoa Extensions @@ -1 +1 @@ -Subproject commit 82f634a30cab3d4e693761734799a52958335052 +Subproject commit bdb76ffc3e32fe6b7454e66cd82d3500530342c9 diff --git a/Frameworks/Encryption Kit b/Frameworks/Encryption Kit index 6b90c3727..7ef4b2626 160000 --- a/Frameworks/Encryption Kit +++ b/Frameworks/Encryption Kit @@ -1 +1 @@ -Subproject commit 6b90c372749a5de88119525bd17fcbc2bdbae4b2 +Subproject commit 7ef4b262653411883c9a179b709e71d86ec13e87 diff --git a/Sources/App/Classes/Controllers/TXMasterController.m b/Sources/App/Classes/Controllers/TXMasterController.m index 1a5fb3057..b48535f53 100644 --- a/Sources/App/Classes/Controllers/TXMasterController.m +++ b/Sources/App/Classes/Controllers/TXMasterController.m @@ -123,12 +123,12 @@ NS_ASSUME_NONNULL_BEGIN } #if defined(DEBUG) - self.ghostModeIsOn = YES; // Do not use autoconnect during debug + self.ghostModeIsOn = YES; // Do not use auto connect during debug #else if ((keyboardKeys & NSEventModifierFlagShift) == NSEventModifierFlagShift) { self.ghostModeIsOn = YES; - LogToConsoleInfo("Launching without autoconnecting to the configured servers"); + LogToConsoleInfo("Launching without auto connecting to the configured servers"); } #endif } diff --git a/Sources/App/Classes/Controllers/TXMenuController.m b/Sources/App/Classes/Controllers/TXMenuController.m index fb3228e10..babc981b6 100755 --- a/Sources/App/Classes/Controllers/TXMenuController.m +++ b/Sources/App/Classes/Controllers/TXMenuController.m @@ -652,7 +652,7 @@ NS_ASSUME_NONNULL_BEGIN return [TPCPreferences logToDiskIsEnabled]; } - case MTMMWindowToggleVisibilityOfServerList: // "Toggle Visiblity of Server List" + case MTMMWindowToggleVisibilityOfServerList: // "Toggle Visibility of Server List" case MTMMWindowSortChannelList: // "Sort Channel List" case MTMMWindowCenterWindow: // "Center Window" case MTMMWindowResetWindowToDefaultSize: // "Reset Window to Default Size" @@ -678,7 +678,7 @@ NS_ASSUME_NONNULL_BEGIN return (isMainWindowDisabled == NO); } - case MTMMWindowToggleVisibilityOfMemberList: // "Toggle Visiblity of Member List" + case MTMMWindowToggleVisibilityOfMemberList: // "Toggle Visibility of Member List" { BOOL isMainWindowMain = mainWindow().mainWindow; @@ -2593,7 +2593,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *modeSymbol = nil; - if ([sender tag] == MTMMChannelModesMenuRemvoeModerated) { + if ([sender tag] == MTMMChannelModesMenuRemoveModerated) { modeSymbol = @"-m"; } else { modeSymbol = @"+m"; @@ -3616,7 +3616,7 @@ NS_ASSUME_NONNULL_BEGIN [windowController() addWindowToWindowList:sheet]; } -- (void)nicknameColorSheetOnOk:(TDCNicknameColorSheet *)sneder +- (void)nicknameColorSheetOnOk:(TDCNicknameColorSheet *)sender { [mainWindow() reloadTheme]; } diff --git a/Sources/App/Classes/Dialogs/File Transfers/TDCFileTransferDialog.m b/Sources/App/Classes/Dialogs/File Transfers/TDCFileTransferDialog.m index f461efad4..90dc8c2da 100755 --- a/Sources/App/Classes/Dialogs/File Transfers/TDCFileTransferDialog.m +++ b/Sources/App/Classes/Dialogs/File Transfers/TDCFileTransferDialog.m @@ -215,7 +215,7 @@ NS_ASSUME_NONNULL_BEGIN NSParameterAssert(hostAddress != nil); NSParameterAssert(filename != nil); - /* A hard limit exists to prevent a bad person continously sending file transfers + /* A hard limit exists to prevent a bad person continuously sending file transfers which appear in the file transfer, exhausting resources. */ if ([self receiverCount] > _addReceiverHardLimit) { LogToConsoleError("Max receiver count of %i exceeded.", _addReceiverHardLimit); diff --git a/Sources/App/Classes/Dialogs/Preferences/TDCPreferencesController.m b/Sources/App/Classes/Dialogs/Preferences/TDCPreferencesController.m index 0bfcba3d0..42d56e310 100644 --- a/Sources/App/Classes/Dialogs/Preferences/TDCPreferencesController.m +++ b/Sources/App/Classes/Dialogs/Preferences/TDCPreferencesController.m @@ -1116,10 +1116,10 @@ NS_ASSUME_NONNULL_BEGIN TPCThemeStorageLocation currentStorageLocation = themeController().storageLocation; - [themeController() enumerateAvailableThemesWithBlock:^(NSString *themeName, TPCThemeStorageLocation storageLocation, BOOL multipleVaraints, BOOL *stop) { + [themeController() enumerateAvailableThemesWithBlock:^(NSString *themeName, TPCThemeStorageLocation storageLocation, BOOL multipleVariants, BOOL *stop) { NSString *displayName = themeName; - if (multipleVaraints) { + if (multipleVariants) { displayName = [NSString stringWithFormat:@"%@ (%@)", themeName, [TPCThemeController descriptionForStorageLocation:storageLocation]]; } diff --git a/Sources/App/Classes/Dialogs/TDCCommunityMovedDialog.m b/Sources/App/Classes/Dialogs/TDCCommunityMovedDialog.m index b60093a23..c65182dd6 100755 --- a/Sources/App/Classes/Dialogs/TDCCommunityMovedDialog.m +++ b/Sources/App/Classes/Dialogs/TDCCommunityMovedDialog.m @@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN -NSString * const TDCCommunityMovedDialogApppearedDefaultsKey = @"TDCCommunityMovedDialogApppeared"; +NSString * const TDCCommunityMovedDialogAppearedDefaultsKey = @"TDCCommunityMovedDialogAppeared"; @implementation TDCCommunityMovedDialog @@ -62,7 +62,7 @@ NSString * const TDCCommunityMovedDialogApppearedDefaultsKey = @"TDCCommunityMov - (void)windowWillClose:(NSNotification *)note { - [RZUserDefaults() setBool:YES forKey:TDCCommunityMovedDialogApppearedDefaultsKey]; + [RZUserDefaults() setBool:YES forKey:TDCCommunityMovedDialogAppearedDefaultsKey]; if ([self.delegate respondsToSelector:@selector(communityMovedDialogWillClose:)]) { [self.delegate communityMovedDialogWillClose:self]; diff --git a/Sources/App/Classes/Dialogs/TDCServerChannelListDialog.m b/Sources/App/Classes/Dialogs/TDCServerChannelListDialog.m index 792547838..fd1c90a67 100755 --- a/Sources/App/Classes/Dialogs/TDCServerChannelListDialog.m +++ b/Sources/App/Classes/Dialogs/TDCServerChannelListDialog.m @@ -40,7 +40,7 @@ #import "NSObjectHelperPrivate.h" #import "NSStringHelper.h" #import "TXGlobalModels.h" -#import "NSTableVIewHelperPrivate.h" +#import "NSTableViewHelperPrivate.h" #import "TLOLocalization.h" #import "IRCClient.h" #import "TVCBasicTableView.h" diff --git a/Sources/App/Classes/Dialogs/TDCServerPropertiesSheet.m b/Sources/App/Classes/Dialogs/TDCServerPropertiesSheet.m index 9e45f5eba..537363655 100755 --- a/Sources/App/Classes/Dialogs/TDCServerPropertiesSheet.m +++ b/Sources/App/Classes/Dialogs/TDCServerPropertiesSheet.m @@ -108,7 +108,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, weak) IBOutlet NSButton *clientCertificateSHA512FingerprintCopyButton; @property (nonatomic, weak) IBOutlet NSButton *connectionIPv4AddressTypeCheck; @property (nonatomic, weak) IBOutlet NSButton *connectionIPv6AddressTypeCheck; -@property (nonatomic, weak) IBOutlet NSButton *connectionDefaultddressTypeCheck; +@property (nonatomic, weak) IBOutlet NSButton *connectionDefaultAddressTypeCheck; @property (nonatomic, weak) IBOutlet NSButton *deleteAddressBookEntryButton; @property (nonatomic, weak) IBOutlet NSButton *deleteChannelButton; @property (nonatomic, weak) IBOutlet NSButton *deleteHighlightButton; @@ -728,7 +728,7 @@ NS_ASSUME_NONNULL_BEGIN return NO; } - /* We want to show the error for the visible viw first so that + /* We want to show the error for the visible view first so that the user isn't jerked around. To accomplish this, we keep an array of views in which error occurs. Check error in visible view, remove that from array, then enumerate the rest. */ @@ -923,7 +923,7 @@ NS_ASSUME_NONNULL_BEGIN self.connectionIPv4AddressTypeCheck.state = (addressType == IRCConnectionAddressTypeIPv4); self.connectionIPv6AddressTypeCheck.state = (addressType == IRCConnectionAddressTypeIPv6); - self.connectionDefaultddressTypeCheck.state = (addressType == IRCConnectionAddressTypeDefault); + self.connectionDefaultAddressTypeCheck.state = (addressType == IRCConnectionAddressTypeDefault); self.pongTimerCheck.state = self.config.performPongTimer; self.performDisconnectOnPongTimerCheck.state = self.config.performDisconnectOnPongTimer; @@ -1505,7 +1505,7 @@ NS_ASSUME_NONNULL_BEGIN { TEXTUAL_IGNORE_DEPRECATION_BEGIN /* Changing the property triggers a deprecation log to console - which is just unncessary output when each time we change it. */ + which is just unnecessary output when each time we change it. */ if (self.config.connectionPrefersIPv4) { self.config.connectionPrefersIPv4 = NO; } diff --git a/Sources/App/Classes/Headers/IRCAddressBook.h b/Sources/App/Classes/Headers/IRCAddressBook.h index 52465d233..82e5b09ab 100755 --- a/Sources/App/Classes/Headers/IRCAddressBook.h +++ b/Sources/App/Classes/Headers/IRCAddressBook.h @@ -50,8 +50,8 @@ typedef NS_ENUM(NSUInteger, IRCAddressBookUserTrackingStatus) { IRCAddressBookUserTrackingStatusUnknown = 0, IRCAddressBookUserTrackingStatusSignedOff, IRCAddressBookUserTrackingStatusSignedOn, - IRCAddressBookUserTrackingStatusAvailalbe, - IRCAddressBookUserTrackingStatusNotAvailalbe, + IRCAddressBookUserTrackingStatusAvailable, + IRCAddressBookUserTrackingStatusNotAvailable, IRCAddressBookUserTrackingStatusAway, IRCAddressBookUserTrackingStatusNotAway }; diff --git a/Sources/App/Classes/Headers/IRCChannelConfig.h b/Sources/App/Classes/Headers/IRCChannelConfig.h index 3064597e9..08e9cdfb8 100755 --- a/Sources/App/Classes/Headers/IRCChannelConfig.h +++ b/Sources/App/Classes/Headers/IRCChannelConfig.h @@ -91,7 +91,7 @@ typedef NS_ENUM(NSUInteger, IRCChannelType) { /* Deprecated */ - (NSControlStateValue)growlEnabledForEvent:(TXNotificationType)event TEXTUAL_DEPRECATED("Use -notificationEnabledForEvent: instead. This method will always return NSControlStateValueOff."); -@property (readonly) BOOL ignoreInlineMedia TEXTUAL_DEPRECATED("Use -inlineMediaEnabled and -inlineMediaDdisabled instead. This property will always return NO."); +@property (readonly) BOOL ignoreInlineMedia TEXTUAL_DEPRECATED("Use -inlineMediaEnabled and -inlineMediaDisabled instead. This property will always return NO."); @end #pragma mark - @@ -125,7 +125,7 @@ typedef NS_ENUM(NSUInteger, IRCChannelType) { /* Deprecated */ - (void)setGrowlEnabled:(NSControlStateValue)value forEvent:(TXNotificationType)event TEXTUAL_DEPRECATED("Use -setNotificationEnabled:forEvent: instead"); -@property (nonatomic, assign, readwrite) BOOL ignoreInlineMedia TEXTUAL_DEPRECATED("Use -inlineMediaEnabled and -inlineMediaDdisabled instead"); +@property (nonatomic, assign, readwrite) BOOL ignoreInlineMedia TEXTUAL_DEPRECATED("Use -inlineMediaEnabled and -inlineMediaDisabled instead"); @end NS_ASSUME_NONNULL_END diff --git a/Sources/App/Classes/Headers/IRCClient.h b/Sources/App/Classes/Headers/IRCClient.h index 4df3840f2..61cfe7c99 100755 --- a/Sources/App/Classes/Headers/IRCClient.h +++ b/Sources/App/Classes/Headers/IRCClient.h @@ -71,7 +71,7 @@ typedef NS_OPTIONS(NSUInteger, ClientIRCv3SupportedCapability) { ClientIRCv3SupportedCapabilityIsIdentifiedWithSASL = 1 << 5, // YES if SASL authentication was successful ClientIRCv3SupportedCapabilityIsInSASLNegotiation = 1 << 6, // YES if in SASL CAP authentication request ClientIRCv3SupportedCapabilityMonitorCommand = 1 << 7, // YES if the MONITOR command is supported - ClientIRCv3SupportedCapabilityMultiPreifx = 1 << 8, // YES if multi-prefix CAP supported + ClientIRCv3SupportedCapabilityMultiPrefix = 1 << 8, // YES if multi-prefix CAP supported ClientIRCv3SupportedCapabilityPlayback = 1 << 9, // Special CAP which is subject to change ClientIRCv3SupportedCapabilityServerTime = 1 << 10, // YES if server-time CAP supported ClientIRCv3SupportedCapabilityUserhostInNames = 1 << 11, // YES if userhost-in-names CAP supported @@ -109,7 +109,7 @@ TEXTUAL_EXTERN NSNotificationName const IRCClientUserNicknameChangedNotification @property (readonly) BOOL isQuitting; // YES if socket is disconnecting @property (readonly) BOOL isReconnecting; // YES if reconnect is pending @property (readonly) BOOL isSecured; // YES if socket is connected using SSL/TLS -@property (readonly) BOOL userIsAway; // YES if local uesr is away +@property (readonly) BOOL userIsAway; // YES if local user is away @property (readonly) BOOL userIsIRCop; // YES if local user is IRCop @property (readonly) BOOL userIsIdentifiedWithNickServ; // YES if NickServ identification was successful @property (readonly) BOOL isWaitingForNickServ; // YES if NickServ identification is pending diff --git a/Sources/App/Classes/Headers/IRCMessage.h b/Sources/App/Classes/Headers/IRCMessage.h index e7f32a0a2..1ad80a33c 100755 --- a/Sources/App/Classes/Headers/IRCMessage.h +++ b/Sources/App/Classes/Headers/IRCMessage.h @@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN @property (readonly, copy) NSArray *params; @property (readonly, copy) NSDate *receivedAt; @property (readonly) BOOL isHistoric; // Whether a custom @time= was supplied during parsing. -@property (readonly) BOOL isEventOnlyMessage; /* The message should be parsed and special actions performed such as adding/removing user but the result is never passsed to print: */ +@property (readonly) BOOL isEventOnlyMessage; /* The message should be parsed and special actions performed such as adding/removing user but the result is never passed to print: */ @property (readonly) BOOL isPrintOnlyMessage; /* The message should be parsed and passed to print: but special actions such as adding/removing user from member list should be ignored. (currently unused) */ @property (readonly, copy, nullable) NSString *batchToken; @property (readonly, copy, nullable) NSDictionary *messageTags; /* IRCv3 message tags. See ircv3.net for more information regarding extensions in the IRC protocol. */ diff --git a/Sources/App/Classes/Headers/NSStringHelper.h b/Sources/App/Classes/Headers/NSStringHelper.h index 236934db9..02347308c 100755 --- a/Sources/App/Classes/Headers/NSStringHelper.h +++ b/Sources/App/Classes/Headers/NSStringHelper.h @@ -82,7 +82,7 @@ TEXTUAL_EXTERN NSStringEncoding const TXDefaultFallbackStringEncoding; @property (getter=isHostmaskAddress, readonly) BOOL hostmaskAddress; @property (getter=isHostmaskUsername, readonly) BOOL hostmaskUsername; -/* By handing a client to -isHostmask[*]On:, greater validility +/* By handing a client to -isHostmask[*]On:, greater validity is promised as configuration options from ISUPPORT (005) and other contextual information can be accessed. */ - (BOOL)isHostmaskNicknameOn:(nullable IRCClient *)client; diff --git a/Sources/App/Classes/Headers/NSViewHelper.h b/Sources/App/Classes/Headers/NSViewHelper.h index 84dec0954..8b197b804 100644 --- a/Sources/App/Classes/Headers/NSViewHelper.h +++ b/Sources/App/Classes/Headers/NSViewHelper.h @@ -53,14 +53,14 @@ NS_ASSUME_NONNULL_BEGIN /* Superview width and height will = self with 0.0 constant. */ /* A priority of 550 is used to encourage hugging. */ -- (void)addConstraintsToSueprviewToEqualDimensions; +- (void)addConstraintsToSuperviewToEqualDimensions; /* Remove first subview (if one is present) and replaces it with subview. */ /* The new superview width and height will equal that of subview with a priority of 550. The subview top, right, bottom, and left will equal that of the superview with 0.0 constant. */ /* See -addConstraintsToSuperviewToHugEdges - -addConstraintsToSueprviewToEqualDimensions */ + -addConstraintsToSuperviewToEqualDimensions */ - (void)replaceFirstSubview:(NSView *)withView; @end diff --git a/Sources/App/Classes/Headers/Private/IRCClientRequestedCommandsPrivate.h b/Sources/App/Classes/Headers/Private/IRCClientRequestedCommandsPrivate.h index c2f6d0557..1a4d362f4 100644 --- a/Sources/App/Classes/Headers/Private/IRCClientRequestedCommandsPrivate.h +++ b/Sources/App/Classes/Headers/Private/IRCClientRequestedCommandsPrivate.h @@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN on who sent the command. IRCClientRequestedCommands is used by IRCClient internally to keep track of what commands have been requested so that it can determine how to treat the response. */ -/* IRCClientRequestedCommands works in conjuction with IRCClient +/* IRCClientRequestedCommands works in conjunction with IRCClient by balancing all calls to a command. */ @interface IRCClientRequestedCommands : NSObject diff --git a/Sources/App/Classes/Headers/Private/IRCTimerCommandPrivate.h b/Sources/App/Classes/Headers/Private/IRCTimerCommandPrivate.h index 8f97b1613..c3b285c56 100755 --- a/Sources/App/Classes/Headers/Private/IRCTimerCommandPrivate.h +++ b/Sources/App/Classes/Headers/Private/IRCTimerCommandPrivate.h @@ -68,7 +68,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)stop; /* If the timer has been started before, then - we already know the vlues to pass to -start: + we already know the values to pass to -start: In that case, we return YES. If we don't know this information yet, then we return NO. */ diff --git a/Sources/App/Classes/Headers/Private/TDCCommunityMovedDialogPrivate.h b/Sources/App/Classes/Headers/Private/TDCCommunityMovedDialogPrivate.h index feeb009f6..8c28de7e7 100755 --- a/Sources/App/Classes/Headers/Private/TDCCommunityMovedDialogPrivate.h +++ b/Sources/App/Classes/Headers/Private/TDCCommunityMovedDialogPrivate.h @@ -39,7 +39,7 @@ NS_ASSUME_NONNULL_BEGIN -TEXTUAL_EXTERN NSString * const TDCCommunityMovedDialogApppearedDefaultsKey; +TEXTUAL_EXTERN NSString * const TDCCommunityMovedDialogAppearedDefaultsKey; @protocol TDCCommunityMovedDialogDelegate; diff --git a/Sources/App/Classes/Headers/Private/TDCNicknameColorSheetPrivate.h b/Sources/App/Classes/Headers/Private/TDCNicknameColorSheetPrivate.h index 9918fad73..814e26482 100644 --- a/Sources/App/Classes/Headers/Private/TDCNicknameColorSheetPrivate.h +++ b/Sources/App/Classes/Headers/Private/TDCNicknameColorSheetPrivate.h @@ -48,7 +48,7 @@ NS_ASSUME_NONNULL_BEGIN @protocol TDCNicknameColorSheetDelegate @required -- (void)nicknameColorSheetOnOk:(TDCNicknameColorSheet *)sneder; +- (void)nicknameColorSheetOnOk:(TDCNicknameColorSheet *)sender; - (void)nicknameColorSheetWillClose:(TDCNicknameColorSheet *)sender; @end diff --git a/Sources/App/Classes/Headers/Private/THOPluginProtocolPrivate.h b/Sources/App/Classes/Headers/Private/THOPluginProtocolPrivate.h index b60f8a0bc..e7a4d10b5 100644 --- a/Sources/App/Classes/Headers/Private/THOPluginProtocolPrivate.h +++ b/Sources/App/Classes/Headers/Private/THOPluginProtocolPrivate.h @@ -63,6 +63,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy, readwrite) NSString *senderHostmask; @property (nonatomic, copy, readwrite) NSDate *receivedAt; @property (nonatomic, copy, readwrite) NSString *messageSequence; +@property (nonatomic, copy, readwrite) NSArray *messageParameters; @property (nonatomic, copy, readwrite) NSArray *messageParamaters; @property (nonatomic, copy, readwrite) NSString *messageCommand; @property (nonatomic, assign, readwrite) NSUInteger messageCommandNumeric; diff --git a/Sources/App/Classes/Headers/Private/TLOLicenseManagerDownloaderPrivate.h b/Sources/App/Classes/Headers/Private/TLOLicenseManagerDownloaderPrivate.h index a0a523803..dc5c948b5 100644 --- a/Sources/App/Classes/Headers/Private/TLOLicenseManagerDownloaderPrivate.h +++ b/Sources/App/Classes/Headers/Private/TLOLicenseManagerDownloaderPrivate.h @@ -35,7 +35,6 @@ * *********************************************************************** */ - NS_ASSUME_NONNULL_BEGIN typedef NS_ENUM(NSUInteger, TLOLicenseManagerDownloaderRequestType) { diff --git a/Sources/App/Classes/Headers/Private/TPCThemeControllerPrivate.h b/Sources/App/Classes/Headers/Private/TPCThemeControllerPrivate.h index 9063e912c..6aa4d60ff 100644 --- a/Sources/App/Classes/Headers/Private/TPCThemeControllerPrivate.h +++ b/Sources/App/Classes/Headers/Private/TPCThemeControllerPrivate.h @@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN @interface TPCThemeController () /* -load is called when app first launches to do first - load with some extra saftey checks. Use -reload if you + load with some extra safety checks. Use -reload if you want to reload the theme. */ - (void)load; - (void)reload; diff --git a/Sources/App/Classes/Headers/Private/TVCServerListAppearancePrivate.h b/Sources/App/Classes/Headers/Private/TVCServerListAppearancePrivate.h index 2da37a037..f59d67b08 100755 --- a/Sources/App/Classes/Headers/Private/TVCServerListAppearancePrivate.h +++ b/Sources/App/Classes/Headers/Private/TVCServerListAppearancePrivate.h @@ -43,9 +43,6 @@ NS_ASSUME_NONNULL_BEGIN @interface TVCServerListAppearance () - (nullable instancetype)initWithServerList:(TVCServerList *)serverList inWindow:(TVCMainWindow *)mainWindow; - -- (void)setOutlineViewDefaultDisclosureTriangle:(NSImage *)image; -- (void)setOutlineViewAlternateDisclosureTriangle:(NSImage *)image; @end NS_ASSUME_NONNULL_END diff --git a/Sources/App/Classes/Headers/Private/TXSharedApplicationPrivate.h b/Sources/App/Classes/Headers/Private/TXSharedApplicationPrivate.h index fbbdd52e3..d93d5a984 100644 --- a/Sources/App/Classes/Headers/Private/TXSharedApplicationPrivate.h +++ b/Sources/App/Classes/Headers/Private/TXSharedApplicationPrivate.h @@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN #define windowController() [TXSharedApplication sharedWindowController] -#define sharedNotificationController() [TXSharedApplication sharedNotificationController] +#define sharedNotificationController() [TXSharedApplication sharedNotificationController] #define sharedPluginManager() [TXSharedApplication sharedPluginManager] #define sharedCloudManager() [TXSharedApplication sharedCloudSyncManager] diff --git a/Sources/App/Classes/Headers/THOPluginProtocol.h b/Sources/App/Classes/Headers/THOPluginProtocol.h index 436e4df47..7bdae6705 100755 --- a/Sources/App/Classes/Headers/THOPluginProtocol.h +++ b/Sources/App/Classes/Headers/THOPluginProtocol.h @@ -469,7 +469,8 @@ extern NSString * const THOPluginProtocolCompatibilityMinimumVersion; /** * @brief The input, split up into sections */ -@property (readonly, copy) NSArray *messageParamaters; +@property (readonly, copy) NSArray *messageParameters; +@property (readonly, copy) NSArray *messageParamaters TEXTUAL_DEPRECATED("Use -messageParameters instead"); /** * @brief The input's command @@ -485,7 +486,7 @@ extern NSString * const THOPluginProtocolCompatibilityMinimumVersion; * @brief The server address of the IRC network * * @discussion The value of this attribute is the address of the server that - * Textual is currently connected to and may differ from senderNickanme even + * Textual is currently connected to and may differ from senderNickname even * if senderIsServer is `YES` */ @property (readonly, copy, nullable) NSString *networkAddress; diff --git a/Sources/App/Classes/Headers/TPCTheme.h b/Sources/App/Classes/Headers/TPCTheme.h index fa64c13f1..0be0b091a 100755 --- a/Sources/App/Classes/Headers/TPCTheme.h +++ b/Sources/App/Classes/Headers/TPCTheme.h @@ -63,7 +63,7 @@ typedef NS_ENUM(NSUInteger, TPCThemeSettingsNicknameColorStyle) { TPCThemeSettingsNicknameColorStyleLight }; -/* If a theme is modified in such a way after it is initalized +/* If a theme is modified in such a way after it is initialized that it can no longer be used, then this notification is posted. A way, amongst many, in which the integrity of a theme can be compromised is by deleting the CSS or JavaScript file. */ diff --git a/Sources/App/Classes/Headers/TPCThemeController.h b/Sources/App/Classes/Headers/TPCThemeController.h index 9da9730f9..cd758063a 100755 --- a/Sources/App/Classes/Headers/TPCThemeController.h +++ b/Sources/App/Classes/Headers/TPCThemeController.h @@ -74,7 +74,7 @@ TEXTUAL_EXTERN NSNotificationName const TPCThemeControllerThemeListDidChangeNoti @property (getter=isBundledTheme, readonly) BOOL bundledTheme; /* Calls for all themes */ -- (void)enumerateAvailableThemesWithBlock:(void(NS_NOESCAPE ^)(NSString *fileName, TPCThemeStorageLocation storageLocation, BOOL multipleVaraints, BOOL *stop))enumerationBlock; +- (void)enumerateAvailableThemesWithBlock:(void(NS_NOESCAPE ^)(NSString *fileName, TPCThemeStorageLocation storageLocation, BOOL multipleVariants, BOOL *stop))enumerationBlock; - (BOOL)themeExists:(NSString *)themeName; diff --git a/Sources/App/Classes/Headers/TVCAppearance.h b/Sources/App/Classes/Headers/TVCAppearance.h index f1547e1ce..aa5060400 100644 --- a/Sources/App/Classes/Headers/TVCAppearance.h +++ b/Sources/App/Classes/Headers/TVCAppearance.h @@ -104,7 +104,7 @@ NS_ASSUME_NONNULL_BEGIN - (nullable NSImage *)imageInGroup:(NSDictionary *)group withKey:(NSString *)key forActiveWindow:(BOOL)forActiveWindow; @end -/* TVCApplicationAppearance keeps a copy of TXAppearance proeprties. +/* TVCApplicationAppearance keeps a copy of TXAppearance properties. The properties it keeps are those that were set when the object was created. To update to the latest properties, create a new instance of the object. */ @interface TVCApplicationAppearance : TVCAppearance diff --git a/Sources/App/Classes/Headers/TVCValidatedComboBox.h b/Sources/App/Classes/Headers/TVCValidatedComboBox.h index 63bf1514b..5ea85efe8 100644 --- a/Sources/App/Classes/Headers/TVCValidatedComboBox.h +++ b/Sources/App/Classes/Headers/TVCValidatedComboBox.h @@ -42,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN @interface TVCValidatedComboBox : NSComboBox @property (nonatomic, copy, nullable) TVCValidatedTextFieldValidationBlock validationBlock; @property (nonatomic, assign) BOOL stringValueUsesOnlyFirstToken; // Only use everything before first space (" ") as value. -@property (nonatomic, assign) BOOL stringValueIsTrimmed; // -stringValueUsesOnlyFirstToken returns a trimmed value of newlines and spaces. However, if you want mroe than first token, then specify this. +@property (nonatomic, assign) BOOL stringValueIsTrimmed; // -stringValueUsesOnlyFirstToken returns a trimmed value of newlines and spaces. However, if you want more than first token, then specify this. @property (nonatomic, assign) BOOL stringValueIsInvalidOnEmpty; // Is an empty string considered invalid? @property (nonatomic, assign) BOOL performValidationWhenEmpty; @property (nonatomic, weak) id textDidChangeCallback; // Calls method "-(void)validatedTextFieldTextDidChange:(id)sender" whereas "sender" is the text field. diff --git a/Sources/App/Classes/Headers/TXMenuController.h b/Sources/App/Classes/Headers/TXMenuController.h index b834740bf..ad82c77de 100755 --- a/Sources/App/Classes/Headers/TXMenuController.h +++ b/Sources/App/Classes/Headers/TXMenuController.h @@ -139,7 +139,7 @@ enum MTMMChannelModifyTopic = 608, // "Modify Topic" MTMMChannelModesMenu = 609, // "Modes" MTMMChannelModesMenuAddModerated = 6090000, // "Moderated (+m)" - MTMMChannelModesMenuRemvoeModerated = 6090001, // "Unmoderated (-m)" + MTMMChannelModesMenuRemoveModerated = 6090001, // "Unmoderated (-m)" MTMMChannelModesMenuAddInviteOnly = 6090002, // "Invite Only (+i)" MTMMChannelModesMenuRemoveInviteOnly = 6090003, // "Anyone Can Join (-i)" MTMMChannelModesMenuManageAllModes = 6090004, // "Manage All Modes" @@ -194,8 +194,8 @@ enum MTMMWindowMinimize = 800, // "Minimize" MTMMWindowZoom = 801, // "Zoom" MTMMWindowZoomSeparator = 802, // "-" - MTMMWindowToggleVisibilityOfMemberList = 803, // "Toggle Visiblity of Member List" - MTMMWindowToggleVisibilityOfServerList = 804, // "Toggle Visiblity of Server List" + MTMMWindowToggleVisibilityOfMemberList = 803, // "Toggle Visibility of Member List" + MTMMWindowToggleVisibilityOfServerList = 804, // "Toggle Visibility of Server List" MTMMWindowToggleWindowAppearance = 805, // "Toggle Window Appearance" MTMMWindowToggleWindowAppearanceSeparator = 806, // "-" MTMMWindowSortChannelList = 807, // "Sort Channel List" @@ -236,9 +236,9 @@ enum MTMMHelpKBMenuConnectingToBouncerSeparator = 9050014, // "-" MTMMHelpKBMenuDCCFileTransferInformation = 9050015, // "DCC File Transfer Information" MTMMHelpKnowledgeBaseMenuSeparator = 906, // "-" - MTMMHelpConnecToHelpChannel = 907, // "Connect to Help Channel" - MTMMHelpConnecToTestingChannel = 908, // "Connect to Testing Channel" - MTMMHelpConnecToTestingChannelSeparator = 909, // "-" + MTMMHelpConnectToHelpChannel = 907, // "Connect to Help Channel" + MTMMHelpConnectToTestingChannel = 908, // "Connect to Testing Channel" + MTMMHelpConnectToTestingChannelSeparator = 909, // "-" MTMMHelpAdvancedMenu = 910, // "Advanced" MTMMHelpAdvancedMenuEnableDeveloperMode = 9100000, // "Enable Developer Mode" MTMMHelpAdvancedMenuEnableDeveloperModeSeparator = 9100001, // "-" diff --git a/Sources/App/Classes/Headers/Textual.h b/Sources/App/Classes/Headers/Textual.h index 93e544806..2e236bde6 100755 --- a/Sources/App/Classes/Headers/Textual.h +++ b/Sources/App/Classes/Headers/Textual.h @@ -39,7 +39,7 @@ /* Cocoa Extensions imports Cocoa for us */ #import - /* Static Defeinitions */ + /* Static Definitions */ #import "StaticDefinitions.h" /* IRC Controllers — Core */ diff --git a/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSStringHelper.m b/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSStringHelper.m index 768300bc5..d49b0a8cc 100755 --- a/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSStringHelper.m +++ b/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSStringHelper.m @@ -428,7 +428,7 @@ NSStringEncoding const TXDefaultFallbackStringEncoding = NSISOLatin1StringEncodi NSString *m_foregroundColor = nil; NSString *m_backgroundColor = nil; - BOOL commanEaten = NO; + BOOL commaEaten = NO; // ========================================== // @@ -462,7 +462,7 @@ NSStringEncoding const TXDefaultFallbackStringEncoding = NSISOLatin1StringEncodi UniChar a = [self characterAtIndex:currentPosition]; if (a == ',') { - commanEaten = YES; + commaEaten = YES; currentPosition++; // Eat comma } else { @@ -487,7 +487,7 @@ NSStringEncoding const TXDefaultFallbackStringEncoding = NSISOLatin1StringEncodi // ========================================== // return_method: - if (m_backgroundColor == nil && commanEaten) { + if (m_backgroundColor == nil && commaEaten) { currentPosition -= 1; } @@ -510,10 +510,10 @@ return_method: NSUInteger currentPosition = rangeStart; - NSUInteger m_foregoundColor = NSNotFound; + NSUInteger m_foregroundColor = NSNotFound; NSUInteger m_backgroundColor = NSNotFound; - BOOL commanEaten = NO; + BOOL commaEaten = NO; // ========================================== // @@ -533,7 +533,7 @@ return_method: goto return_method; } - m_foregoundColor = (a - '0'); + m_foregroundColor = (a - '0'); currentPosition++; // Eat first color number @@ -547,7 +547,7 @@ return_method: UniChar b = [self characterAtIndex:currentPosition]; if (CS_StringIsBase10Numeric(b)) { - m_foregoundColor = (m_foregoundColor * 10 + b - '0'); + m_foregroundColor = (m_foregroundColor * 10 + b - '0'); currentPosition++; // Eat second color number } @@ -562,7 +562,7 @@ return_method: UniChar c = [self characterAtIndex:currentPosition]; if (c == ',') { - commanEaten = YES; + commaEaten = YES; currentPosition++; // Eat comma } else { @@ -601,20 +601,20 @@ return_method: m_backgroundColor = (m_backgroundColor * 10 + e - '0'); - currentPosition++; // Eate second color number + currentPosition++; // Eat second color number // ========================================== // return_method: - if (m_backgroundColor == NSNotFound && commanEaten) { + if (m_backgroundColor == NSNotFound && commaEaten) { currentPosition -= 1; } if ( foregroundColor && - m_foregoundColor != NSNotFound && - m_foregoundColor <= IRCTextFormatterEffectColorHighestDigit) + m_foregroundColor != NSNotFound && + m_foregroundColor <= IRCTextFormatterEffectColorHighestDigit) { - *foregroundColor = @(m_foregoundColor); + *foregroundColor = @(m_foregroundColor); } if ( backgroundColor && @@ -654,9 +654,9 @@ return_method: NSString *substring = [self substringToIndex:maximumLength]; for (NSInteger i = (substring.length - 1); i >= 0; i--) { - UniChar subsringCharacter = [substring characterAtIndex:i]; + UniChar substringCharacter = [substring characterAtIndex:i]; - if (subsringCharacter == padCharacter) { + if (substringCharacter == padCharacter) { continue; } diff --git a/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSViewHelper.m b/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSViewHelper.m index ea3128f7a..b671a3aad 100644 --- a/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSViewHelper.m +++ b/Sources/App/Classes/Helpers/Cocoa (Objective-C)/NSViewHelper.m @@ -148,7 +148,7 @@ NS_ASSUME_NONNULL_BEGIN [superview addConstraints:constraints]; } -- (void)addConstraintsToSueprviewToEqualDimensions +- (void)addConstraintsToSuperviewToEqualDimensions { NSView *superview = self.superview; @@ -182,7 +182,7 @@ NS_ASSUME_NONNULL_BEGIN /* Apply constraints. */ [withSubview addConstraintsToSuperviewToHugEdges]; - [withSubview addConstraintsToSueprviewToEqualDimensions]; + [withSubview addConstraintsToSuperviewToEqualDimensions]; } @end diff --git a/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginDispatcher.m b/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginDispatcher.m index 4cf1c7e61..e2fa528e6 100644 --- a/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginDispatcher.m +++ b/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginDispatcher.m @@ -335,6 +335,7 @@ NSString * const THOPluginProtocolCompatibilityMinimumVersion = @"6.0.0"; messageObject.receivedAt = self.receivedAt; + messageObject.messageParameters = self.params; messageObject.messageParamaters = self.params; messageObject.messageSequence = self.sequence; diff --git a/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginManager.m b/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginManager.m index f7ae6f72b..690299664 100644 --- a/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginManager.m +++ b/Sources/App/Classes/Helpers/Plugin Architecture/THOPluginManager.m @@ -168,7 +168,7 @@ NSString * const THOPluginManagerFinishedLoadingPluginsNotification = @"THOPlugi if (comparisonResult == NSOrderedAscending) { NSLog(@" ---------------------------- ERROR ---------------------------- "); NSLog(@" "); - NSLog(@" Textual has failed to load the bundle at the followig path "); + NSLog(@" Textual has failed to load the bundle at the following path "); NSLog(@" because the specified minimum version is out of range: "); NSLog(@" "); NSLog(@" Bundle Path: %@", bundle.bundlePath); diff --git a/Sources/App/Classes/IRC/IRCAddressBookUserTracking.m b/Sources/App/Classes/IRC/IRCAddressBookUserTracking.m index 07467bec7..38f8adece 100644 --- a/Sources/App/Classes/IRC/IRCAddressBookUserTracking.m +++ b/Sources/App/Classes/IRC/IRCAddressBookUserTracking.m @@ -163,9 +163,9 @@ NSString * const IRCAddressBookUserTrackingRemovedAllTrackedUsersNotification = BOOL ison = self.trackedUsersInt[nickname].boolValue; if (ison) { - return IRCAddressBookUserTrackingStatusAvailalbe; + return IRCAddressBookUserTrackingStatusAvailable; } else { - return IRCAddressBookUserTrackingStatusNotAvailalbe; + return IRCAddressBookUserTrackingStatusNotAvailable; } } } @@ -201,7 +201,7 @@ NSString * const IRCAddressBookUserTrackingRemovedAllTrackedUsersNotification = @synchronized (self.trackedUsersInt) { NSString *trackingNickname = [self.trackedUsersInt keyIgnoringCase:nickname]; - if (newStatus == IRCAddressBookUserTrackingStatusAvailalbe || + if (newStatus == IRCAddressBookUserTrackingStatusAvailable || newStatus == IRCAddressBookUserTrackingStatusSignedOn) { if (trackingNickname == nil) { @@ -210,7 +210,7 @@ NSString * const IRCAddressBookUserTrackingRemovedAllTrackedUsersNotification = self.trackedUsersInt[trackingNickname] = @(YES); } - else if (newStatus == IRCAddressBookUserTrackingStatusNotAvailalbe || + else if (newStatus == IRCAddressBookUserTrackingStatusNotAvailable || newStatus == IRCAddressBookUserTrackingStatusSignedOff) { if (trackingNickname == nil) { diff --git a/Sources/App/Classes/IRC/IRCChannelConfig.m b/Sources/App/Classes/IRC/IRCChannelConfig.m index f74b21649..8f00bfc01 100755 --- a/Sources/App/Classes/IRC/IRCChannelConfig.m +++ b/Sources/App/Classes/IRC/IRCChannelConfig.m @@ -199,7 +199,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END or to show it per-channel. That is stupid idea because if someone has it enabled globally, has it turned off in a channel, turns it off globally, then it is turned on in that channel. We split it - up into two properties and this logic performs migraiton. */ + up into two properties and this logic performs migration. */ { /* Do new keys exist in incoming dictionary/ */ if (dic[@"inlineMediaEnabled"] != nil && @@ -211,18 +211,18 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END NSNumber *ignoreInlineMedia = dic[@"ignoreInlineMedia"]; // old key /* If old value is NO, then we do not have to continue - because the defualt value for the new values is NO. */ + because the default value for the new values is NO. */ if (ignoreInlineMedia == nil || ignoreInlineMedia.boolValue == NO) { return; } - BOOL inlineEnabledGlboally = [TPCPreferences showInlineMedia]; + BOOL inlineEnabledGlobally = [TPCPreferences showInlineMedia]; /* Old property was the inverse of the global */ /* Global enabled = local disabled, Global disabled = local enabled */ - self->_inlineMediaDisabled = inlineEnabledGlboally; - self->_inlineMediaEnabled = !inlineEnabledGlboally; + self->_inlineMediaDisabled = inlineEnabledGlobally; + self->_inlineMediaEnabled = !inlineEnabledGlobally; } } diff --git a/Sources/App/Classes/IRC/IRCChannelMemberList.m b/Sources/App/Classes/IRC/IRCChannelMemberList.m index 49589404e..a480761ba 100755 --- a/Sources/App/Classes/IRC/IRCChannelMemberList.m +++ b/Sources/App/Classes/IRC/IRCChannelMemberList.m @@ -118,9 +118,9 @@ ClassWithDesignatedInitializerInitMethod #pragma mark Grand Central Dispatch /* All modifications to the member list occur on this serial queue - to gurantee that there is only ever one person accessing the mutable + to guarantee that there is only ever one person accessing the mutable store at any given time. */ -+ (dispatch_queue_t)modifyMembmerListSerialQueue ++ (dispatch_queue_t)modifyMemberListSerialQueue { static dispatch_queue_t workerQueue = NULL; @@ -128,7 +128,7 @@ ClassWithDesignatedInitializerInitMethod dispatch_once(&onceToken, ^{ workerQueue = - XRCreateDispatchQueueWithPriority("IRCChannel.modifyMembmerListSerialQueue", DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT); + XRCreateDispatchQueueWithPriority("IRCChannel.modifyMemberListSerialQueue", DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT); }); return workerQueue; @@ -136,19 +136,19 @@ ClassWithDesignatedInitializerInitMethod + (void)resumeMemberListSerialQueues { - dispatch_resume([self modifyMembmerListSerialQueue]); + dispatch_resume([self modifyMemberListSerialQueue]); } + (void)suspendMemberListSerialQueues { - dispatch_suspend([self modifyMembmerListSerialQueue]); + dispatch_suspend([self modifyMemberListSerialQueue]); } + (void)accessMemberListUsingBlock:(dispatch_block_t)block { NSCParameterAssert(block != NULL); - dispatch_queue_t workerQueue = [self modifyMembmerListSerialQueue]; + dispatch_queue_t workerQueue = [self modifyMemberListSerialQueue]; static void *IsOnWorkerQueueKey = NULL; diff --git a/Sources/App/Classes/IRC/IRCClient.m b/Sources/App/Classes/IRC/IRCClient.m index a5ade1091..71d89f363 100644 --- a/Sources/App/Classes/IRC/IRCClient.m +++ b/Sources/App/Classes/IRC/IRCClient.m @@ -183,7 +183,7 @@ NSString * const IRCClientDidDisconnectNotification = @"IRCClientDidDisconnectNo NSString * const IRCClientUserNicknameChangedNotification = @"IRCClientUserNicknameChangedNotification"; @interface IRCClient () -// Properies that are public in IRCClient.h +// Properties that are public in IRCClient.h @property (nonatomic, copy, readwrite) IRCClientConfig *config; @property (nonatomic, copy, readwrite, nullable) IRCServer *server; @property (nonatomic, strong, readwrite) IRCISupportInfo *supportInfo; @@ -670,7 +670,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END self.config = mutableConfig; - /* Post notificaion */ + /* Post notification */ [RZNotificationCenter() postNotificationName:IRCClientChannelListWasModifiedNotification object:self]; } @@ -841,21 +841,21 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END #pragma mark - #pragma mark Servers -- (void)enumerateServers:(void (NS_NOESCAPE ^)(IRCServer *server, NSUInteger idnex, BOOL *stop))block +- (void)enumerateServers:(void (NS_NOESCAPE ^)(IRCServer *server, NSUInteger index, BOOL *stop))block { [self.config.serverList enumerateObjectsUsingBlock:block]; } - (void)writeServerPasswordsToKeychain { - [self enumerateServers:^(IRCServer *server, NSUInteger idnex, BOOL *stop) { + [self enumerateServers:^(IRCServer *server, NSUInteger index, BOOL *stop) { [server writeServerPasswordToKeychain]; }]; } - (void)destroyServerPasswordsKeychainItems { - [self enumerateServers:^(IRCServer *server, NSUInteger idnex, BOOL *stop) { + [self enumerateServers:^(IRCServer *server, NSUInteger index, BOOL *stop) { [server destroyServerPasswordKeychainItem]; }]; } @@ -981,7 +981,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END - (nullable NSData *)zncBouncerCertificateChainData { - /* If the data is stll being processed, then return + /* If the data is still being processed, then return nil so that partial data is not returned. */ if (self.isConnectedToZNC == NO || self.zncBouncerIsSendingCertificateInfo || @@ -3187,12 +3187,12 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END case IRCLocalCommandCap: // Command: CAP case IRCLocalCommandCaps: // Command: CAPS { - NSString *capabilites = self.enabledCapabilitiesStringValue; + NSString *capabilities = self.enabledCapabilitiesStringValue; - if (capabilites.length == 0) { + if (capabilities.length == 0) { [self printDebugInformation:TXTLS(@"IRC[5wa-lb]")]; } else { - [self printDebugInformation:TXTLS(@"IRC[7p9-rs]", capabilites)]; + [self printDebugInformation:TXTLS(@"IRC[7p9-rs]", capabilities)]; } break; @@ -4730,10 +4730,10 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END return; } - NSUInteger topicLenghtMaximum = self.supportInfo.maximumTopicLength; + NSUInteger topicLengthMaximum = self.supportInfo.maximumTopicLength; - if (topicLenghtMaximum > 0 && topicLength > topicLenghtMaximum) { - [self printDebugInformation:TXTLS(@"IRC[1oo-3b]", self.networkNameAlt, topicLenghtMaximum)]; + if (topicLengthMaximum > 0 && topicLength > topicLengthMaximum) { + [self printDebugInformation:TXTLS(@"IRC[1oo-3b]", self.networkNameAlt, topicLengthMaximum)]; } [self send:@"TOPIC", targetChannelName, topic, nil]; @@ -4920,7 +4920,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END BOOL isOperatorMessage = NO; BOOL isSecretMessage = NO; - BOOL isUnencryptedMessag = NO; + BOOL isUnencryptedMessage = NO; NSString *commandToSend = nil; @@ -4937,7 +4937,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END isOperatorMessage = (commandNumeric == IRCLocalCommandOmsg); isSecretMessage = (commandNumeric == IRCLocalCommandSmsg); - isUnencryptedMessag = (commandNumeric == IRCLocalCommandUmsg); + isUnencryptedMessage = (commandNumeric == IRCLocalCommandUmsg); } else if (commandNumeric == IRCLocalCommandMe || commandNumeric == IRCLocalCommandSme || @@ -4948,7 +4948,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END lineType = TVCLogLineTypeAction; isSecretMessage = (commandNumeric == IRCLocalCommandSme); - isUnencryptedMessag = (commandNumeric == IRCLocalCommandUme); + isUnencryptedMessage = (commandNumeric == IRCLocalCommandUme); } else if (commandNumeric == IRCLocalCommandNotice || // Command: NOTICE commandNumeric == IRCLocalCommandOnotice || // Command: ONOTICE @@ -4959,7 +4959,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END lineType = TVCLogLineTypeNotice; isOperatorMessage = (commandNumeric == IRCLocalCommandOnotice); - isUnencryptedMessag = (commandNumeric == IRCLocalCommandUnotice); + isUnencryptedMessage = (commandNumeric == IRCLocalCommandUnotice); } if (isOperatorMessage) { @@ -5099,7 +5099,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END [self send:commandToSend, destinationName, sendMessage, nil]; }; - if (destination == nil || isUnencryptedMessag) { + if (destination == nil || isUnencryptedMessage) { encryptionBlock(unencryptedMessage, NO); injectionBlock(unencryptedMessage); @@ -5454,7 +5454,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END } /* If an operation does not specify a command value, - then try to obain it from the reference message. */ + then try to obtain it from the reference message. */ if (command == nil) { command = referenceMessage.command; } @@ -7774,7 +7774,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END newNickname = [m paramAt:0]; } - /* There's no reason to perform an udpate if nothing changed */ + /* There's no reason to perform an update if nothing changed */ NSString *oldNickname = m.senderNickname; if ([oldNickname isEqualToString:newNickname]) { @@ -8413,7 +8413,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END break; } - case ClientIRCv3SupportedCapabilityMultiPreifx: + case ClientIRCv3SupportedCapabilityMultiPrefix: { stringValue = @"multi-prefix"; @@ -8515,7 +8515,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END } else if ([capabilityString isEqualToStringIgnoringCase:@"echo-message"]) { return ClientIRCv3SupportedCapabilityEchoMessage; } else if ([capabilityString isEqualToStringIgnoringCase:@"multi-prefix"]) { - return ClientIRCv3SupportedCapabilityMultiPreifx; + return ClientIRCv3SupportedCapabilityMultiPrefix; } else if ([capabilityString isEqualToStringIgnoringCase:@"identify-msg"]) { return ClientIRCv3SupportedCapabilityIdentifyMsg; } else if ([capabilityString isEqualToStringIgnoringCase:@"identify-ctcp"]) { @@ -8566,7 +8566,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END appendValue(ClientIRCv3SupportedCapabilityIdentifyCTCP); appendValue(ClientIRCv3SupportedCapabilityIdentifyMsg); appendValue(ClientIRCv3SupportedCapabilityIsIdentifiedWithSASL); - appendValue(ClientIRCv3SupportedCapabilityMultiPreifx); + appendValue(ClientIRCv3SupportedCapabilityMultiPrefix); appendValue(ClientIRCv3SupportedCapabilityPlayback); appendValue(ClientIRCv3SupportedCapabilityServerTime); appendValue(ClientIRCv3SupportedCapabilityUserhostInNames); @@ -8603,7 +8603,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END capability == ClientIRCv3SupportedCapabilityEchoMessage || capability == ClientIRCv3SupportedCapabilityIdentifyCTCP || capability == ClientIRCv3SupportedCapabilityIdentifyMsg || - capability == ClientIRCv3SupportedCapabilityMultiPreifx || + capability == ClientIRCv3SupportedCapabilityMultiPrefix || capability == ClientIRCv3SupportedCapabilitySASLGeneric || capability == ClientIRCv3SupportedCapabilityServerTime || capability == ClientIRCv3SupportedCapabilityUserhostInNames || @@ -8743,7 +8743,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END [self processPendingCapability:capability options:capabilityOptions]; } -- (void)processPendingCapability:(NSString *)capabilityString options:(nullable NSArray *)capabilityOpions +- (void)processPendingCapability:(NSString *)capabilityString options:(nullable NSArray *)capabilityOptions { NSParameterAssert(capabilityString != nil); @@ -8752,7 +8752,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END } if ([capabilityString isEqualToString:@"sasl"]) { - [self processPendingCapabilityForSASL:capabilityOpions]; + [self processPendingCapabilityForSASL:capabilityOptions]; return; } @@ -8910,7 +8910,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END return NO; } -- (void)resetSASLNegotation +- (void)resetSASLNegotiation { [self disablePendingCapability:ClientIRCv3SupportedCapabilitySASLGeneric]; [self disablePendingCapability:ClientIRCv3SupportedCapabilitySASLPlainText]; @@ -9021,7 +9021,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END } else { /* If we wait for NickServ we set a timer of 3.0 seconds before performing auto join. When this timer is executed, if we do not have any knowledge of NickServ existing - on the current server, then we perform the autojoin. This is primarly a fix for the + on the current server, then we perform the autojoin. This is primarily a fix for the ZNC SASL module which will complete identification before connecting and once connected Textual will have no knowledge of whether the local user is identified or not. */ /* NickServ will send a notice asking for identification as soon as connection occurs so @@ -9529,7 +9529,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END /* We perform this check after printMessage is defined so that filters have a chance to act on the input. */ - /* IRCClient perform mdoe requests for channels without the user + /* IRCClient perform mode requests for channels without the user asking for it so we must check that here. */ if (channel.channelModesReceived == NO) { channel.channelModesReceived = YES; @@ -9656,7 +9656,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END /* It is important that we don't process logic for visible requests because if user does ISON for people that aren't - on the tracked list and the logic belows sees the response + on the tracked list and the logic below sees the response missing those, then it will think everyone tracked went offline. */ break; } @@ -9689,7 +9689,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END /* If they were not on but now are, then log that too. */ if ([onlineNicknames containsObjectIgnoringCase:trackedUser]) { if (self.invokingISONCommandForFirstTime) { - trackingStatus = IRCAddressBookUserTrackingStatusAvailalbe; + trackingStatus = IRCAddressBookUserTrackingStatusAvailable; } else { trackingStatus = IRCAddressBookUserTrackingStatusSignedOn; } @@ -9744,7 +9744,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END /* We could remove this and be fine, but it's a lot over overhead to process WHO responses so let's just - wait until the next auotmated one. */ + wait until the next automated one. */ break; } @@ -9851,7 +9851,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END } else if (userChanged) { - /* Dtermine whether the users were modified in such a way that + /* Determine whether the users were modified in such a way that they require their cell in the user list be resorted. */ /* We do not want to resort unless absolutely necessary because sorting a channel with a few hundred users has overhead. */ @@ -10340,13 +10340,13 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END switch (numeric) { case RPL_NOWON: // is online { - [self statusOfTrackedNickname:nickname changedTo:IRCAddressBookUserTrackingStatusAvailalbe notify:NO]; + [self statusOfTrackedNickname:nickname changedTo:IRCAddressBookUserTrackingStatusAvailable notify:NO]; break; } case RPL_NOWOFF: // is offline { - [self statusOfTrackedNickname:nickname changedTo:IRCAddressBookUserTrackingStatusNotAvailalbe notify:NO]; + [self statusOfTrackedNickname:nickname changedTo:IRCAddressBookUserTrackingStatusNotAvailable notify:NO]; break; } @@ -10513,7 +10513,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END { NSAssertReturn([m paramsCount] == 3); - [self resetSASLNegotation]; + [self resetSASLNegotiation]; if (printMessage) { [self print:[m sequence:2] @@ -11071,7 +11071,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END /* Instead of stopping and starting the timer every time this changes, it it is easier to check if we should do it every timer iteration. - The ability to disable this is important on PSYBNC connectiongs because + The ability to disable this is important on PSYBNC connection because PSYBNC doesn't respond to PING commands. There are other irc daemons that don't reply to PING either and they should all be shot. */ NSTimeInterval timeSpent = [NSDate timeIntervalSinceNow:self.lastMessageReceived]; @@ -11589,7 +11589,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END [self printDebugInformationToConsole:TXTLS(@"IRC[ky3-36]")]; } - /* To provide user with similiar behavior, when migrating -connectionPrefersIPv4 + /* To provide user with similar behavior, when migrating -connectionPrefersIPv4 in IRCClientConfig, we set the address type to IRCConnectionAddressTypeIPv4. We check if both values are set to offer the user a warning that the preference they had has changed in a way they may not want. When user changes the address @@ -12171,7 +12171,7 @@ TEXTUAL_IGNORE_DEPRECATION_END self.preAwayUserNickname = nil; - /* If we have an away nickname configured but no preAawayNickname set, + /* If we have an away nickname configured but no preAwayNickname set, then use the configured nickname instead. User probably was on bouncer and relaunched Textual, losing preAwayNickname.*/ if (newNickname == nil && self.config.awayNickname.length > 0) { @@ -12512,7 +12512,7 @@ TEXTUAL_IGNORE_DEPRECATION_END NSDictionary *info = @{ @"isFileTransferNotification" : @(YES), - @"fileTransferUniqeIdentifier" : identifier, + @"fileTransferUniqueIdentifier" : identifier, @"fileTransferNotificationType" : @(type) }; @@ -12659,7 +12659,7 @@ TEXTUAL_IGNORE_DEPRECATION_END goto present_error; } - /* Process invidiual commands */ + /* Process individual commands */ if (isSendRequest) { /* DCC SEND [token] */ @@ -13066,7 +13066,7 @@ present_error: message = TXTLS(@"Notifications[xk2-1l]", nickname); } else if (newStatus == IRCAddressBookUserTrackingStatusSignedOff) { message = TXTLS(@"Notifications[rif-9r]", nickname); - } else if (newStatus == IRCAddressBookUserTrackingStatusAvailalbe) { + } else if (newStatus == IRCAddressBookUserTrackingStatusAvailable) { message = TXTLS(@"Notifications[97r-0l]", nickname); } @@ -13083,7 +13083,7 @@ present_error: return; } - /* Additions & Removels for WATCH command. ISON does not access these. */ + /* Additions & Removals for WATCH command. ISON does not access these. */ NSMutableArray *watchAdditions = [NSMutableArray array]; NSMutableArray *watchRemovals = [NSMutableArray array]; @@ -13328,7 +13328,7 @@ present_error: return; } - BOOL ison = (trackingStatus == IRCAddressBookUserTrackingStatusAvailalbe); + BOOL ison = (trackingStatus == IRCAddressBookUserTrackingStatusAvailable); /* Notification Type: JOIN Command */ if ([message.command isEqualToStringIgnoringCase:@"JOIN"]) { @@ -13486,7 +13486,7 @@ present_error: - (void)informCommunityMoved { - BOOL appeared = [RZUserDefaults() boolForKey:TDCCommunityMovedDialogApppearedDefaultsKey]; + BOOL appeared = [RZUserDefaults() boolForKey:TDCCommunityMovedDialogAppearedDefaultsKey]; if (appeared) { return; diff --git a/Sources/App/Classes/IRC/IRCClientConfig.m b/Sources/App/Classes/IRC/IRCClientConfig.m index 2bd066361..cdfd24626 100755 --- a/Sources/App/Classes/IRC/IRCClientConfig.m +++ b/Sources/App/Classes/IRC/IRCClientConfig.m @@ -676,7 +676,7 @@ TEXTUAL_IGNORE_DEPRECATION_END config->_objectInitializedAsCopy = YES; - // Instance variable is copied because self.nicknamePassward can return + // Instance variable is copied because self.nicknamePassword can return // the value of the instance variable if present, else it uses keychain. config->_nicknamePassword = self->_nicknamePassword; config->_proxyPassword = self->_proxyPassword; diff --git a/Sources/App/Classes/IRC/IRCConnection.m b/Sources/App/Classes/IRC/IRCConnection.m index f72b2e213..f5ca4432a 100755 --- a/Sources/App/Classes/IRC/IRCConnection.m +++ b/Sources/App/Classes/IRC/IRCConnection.m @@ -109,7 +109,7 @@ ClassWithDesignatedInitializerInitMethod return; } - LogToConsoleDebug("Invaliating process..."); + LogToConsoleDebug("Invalidating process..."); [self.serviceConnection invalidate]; } @@ -230,7 +230,7 @@ ClassWithDesignatedInitializerInitMethod if (self.isConnecting || self.isConnected) { /* Disconnect caused by calling -close on the service will - cacuse -ircConnectionDidDisconnectWithError: to invoke + cause -ircConnectionDidDisconnectWithError: to invoke -invalidateProcess for us, so don't call it on this condition. */ self.isDisconnecting = YES; @@ -420,7 +420,7 @@ ClassWithDesignatedInitializerInitMethod /* PONG replies are extremely important. There is no reason they should be placed in the flood control queue. This writes them directly to the socket - instead of actuallying waiting for the queue. We only need this check if + instead of actually waiting for the queue. We only need this check if we actually have flood control enabled. */ if ([line hasPrefix:@"PONG"]) { [[self remoteObjectProxy] sendData:dataToSend bypassQueue:YES]; diff --git a/Sources/App/Classes/IRC/IRCHighlightLogEntry.m b/Sources/App/Classes/IRC/IRCHighlightLogEntry.m index 387b4bd12..1e405156c 100644 --- a/Sources/App/Classes/IRC/IRCHighlightLogEntry.m +++ b/Sources/App/Classes/IRC/IRCHighlightLogEntry.m @@ -37,7 +37,7 @@ #import "NSColorHelper.h" #import "NSStringHelper.h" -#import "NSTableVIewHelperPrivate.h" +#import "NSTableViewHelperPrivate.h" #import "TXGlobalModels.h" #import "TXMasterController.h" #import "IRCChannel.h" diff --git a/Sources/App/Classes/IRC/IRCISupportInfo.m b/Sources/App/Classes/IRC/IRCISupportInfo.m index e7837fba1..4f895aeb3 100755 --- a/Sources/App/Classes/IRC/IRCISupportInfo.m +++ b/Sources/App/Classes/IRC/IRCISupportInfo.m @@ -251,10 +251,10 @@ ClassWithDesignatedInitializerInitMethod [client enableCapability:ClientIRCv3SupportedCapabilityMonitorCommand]; } else if ([segmentKey isEqualToStringIgnoringCase:@"NAMESX"]) { - if ([client isCapabilityEnabled:ClientIRCv3SupportedCapabilityMultiPreifx] == NO) { + if ([client isCapabilityEnabled:ClientIRCv3SupportedCapabilityMultiPrefix] == NO) { [client sendLine:@"PROTOCTL NAMESX"]; - [client enableCapability:ClientIRCv3SupportedCapabilityMultiPreifx]; + [client enableCapability:ClientIRCv3SupportedCapabilityMultiPrefix]; } } else if ([segmentKey isEqualToStringIgnoringCase:@"UHNAMES"]) { if ([client isCapabilityEnabled:ClientIRCv3SupportedCapabilityUserhostInNames] == NO) { @@ -371,7 +371,7 @@ ClassWithDesignatedInitializerInitMethod // Format: (qaohv)~&@%+ - /* Perform validaton on placement of parentheses */ + /* Perform validation on placement of parentheses */ NSInteger openingParenthesesPosition = [modeString stringPosition:@"("]; NSInteger closingParenthesesPosition = [modeString stringPosition:@")"]; @@ -381,7 +381,7 @@ ClassWithDesignatedInitializerInitMethod return; } - /* Extract relevant information and ensure that they are equal lenght */ + /* Extract relevant information and ensure that they are equal length */ NSString *modeSymbols = [modeString substringWithRange:NSMakeRange(1, (closingParenthesesPosition - 1))]; NSString *characters = [modeString substringAfterIndex:closingParenthesesPosition]; diff --git a/Sources/App/Classes/IRC/IRCMessage.m b/Sources/App/Classes/IRC/IRCMessage.m index 305d98b8d..86cff4fb2 100755 --- a/Sources/App/Classes/IRC/IRCMessage.m +++ b/Sources/App/Classes/IRC/IRCMessage.m @@ -254,7 +254,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END we use the the address the user has configured. */ /* -serverAddress is only nil when the client isn't connected anywhere. We are parsing messages when - connected somewehre so it's safe to cast it as + connected somewhere so it's safe to cast it as as non-nil at least here. */ NSString * _Nonnull serverAddress = (NSString * _Nonnull)client.serverAddress; diff --git a/Sources/App/Classes/IRC/IRCSendingMessage.m b/Sources/App/Classes/IRC/IRCSendingMessage.m index a38427530..7dc5df819 100755 --- a/Sources/App/Classes/IRC/IRCSendingMessage.m +++ b/Sources/App/Classes/IRC/IRCSendingMessage.m @@ -71,7 +71,7 @@ NS_ASSUME_NONNULL_BEGIN // // A colon is supposed to represent a section of an outgoing command // that has a parameter which contains spaces. For example, PRIVMSG - // is in the formoat "PRIVMSG #channel :long message" — The message + // is in the format "PRIVMSG #channel :long message" — The message // will have spaces part of it, so we inform the server. if (colonIndexCount == (arguments.count - 1) && ([argument hasPrefix:@":"] || [argument contains:@" "])) { diff --git a/Sources/App/Classes/IRC/IRCWorld.m b/Sources/App/Classes/IRC/IRCWorld.m index 32d7da9bb..f9d2ca885 100644 --- a/Sources/App/Classes/IRC/IRCWorld.m +++ b/Sources/App/Classes/IRC/IRCWorld.m @@ -352,9 +352,9 @@ NSString * const IRCWorldWillDestroyChannelNotification = @"IRCWorldWillDestroyC { /* Ask for the day, month, and year from the current calendar. */ /* We are not asking for time which means that it will default to zero. */ - NSDateComponents *currentDayComponents = [RZCurrentCalender() components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:[NSDate date]]; + NSDateComponents *currentDayComponents = [RZCurrentCalendar() components:(NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:[NSDate date]]; - NSDate *lastMidnight = [RZCurrentCalender() dateFromComponents:currentDayComponents]; + NSDate *lastMidnight = [RZCurrentCalendar() dateFromComponents:currentDayComponents]; /* Create date components one day in the future. */ /* All other values default to zero. */ @@ -364,7 +364,7 @@ NSString * const IRCWorldWillDestroyChannelNotification = @"IRCWorldWillDestroyC /* With the current date and future components, calculate the date on which our midnight timer will land. */ - NSDate *nextMidnight = [RZCurrentCalender() dateByAddingComponents:futureDayComponents toDate:lastMidnight options:0]; + NSDate *nextMidnight = [RZCurrentCalendar() dateByAddingComponents:futureDayComponents toDate:lastMidnight options:0]; /* Create timer for midnight in future. */ /* We set the tolerance for the timer to absolute zero so that diff --git a/Sources/App/Classes/IRC/Users/IRCUser.m b/Sources/App/Classes/IRC/Users/IRCUser.m index 3bc54f9fa..30486f683 100755 --- a/Sources/App/Classes/IRC/Users/IRCUser.m +++ b/Sources/App/Classes/IRC/Users/IRCUser.m @@ -286,7 +286,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END - (void)updateRemoveUserTimerBlockToFire { /* If the timer is already active, we reset the block that is scheduled - so that the user that is targetted is always the primary */ + so that the user that is targeted is always the primary */ dispatch_source_t removeUserTimer = self.persistentStore.removeUserTimer; if (removeUserTimer == nil) { @@ -348,7 +348,7 @@ DESIGNATED_INITIALIZER_EXCEPTION_BODY_END - (dispatch_block_t)removeUserTimerBlockToFire { /* Using weak references means that the object can be deallocated when - the timer is active. -dealloc will cancel the timer if it is actie. */ + the timer is active. -dealloc will cancel the timer if it is active. */ __weak IRCClient *client = self.client; diff --git a/Sources/App/Classes/IRC/Users/IRCUserNicknameColorStyleGenerator.m b/Sources/App/Classes/IRC/Users/IRCUserNicknameColorStyleGenerator.m index 4f73b811a..7c0c5740f 100644 --- a/Sources/App/Classes/IRC/Users/IRCUserNicknameColorStyleGenerator.m +++ b/Sources/App/Classes/IRC/Users/IRCUserNicknameColorStyleGenerator.m @@ -103,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN s = (shash % 50 + 35); // 35 - 85 l = (lhash % 38 + 20); // 20 - 58 - // Lower lightness for Yello, Green, Cyan + // Lower lightness for Yellow, Green, Cyan if (h > 45 && h <= 195) { l = (lhash % 21 + 20); // 20 - 41 diff --git a/Sources/App/Classes/Library/Color Formatting/IRCColorFormat.m b/Sources/App/Classes/Library/Color Formatting/IRCColorFormat.m index 2eb7c93bb..0a669ec3f 100644 --- a/Sources/App/Classes/Library/Color Formatting/IRCColorFormat.m +++ b/Sources/App/Classes/Library/Color Formatting/IRCColorFormat.m @@ -488,7 +488,7 @@ NSString * const IRCTextFormatterSpoilerAttributeName = @"IRCTextFormatterSpoile for the formatters, we can start building the result. */ /* ///////////////////////////////////////////////////// */ - /* At this point we do not care what the actaul length of this segment is. + /* At this point we do not care what the actual length of this segment is. The math only checks two things: Whether the formatter bytes found above will fit into this segment as well as at least one unicode character with a length of two. If neither of those can fit, then this segment is junk @@ -1064,7 +1064,7 @@ NSString * const IRCTextFormatterSpoilerAttributeName = @"IRCTextFormatterSpoile /* minimumIndex is index we can't pass so that we always wrap within our own segment and not within another. */ /* maxDistance is how far back we search backwards from the end. - While similiar, this value is different compared to minimumIndex. + While similar, this value is different compared to minimumIndex. maxDistance is a suggestion whereas minimumIndex is a must. */ - (NSUInteger)wrapIRCTextFormatterResultWith:(NSUInteger)minimumIndex maxDistance:(NSUInteger)maxDistance { diff --git a/Sources/App/Classes/Library/TLOInputHistory.m b/Sources/App/Classes/Library/TLOInputHistory.m index f189193aa..093b9b93e 100755 --- a/Sources/App/Classes/Library/TLOInputHistory.m +++ b/Sources/App/Classes/Library/TLOInputHistory.m @@ -144,7 +144,7 @@ ClassWithDesignatedInitializerInitMethod /* Change to new view */ self.currentTreeItem = treeItem.uniqueIdentifier; - /* Does new seleciton have a history item? */ + /* Does new selection have a history item? */ TLOInputHistoryObject *newObject = [self currentObjectForFocusedTreeView]; NSAttributedString *lastHistoryItem = newObject.lastHistoryItem; diff --git a/Sources/App/Classes/Library/TLONotificationController.m b/Sources/App/Classes/Library/TLONotificationController.m index 463439071..c7c1d1694 100755 --- a/Sources/App/Classes/Library/TLONotificationController.m +++ b/Sources/App/Classes/Library/TLONotificationController.m @@ -278,7 +278,7 @@ NSString * const TXNotificationHighlightLogStandardMessageFormat = @"%@ %@"; } #pragma mark - -#pragma mark Notification Cetner Delegate +#pragma mark Notification Center Delegate - (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification @@ -381,7 +381,7 @@ NSString * const TXNotificationHighlightLogStandardMessageFormat = @"%@ %@"; return; } - NSString *uniqueIdentifier = context[@"fileTransferUniqeIdentifier"]; + NSString *uniqueIdentifier = context[@"fileTransferUniqueIdentifier"]; TDCFileTransferDialogTransferController *fileTransfer = [[TXSharedApplication sharedFileTransferDialog] fileTransferWithUniqueIdentifier:uniqueIdentifier]; diff --git a/Sources/App/Classes/Preferences/TPCPreferencesUserDefaultsMigrate.m b/Sources/App/Classes/Preferences/TPCPreferencesUserDefaultsMigrate.m index 6fa5e3224..be90471b7 100644 --- a/Sources/App/Classes/Preferences/TPCPreferencesUserDefaultsMigrate.m +++ b/Sources/App/Classes/Preferences/TPCPreferencesUserDefaultsMigrate.m @@ -55,9 +55,9 @@ NS_ASSUME_NONNULL_BEGIN [self _repairOldStyleSymbolicLink]; } -/* Textual 5 would create a symoblic link from the App Store preferences file path +/* Textual 5 would create a symbolic link from the App Store preferences file path to the standalone preferences file path. This was done so if you began using App Store - verison, the symbolic link would allow the app to access preferences already set. + version, the symbolic link would allow the app to access preferences already set. This is no longer done but the symbolic link still exists for a lot of users. This logic replaces the symbolic link with a copy of the file its linked against. */ + (void)_repairOldStyleSymbolicLink @@ -103,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN } } - /* Smbolic link getter */ + /* Symbolic link getter */ NSNumber *isSymbolicLink; { diff --git a/Sources/App/Classes/Preferences/Themes/TPCTheme.m b/Sources/App/Classes/Preferences/Themes/TPCTheme.m index ac2a308a9..f71685d51 100755 --- a/Sources/App/Classes/Preferences/Themes/TPCTheme.m +++ b/Sources/App/Classes/Preferences/Themes/TPCTheme.m @@ -1077,7 +1077,7 @@ static inline BOOL _reevaluateFileDuringSetOrUnset(NSURL *fileURL, NSURL * __str /* Returns YES if a change is made to property. NO otherwise. */ - /* This method is only called for the root of the varity which + /* This method is only called for the root of the variety which means we only need to perform file name comparison. */ NSString *filename = fileURL.lastPathComponent; diff --git a/Sources/App/Classes/Preferences/Themes/TPCThemeController.m b/Sources/App/Classes/Preferences/Themes/TPCThemeController.m index eda8b6c1a..3e6a3801f 100644 --- a/Sources/App/Classes/Preferences/Themes/TPCThemeController.m +++ b/Sources/App/Classes/Preferences/Themes/TPCThemeController.m @@ -697,12 +697,12 @@ typedef NSMutableDictionary *TPCThemeControllerThemeLi return [list copy]; } -+ (void)enumerateAvailableThemesWithBlock:(void(NS_NOESCAPE ^)(NSString *fileName, TPCThemeStorageLocation storageLocation, BOOL multipleVaraints, BOOL *stop))enumerationBlock ++ (void)enumerateAvailableThemesWithBlock:(void(NS_NOESCAPE ^)(NSString *fileName, TPCThemeStorageLocation storageLocation, BOOL multipleVariants, BOOL *stop))enumerationBlock { TEXTUAL_DEPRECATED_WARNING } -- (void)enumerateAvailableThemesWithBlock:(void(NS_NOESCAPE ^)(NSString *fileName, TPCThemeStorageLocation storageLocation, BOOL multipleVaraints, BOOL *stop))enumerationBlock +- (void)enumerateAvailableThemesWithBlock:(void(NS_NOESCAPE ^)(NSString *fileName, TPCThemeStorageLocation storageLocation, BOOL multipleVariants, BOOL *stop))enumerationBlock { NSParameterAssert(enumerationBlock != nil); @@ -747,10 +747,10 @@ typedef NSMutableDictionary *TPCThemeControllerThemeLi for (NSString *themeName in themeNamesSorted) { NSArray *themeLocations = themesMappedByName[themeName]; - BOOL multipleVaraints = (themeLocations.count > 1); + BOOL multipleVariants = (themeLocations.count > 1); for (NSNumber *themeLocation in themeLocations) { - enumerationBlock(themeName, themeLocation.unsignedIntegerValue, multipleVaraints, &stopEnumeration); + enumerationBlock(themeName, themeLocation.unsignedIntegerValue, multipleVariants, &stopEnumeration); if (stopEnumeration) { break; @@ -1487,7 +1487,7 @@ typedef NSMutableDictionary *TPCThemeControllerThemeLi destinationPath = [destinationPath stringByAppendingPathComponent:self.themeName]; - /* Cast as nonnull to make static analzyer happy */ + /* Cast as nonnull to make static analyzer happy */ self.pathBeingCopiedTo = (NSString * _Nonnull)destinationPath; } diff --git a/Sources/App/Classes/Preferences/iCloud/TPCPreferencesCloudSync.m b/Sources/App/Classes/Preferences/iCloud/TPCPreferencesCloudSync.m index f444c77ed..8e64f0a47 100644 --- a/Sources/App/Classes/Preferences/iCloud/TPCPreferencesCloudSync.m +++ b/Sources/App/Classes/Preferences/iCloud/TPCPreferencesCloudSync.m @@ -374,7 +374,7 @@ NS_ASSUME_NONNULL_BEGIN self.isSyncingLocalKeysUpstream = NO; - LogToConsoleDebug("iCloud: Completeing sync upstream"); + LogToConsoleDebug("iCloud: Completing sync upstream"); }); } @@ -401,7 +401,7 @@ NS_ASSUME_NONNULL_BEGIN self.remoteKeysBeingSynced = keysChangedHashed; } - /* See the code of syncPreferencesToCloud: for an expalantion of how these keys are hashed. */ + /* See the code of syncPreferencesToCloud: for an explanation of how these keys are hashed. */ NSMutableArray *clientsImported = [NSMutableArray array]; NSMutableArray *keysChanged = [NSMutableArray array]; @@ -499,7 +499,7 @@ NS_ASSUME_NONNULL_BEGIN self.remoteKeysBeingSynced = nil; - LogToConsoleDebug("iCloud: Completeing sync downstream"); + LogToConsoleDebug("iCloud: Completing sync downstream"); }); } diff --git a/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerInlineMediaService.m b/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerInlineMediaService.m index 4e027cabd..03059356d 100644 --- a/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerInlineMediaService.m +++ b/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerInlineMediaService.m @@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN return; } - LogToConsoleDebug("Invaliating process..."); + LogToConsoleDebug("Invalidating process..."); [self.serviceConnection invalidate]; } diff --git a/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerOperationQueue.m b/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerOperationQueue.m index e9988d740..c048382e1 100644 --- a/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerOperationQueue.m +++ b/Sources/App/Classes/Views/Channel View/Extras/TVCLogControllerOperationQueue.m @@ -231,7 +231,7 @@ NS_ASSUME_NONNULL_BEGIN } #pragma mark - -#pragma mark cancelAllOperations Substitue +#pragma mark cancelAllOperations Substitute - (void)cancelOperationsForViewController:(TVCLogController *)viewController { diff --git a/Sources/App/Classes/Views/Channel View/TVCLogScriptEventSink.m b/Sources/App/Classes/Views/Channel View/TVCLogScriptEventSink.m index 3fba7daf0..1afb1f176 100755 --- a/Sources/App/Classes/Views/Channel View/TVCLogScriptEventSink.m +++ b/Sources/App/Classes/Views/Channel View/TVCLogScriptEventSink.m @@ -1434,7 +1434,7 @@ ClassWithDesignatedInitializerInitMethod - (void)_sendPluginPayload:(TVCLogScriptEventSinkContext *)context { if ([sharedPluginManager() supportsFeature:THOPluginItemSupportedFeatureWebViewJavaScriptPayloads] == NO) { - [self.class throwJavaScriptException:@"There are no plugins loaded that support JavaScritp payloads" + [self.class throwJavaScriptException:@"There are no plugins loaded that support JavaScript payloads" forCaller:context.caller inWebView:context.webView]; diff --git a/Sources/App/Classes/Views/Input Text Field/TVCTextViewWithIRCFormatter.m b/Sources/App/Classes/Views/Input Text Field/TVCTextViewWithIRCFormatter.m index 2d698035b..08eecd581 100755 --- a/Sources/App/Classes/Views/Input Text Field/TVCTextViewWithIRCFormatter.m +++ b/Sources/App/Classes/Views/Input Text Field/TVCTextViewWithIRCFormatter.m @@ -91,7 +91,7 @@ NS_ASSUME_NONNULL_BEGIN } #pragma mark - -#pragma mark Keyboard Shorcuts +#pragma mark Keyboard Shortcuts - (void)setKeyHandlerTarget:(id)target { diff --git a/Sources/App/Classes/Views/Input Text Field/TVCValidatedComboBox.m b/Sources/App/Classes/Views/Input Text Field/TVCValidatedComboBox.m index 6c2338c08..6501f7dfc 100644 --- a/Sources/App/Classes/Views/Input Text Field/TVCValidatedComboBox.m +++ b/Sources/App/Classes/Views/Input Text Field/TVCValidatedComboBox.m @@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN @interface TVCValidatedComboBox () /* Maintain cached value so that the drawing does not call - the validaton block every time that it is called. */ + the validation block every time that it is called. */ @property (nonatomic, assign) BOOL cachedValidValue; @property (nonatomic, assign, readwrite) BOOL valueIsPredefined; @property (nonatomic, assign) BOOL validationPerformed; diff --git a/Sources/App/Classes/Views/Input Text Field/TVCValidatedTextField.m b/Sources/App/Classes/Views/Input Text Field/TVCValidatedTextField.m index 60479fe44..a976285a4 100644 --- a/Sources/App/Classes/Views/Input Text Field/TVCValidatedTextField.m +++ b/Sources/App/Classes/Views/Input Text Field/TVCValidatedTextField.m @@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN @interface TVCValidatedTextField () /* Maintain cached value so that the drawing does not call - the validaton block every time that it is called. */ + the validation block every time that it is called. */ @property (nonatomic, assign) BOOL cachedValidValue; @property (nonatomic, assign) BOOL validationPerformed; @property (nonatomic, copy, nullable, readwrite) NSString *lastValidationErrorDescription; diff --git a/Sources/App/Classes/Views/Main Window/TVCMainWindow.m b/Sources/App/Classes/Views/Main Window/TVCMainWindow.m index dc411ba4d..baa8ff39c 100644 --- a/Sources/App/Classes/Views/Main Window/TVCMainWindow.m +++ b/Sources/App/Classes/Views/Main Window/TVCMainWindow.m @@ -2353,7 +2353,7 @@ NSString * const TVCMainWindowSelectionChangedNotification = @"TVCMainWindowSele return; } - /* Get previously selected item and canel if its missing */ + /* Get previously selected item and cancel if its missing */ IRCTreeItem *itemPrevious = self.previouslySelectedItem; if (itemPrevious == nil) { @@ -2476,7 +2476,7 @@ NSString * const TVCMainWindowSelectionChangedNotification = @"TVCMainWindowSele if (optionMaintainGrouping && (itemIndexOld >= 0 && [selectedRows containsIndex:itemIndexOld]) && (itemIndexNew >= 0 && [selectedRows containsIndex:itemIndexNew]) && - newItem != nil) // This condition is impossible but static analzyer doesn't know that. + newItem != nil) // This condition is impossible but static analyzer doesn't know that. // Condition is impossible because itemIndexNew will never return // greater to or equal zero unless item is non-nil. { diff --git a/Sources/App/Classes/Views/Main Window/TVCMainWindowTextView.m b/Sources/App/Classes/Views/Main Window/TVCMainWindowTextView.m index 1cde68890..d011c5475 100755 --- a/Sources/App/Classes/Views/Main Window/TVCMainWindowTextView.m +++ b/Sources/App/Classes/Views/Main Window/TVCMainWindowTextView.m @@ -718,9 +718,9 @@ NS_ASSUME_NONNULL_BEGIN NSBezierPath *dividerPath = [NSBezierPath bezierPathWithRect:contentViewFrame]; - NSColor *dividierColor = appearance.backgroundViewDividerColor; + NSColor *dividerColor = appearance.backgroundViewDividerColor; - [dividierColor set]; + [dividerColor set]; [dividerPath fill]; } diff --git a/Sources/App/Classes/Views/Main Window/TVCMainWindowTitlebarAccessoryView.m b/Sources/App/Classes/Views/Main Window/TVCMainWindowTitlebarAccessoryView.m index 793784620..6f90fb917 100644 --- a/Sources/App/Classes/Views/Main Window/TVCMainWindowTitlebarAccessoryView.m +++ b/Sources/App/Classes/Views/Main Window/TVCMainWindowTitlebarAccessoryView.m @@ -56,7 +56,7 @@ NS_ASSUME_NONNULL_BEGIN /* Accessory views are wrapped around an NSToolbarFullScreenWindow object when in full screen. That means the view cannot use the helper property in NSView named -mainWindow which wraps around -window. Instead, we have - to be excplicit and use a reference. */ + to be explicit and use a reference. */ @property (nonatomic, weak) IBOutlet TVCMainWindow *mainWindowRef; @end @@ -166,7 +166,7 @@ NS_ASSUME_NONNULL_BEGIN { NSParameterAssert(appearance != nil); - /* We get the bounds of the object and tweak it just slighly to match what it + /* We get the bounds of the object and tweak it just slightly to match what it actually is. After that, we draw our color in behind it to fake the background. */ NSRect controllerFrame = self.bounds; diff --git a/Sources/App/Classes/Views/Server List/TVCServerList.m b/Sources/App/Classes/Views/Server List/TVCServerList.m index bed0e4b37..b589c9092 100755 --- a/Sources/App/Classes/Views/Server List/TVCServerList.m +++ b/Sources/App/Classes/Views/Server List/TVCServerList.m @@ -275,15 +275,15 @@ NSString * const TVCServerListDragType = @"TVCServerListDragType"; { NSParameterAssert(appearance != nil); - NSVisualEffectView *visaulEffectView = self.visualEffectView; + NSVisualEffectView *visualEffectView = self.visualEffectView; if ([TPCPreferences disableSidebarTranslucency]) { - visaulEffectView.state = NSVisualEffectStateInactive; + visualEffectView.state = NSVisualEffectStateInactive; } else { - visaulEffectView.state = NSVisualEffectStateFollowsWindowActiveState; + visualEffectView.state = NSVisualEffectStateFollowsWindowActiveState; } - visaulEffectView.material = NSVisualEffectMaterialSidebar; + visualEffectView.material = NSVisualEffectMaterialSidebar; } - (void)applicationAppearanceChanged diff --git a/Sources/App/Classes/Views/TVCAppearance.m b/Sources/App/Classes/Views/TVCAppearance.m index 1bb056262..8228270bf 100644 --- a/Sources/App/Classes/Views/TVCAppearance.m +++ b/Sources/App/Classes/Views/TVCAppearance.m @@ -121,9 +121,9 @@ ClassWithDesignatedInitializerInitMethod /* TVCListAppearance allows for one appearance to inherit properties from another group recursively. */ -/* For eample: AppearanceDarkRetina -> - AppearanceDarkBase -> - AppearanceBase */ +/* For example: AppearanceDarkRetina -> + AppearanceDarkBase -> + AppearanceBase */ /* -_combineAppearance:withOtherAppearances: is the staging ground for this logic. The first argument is the properties for the appearance that was specified in -init. The second argument is the contents of @@ -161,7 +161,7 @@ ClassWithDesignatedInitializerInitMethod lastInheritance = [otherAppearances dictionaryForKey:inheritedName]; } - /* No inhertiance */ + /* No inheritance */ if (lastInheritance == nil) { return; } diff --git a/Sources/App/Classes/Views/TVCDockIcon.m b/Sources/App/Classes/Views/TVCDockIcon.m index b89b91712..44b224163 100755 --- a/Sources/App/Classes/Views/TVCDockIcon.m +++ b/Sources/App/Classes/Views/TVCDockIcon.m @@ -87,7 +87,7 @@ static NSInteger _cachedMessageCount = (-1); NSDateComponents *breakdownInfo = [sysCalendar components:(NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:[NSDate date]]; - /* The first public commit of Textual occured on July, 23, 2010. This is the day + /* The first public commit of Textual occurred on July, 23, 2010. This is the day that we consider the birthday of the application. */ if (breakdownInfo.month == 7 && breakdownInfo.day == 23) { return [NSImage imageNamed:@"applicationIconBirthday"]; @@ -195,7 +195,7 @@ static NSInteger _cachedMessageCount = (-1); /* If there is no red badge, then the green one is drawn in the same position of the red at the top right of the icon. The following is the - math required to psotiion it correctly relative to the icon. If the + math required to position it correctly relative to the icon. If the red icon does exist in this drawing, then we will update these points of origin later on in the drawing. For now, assume it is at the top. */ diff --git a/Sources/App/Classes/Views/User List/TVCMemberList.m b/Sources/App/Classes/Views/User List/TVCMemberList.m index 1c2fb421f..f5a620cb9 100755 --- a/Sources/App/Classes/Views/User List/TVCMemberList.m +++ b/Sources/App/Classes/Views/User List/TVCMemberList.m @@ -457,15 +457,15 @@ NSString * const TVCMemberListDragType = @"TVCMemberListDragType"; { NSParameterAssert(appearance != nil); - NSVisualEffectView *visaulEffectView = self.visualEffectView; + NSVisualEffectView *visualEffectView = self.visualEffectView; if ([TPCPreferences disableSidebarTranslucency]) { - visaulEffectView.state = NSVisualEffectStateInactive; + visualEffectView.state = NSVisualEffectStateInactive; } else { - visaulEffectView.state = NSVisualEffectStateFollowsWindowActiveState; + visualEffectView.state = NSVisualEffectStateFollowsWindowActiveState; } - visaulEffectView.material = NSVisualEffectMaterialSidebar; + visualEffectView.material = NSVisualEffectMaterialSidebar; } - (void)applicationAppearanceChanged diff --git a/Sources/App/Classes/Views/User List/TVCMemberListCell.m b/Sources/App/Classes/Views/User List/TVCMemberListCell.m index 3ac91f688..718900a06 100755 --- a/Sources/App/Classes/Views/User List/TVCMemberListCell.m +++ b/Sources/App/Classes/Views/User List/TVCMemberListCell.m @@ -36,7 +36,7 @@ *********************************************************************** */ #import "NSStringHelper.h" -#import "NSTableVIewHelperPrivate.h" +#import "NSTableViewHelperPrivate.h" #import "NSViewHelperPrivate.h" #import "TLOLocalization.h" #import "TPCPreferencesLocal.h" diff --git a/Sources/App/Resources/Language Files/en.lproj/OffTheRecord.strings b/Sources/App/Resources/Language Files/en.lproj/OffTheRecord.strings index 5b5ecf710..739d22c3c 100644 --- a/Sources/App/Resources/Language Files/en.lproj/OffTheRecord.strings +++ b/Sources/App/Resources/Language Files/en.lproj/OffTheRecord.strings @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - *********************************************************************** */ + **********************************************************************\* */ "l49-9y" = "Off-the-Record Messaging: Private conversation started with an UNRECOGNIZED user. Perform authentication."; "r3w-fj" = "Off-the-Record Messaging: Private conversation started with a recognized user."; diff --git a/Sources/App/Resources/Styling/JavaScript/API/private/core/inlineMedia.js b/Sources/App/Resources/Styling/JavaScript/API/private/core/inlineMedia.js index cf249f510..5e108f06d 100755 --- a/Sources/App/Resources/Styling/JavaScript/API/private/core/inlineMedia.js +++ b/Sources/App/Resources/Styling/JavaScript/API/private/core/inlineMedia.js @@ -103,20 +103,20 @@ InlineMediaPrototype.prototype.toggleOnClick = function(mediaId) /* PUBLIC */ InlineMediaPrototype.prototype.show = function(mediaId) /* PUBLIC */ { - this.changeVisiblity(mediaId, "show"); + this.changeVisibility(mediaId, "show"); }; InlineMediaPrototype.prototype.hide = function(mediaId) /* PUBLIC */ { - this.changeVisiblity(mediaId, "hide"); + this.changeVisibility(mediaId, "hide"); }; InlineMediaPrototype.prototype.toggle = function(mediaId) /* PUBLIC */ { - this.changeVisiblity(mediaId, "toggle"); + this.changeVisibility(mediaId, "toggle"); }; -InlineMediaPrototype.prototype.changeVisiblity = function(mediaId, display) /* PRIVATE */ +InlineMediaPrototype.prototype.changeVisibility = function(mediaId, display) /* PRIVATE */ { var mediaElement = document.getInlineMediaById(mediaId); @@ -140,7 +140,7 @@ InlineMediaPrototype.prototype.changeVisiblity = function(mediaId, display) /* P self contained function. This makes it easier to maintain. */ /* Remove media */ - var _changeVisiblityByRemoving = (function() + var _changeVisibilityByRemoving = (function() { if (this.willRemoveMedia(mediaId, mediaElement) === false) { return; @@ -152,7 +152,7 @@ InlineMediaPrototype.prototype.changeVisiblity = function(mediaId, display) /* P }).bind(this); /* Show media */ - var _changeVisiblityByDisplaying = (function() + var _changeVisibilityByDisplaying = (function() { if (this.willShowMedia(mediaId, mediaElement) === false) { return; @@ -164,7 +164,7 @@ InlineMediaPrototype.prototype.changeVisiblity = function(mediaId, display) /* P }).bind(this); /* Load media */ - var _changeVisiblityByLoading = (function() + var _changeVisibilityByLoading = (function() { var anchor = document.getInlineMediaAnchorById(mediaId); @@ -202,14 +202,14 @@ InlineMediaPrototype.prototype.changeVisiblity = function(mediaId, display) /* P the anchor which means the user can shift click that to load the media again if they so choose. */ - _changeVisiblityByRemoving(); + _changeVisibilityByRemoving(); } else if (mediaElement) { /* If the media already exists, then we have nothing to do here other than set the display property. */ - _changeVisiblityByDisplaying(); + _changeVisibilityByDisplaying(); } else { @@ -217,7 +217,7 @@ InlineMediaPrototype.prototype.changeVisiblity = function(mediaId, display) /* P already exist in the DOM, which means we need to fire off a request to load it. */ - _changeVisiblityByLoading(); + _changeVisibilityByLoading(); } }; diff --git a/Sources/App/Resources/Styling/JavaScript/API/private/core/messageBuffer.js b/Sources/App/Resources/Styling/JavaScript/API/private/core/messageBuffer.js index 9c9690c40..41654fd00 100755 --- a/Sources/App/Resources/Styling/JavaScript/API/private/core/messageBuffer.js +++ b/Sources/App/Resources/Styling/JavaScript/API/private/core/messageBuffer.js @@ -71,7 +71,7 @@ are also removed from the relevant buffer. */ _MessageBuffer._loadMessagesBatchSize = 200; /* PRIVATE */ /* _MessageBuffer._loadMessages() sets the following properties -when it performs an action. These proeprties are not used for +when it performs an action. These properties are not used for anything other than state tracking. If false, new messages are loaded, else the event is ignored. */ /* The user can scroll downward while messages are still being @@ -662,7 +662,7 @@ _MessageBuffer.loadMessagesWithJump = function(lineNumber, callbackFunction) /* lineNumberContents, _MessageBuffer._loadMessagesBatchSize, // load X above - _MessageBuffer._loadMessagesBatchSize, // laod X below + _MessageBuffer._loadMessagesBatchSize, // load X below (function(renderedMessages) { requestPayload.renderedMessages = renderedMessages; diff --git a/Sources/App/Resources/Styling/JavaScript/API/private/scroller/automatic.js b/Sources/App/Resources/Styling/JavaScript/API/private/scroller/automatic.js index 71b0763e3..2951a964d 100644 --- a/Sources/App/Resources/Styling/JavaScript/API/private/scroller/automatic.js +++ b/Sources/App/Resources/Styling/JavaScript/API/private/scroller/automatic.js @@ -223,5 +223,5 @@ window.addEventListener("resize", _TextualScroller._documentResizedCallback, fal document.addEventListener("visibilitychange", _TextualScroller._documentVisibilityChangedCallback, false); -/* Populate initial visiblity state and maybe create timer */ +/* Populate initial visibility state and maybe create timer */ _TextualScroller._documentVisibilityChangedCallback(); diff --git a/Sources/App/Resources/Styling/JavaScript/API/private/scroller/state.js b/Sources/App/Resources/Styling/JavaScript/API/private/scroller/state.js index 04d300917..6e233b787 100644 --- a/Sources/App/Resources/Styling/JavaScript/API/private/scroller/state.js +++ b/Sources/App/Resources/Styling/JavaScript/API/private/scroller/state.js @@ -75,7 +75,7 @@ _TextualScroller._documentScrolledCallback = function() /* PRIVATE */ { var scrolledElement = _TextualScroller._scrolledElement; - /* Height of scrollabe area */ + /* Height of scrollable area */ var scrollHeightPrevious = TextualScroller.scrollHeightCurrentValue; var scrollHeightCurrent = scrolledElement.scrollHeight; @@ -90,7 +90,7 @@ _TextualScroller._documentScrolledCallback = function() /* PRIVATE */ /* If nothing changed, we ignore the event. It is possible to receive a scroll event but nothing changes because we ignore elastic scrolling. User can reach bottom, - elsastic scroll, then bounce back. We get notification for + elastic scroll, then bounce back. We get notification for both times we reach bottom, but values do not change. */ if (scrollHeightPrevious === scrollHeightCurrent && scrollPositionPrevious === scrollPositionCurrent) diff --git a/Sources/App/Resources/User Interface/en.lproj/TDCServerPropertiesSheet.xib b/Sources/App/Resources/User Interface/en.lproj/TDCServerPropertiesSheet.xib index bd3b0f7bf..3b7dd8021 100644 --- a/Sources/App/Resources/User Interface/en.lproj/TDCServerPropertiesSheet.xib +++ b/Sources/App/Resources/User Interface/en.lproj/TDCServerPropertiesSheet.xib @@ -1,8 +1,8 @@ - + - + @@ -35,7 +35,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -137,9 +137,9 @@ - + - + @@ -269,7 +269,7 @@ Gw - + @@ -279,7 +279,7 @@ Gw - + @@ -295,7 +295,7 @@ Gw - + @@ -305,7 +305,7 @@ Gw - + @@ -321,7 +321,7 @@ Gw - + @@ -334,7 +334,7 @@ Gw - + @@ -376,7 +376,7 @@ Gw - + @@ -386,7 +386,7 @@ Gw - + @@ -492,7 +492,7 @@ Gw - + @@ -502,7 +502,7 @@ Gw - + @@ -519,7 +519,7 @@ Gw - + @@ -529,7 +529,7 @@ Gw - + @@ -545,7 +545,7 @@ Gw - + @@ -555,7 +555,7 @@ Gw - + @@ -572,7 +572,7 @@ Gw - + @@ -586,7 +586,7 @@ Gw - + @@ -617,7 +617,7 @@ Gw - + @@ -640,7 +640,7 @@ Gw - + @@ -650,7 +650,7 @@ Gw - + @@ -666,7 +666,7 @@ Gw - + @@ -676,7 +676,7 @@ Gw - + @@ -729,7 +729,7 @@ Gw - + @@ -737,7 +737,7 @@ Gw - + @@ -745,7 +745,7 @@ Gw - + @@ -759,7 +759,7 @@ Gw - + @@ -805,7 +805,7 @@ Gw - + @@ -819,7 +819,7 @@ Gw - + @@ -828,7 +828,7 @@ Gw - + @@ -842,7 +842,7 @@ Gw - + @@ -877,7 +877,7 @@ Gw - + @@ -909,7 +909,7 @@ Gw - + @@ -973,7 +973,7 @@ Gw - + @@ -1284,7 +1284,7 @@ Gw - + @@ -1426,7 +1426,7 @@ Gw - + @@ -1466,7 +1466,7 @@ Gw - + @@ -1511,7 +1511,7 @@ Gw - + @@ -1521,7 +1521,7 @@ Gw - + @@ -1537,7 +1537,7 @@ Gw - + @@ -1550,7 +1550,7 @@ Gw - + @@ -1583,7 +1583,7 @@ Gw - + @@ -1593,7 +1593,7 @@ Gw - + @@ -1609,7 +1609,7 @@ Gw - + @@ -1619,7 +1619,7 @@ Gw - + @@ -1651,7 +1651,7 @@ Gw - + @@ -1671,7 +1671,7 @@ Gw - + @@ -1703,7 +1703,7 @@ Gw - + @@ -1715,7 +1715,7 @@ Gw - + @@ -1743,7 +1743,7 @@ Gw - + @@ -1856,7 +1856,7 @@ Gw - + @@ -1864,7 +1864,7 @@ Gw - + @@ -1872,7 +1872,7 @@ Gw - + @@ -1887,7 +1887,7 @@ Gw - + @@ -1902,7 +1902,7 @@ Gw - + @@ -1913,7 +1913,7 @@ Gw - + @@ -1932,7 +1932,7 @@ Gw - + @@ -1955,7 +1955,7 @@ Gw - + @@ -1974,7 +1974,7 @@ Gw - + @@ -1994,7 +1994,7 @@ Gw - + @@ -2072,7 +2072,7 @@ Gw - + @@ -2084,7 +2084,7 @@ Gw - + @@ -2099,7 +2099,7 @@ Gw - + @@ -2185,7 +2185,7 @@ Gw - + @@ -2194,7 +2194,7 @@ Gw - + - + @@ -2314,7 +2314,7 @@ Gw - + @@ -2340,7 +2340,7 @@ Gw - + @@ -2350,7 +2350,7 @@ Gw - + @@ -2376,7 +2376,7 @@ Gw - + @@ -2386,7 +2386,7 @@ Gw - + @@ -2447,7 +2447,7 @@ Gw - + @@ -2457,7 +2457,7 @@ Gw