Skip to content

Commit

Permalink
Small change.
Browse files Browse the repository at this point in the history
  • Loading branch information
emsquared committed Jul 26, 2012
1 parent 698aeb5 commit e11e63d
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 56 deletions.
4 changes: 2 additions & 2 deletions Classes/Views/Channel View/TVCLogController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ - (BOOL)print:(TVCLogLine *)line withHTML:(BOOL)rawHTML
@"imageURL" : imageUrl,
@"anchorLink" : url,
@"preferredMaximumWidth" : @([TPCPreferences inlineImagesMaxWidth]),
@"localizedHideTitle" : TXTLS(@"LogViewHideInlineImageMessage"),
@"localizedHideImageTitle" : TXTLS(@"LogViewHideInlineImageMessage"),
}];
}

Expand Down Expand Up @@ -898,7 +898,7 @@ - (void)writeLine:(id)line attributes:(NSMutableDictionary *)attrs
[self setNeedsLimitNumberOfLines];
}

if ([attrs[@"highlight"] isEqualToString:@"true"]) {
if ([attrs[@"highlightAttributeRepresentation"] isEqualToString:@"true"]) {
[self.highlightedLineNumbers safeAddObject:@(self.lineNumber)];
}

Expand Down
2 changes: 1 addition & 1 deletion Main Project (Textual).xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@
4CCF2F161580481E006FFE21 /* FormattingColor_13.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FormattingColor_13.png; path = "Resources/Images/IRC Formatting Colors/FormattingColor_13.png"; sourceTree = SOURCE_ROOT; };
4CCF2F171580481E006FFE21 /* FormattingColor_14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FormattingColor_14.png; path = "Resources/Images/IRC Formatting Colors/FormattingColor_14.png"; sourceTree = SOURCE_ROOT; };
4CCF2F181580481E006FFE21 /* FormattingColor_15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FormattingColor_15.png; path = "Resources/Images/IRC Formatting Colors/FormattingColor_15.png"; sourceTree = SOURCE_ROOT; };
4CCF2F5315804888006FFE21 /* core.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = core.js; path = Resources/Javascript/API/core.js; sourceTree = SOURCE_ROOT; };
4CCF2F5315804888006FFE21 /* core.js */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; name = core.js; path = Resources/Javascript/API/core.js; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down
4 changes: 2 additions & 2 deletions Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<key>TXBundleBuildCodeName</key>
<string>Turtle Soup</string>
<key>TXBundleBuildNumber</key>
<string>12099</string>
<string>12112</string>
<key>TXBundleBuildReference</key>
<string>2.1.1-256-g0a72d38-debug,llvm4.0</string>
<string>2.1.1-257-g698aeb5-appstore,llvm4.0</string>
</dict>
</plist>
56 changes: 6 additions & 50 deletions Resources/Localization/English.lproj/TXCMainMenu.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12A248</string>
<string key="IBDocument.InterfaceBuilderVersion">2541</string>
<string key="IBDocument.AppKitVersion">1183</string>
<string key="IBDocument.HIToolboxVersion">622.00</string>
<string key="IBDocument.SystemVersion">12A269</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
<string key="IBDocument.AppKitVersion">1187</string>
<string key="IBDocument.HIToolboxVersion">624.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">2541</string>
<string key="NS.object.0">2549</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSBox</string>
Expand Down Expand Up @@ -617,8 +617,7 @@
<object class="NSMenuItem" id="371128240">
<reference key="NSMenu" ref="100171152"/>
<string key="NSTitle">Add Server…</string>
<string key="NSKeyEquiv">+</string>
<int key="NSKeyEquivModMask">1048576</int>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="222848805"/>
<reference key="NSMixedImage" ref="852898728"/>
Expand Down Expand Up @@ -3048,7 +3047,6 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{188, 513}</string>
<reference key="NSSuperview" ref="649664949"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="718755093"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
Expand Down Expand Up @@ -3155,7 +3153,6 @@
</array>
<string key="NSFrameSize">{188, 513}</string>
<reference key="NSSuperview" ref="230253150"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="122861396"/>
<reference key="NSDocView" ref="122861396"/>
<reference key="NSBGColor" ref="375145136"/>
Expand All @@ -3166,7 +3163,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{173, 0}, {15, 514.82600000000002}}</string>
<reference key="NSSuperview" ref="230253150"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="314651887"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="230253150"/>
Expand All @@ -3178,7 +3174,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {223, 15}}</string>
<reference key="NSSuperview" ref="230253150"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="649664949"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
Expand All @@ -3189,7 +3184,6 @@
</array>
<string key="NSFrameSize">{188, 513}</string>
<reference key="NSSuperview" ref="100056217"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="649664949"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="678251316"/>
Expand All @@ -3213,13 +3207,11 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{240, 513}</string>
<reference key="NSSuperview" ref="84464222"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="752371143"/>
</object>
</array>
<string key="NSFrameSize">{240, 513}</string>
<reference key="NSSuperview" ref="314651887"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="748099495"/>
<bool key="NSViewCanDrawConcurrently">YES</bool>
<string key="NSOffsets">{0, 0}</string>
Expand Down Expand Up @@ -3265,7 +3257,6 @@
<int key="NSvFlags">4353</int>
<string key="NSFrameSize">{223, 513}</string>
<reference key="NSSuperview" ref="337544634"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="941879084"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
Expand Down Expand Up @@ -3329,7 +3320,6 @@
</array>
<string key="NSFrameSize">{223, 513}</string>
<reference key="NSSuperview" ref="610795041"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="92185248"/>
<reference key="NSDocView" ref="92185248"/>
<reference key="NSBGColor" ref="375145136"/>
Expand All @@ -3340,7 +3330,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{212, 0}, {15, 517.93600000000004}}</string>
<reference key="NSSuperview" ref="610795041"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="743325937"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="610795041"/>
Expand All @@ -3352,7 +3341,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {224.64500000000001, 15}}</string>
<reference key="NSSuperview" ref="610795041"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="337544634"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
Expand All @@ -3363,7 +3351,6 @@
</array>
<string key="NSFrame">{{-1, 0}, {223, 513}}</string>
<reference key="NSSuperview" ref="752371143"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="337544634"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="676679988"/>
Expand All @@ -3377,22 +3364,19 @@
</array>
<string key="NSFrame">{{241, 0}, {222, 513}}</string>
<reference key="NSSuperview" ref="314651887"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="610795041"/>
<string key="NSClassName">NSView</string>
</object>
</array>
<string key="NSFrame">{{189, 0}, {463, 513}}</string>
<reference key="NSSuperview" ref="100056217"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="84464222"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
</object>
</array>
<string key="NSFrame">{{0, 37}, {652, 513}}</string>
<reference key="NSSuperview" ref="606779342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="230253150"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
Expand All @@ -3402,7 +3386,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{30, 284}, {101, 19}}</string>
<reference key="NSSuperview" ref="606779342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="587733408"/>
<string key="NSReuseIdentifierKey">_NS:1534</string>
<bool key="NSEnabled">YES</bool>
Expand Down Expand Up @@ -3432,7 +3415,6 @@
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrame">{{144, 6}, {498, 23}}</string>
<reference key="NSSuperview" ref="606779342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="613525633"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">TVCInputTextFieldBackground</string>
Expand All @@ -3448,28 +3430,8 @@
<object class="NSTextView" id="474308682">
<reference key="NSNextResponder" ref="915392651"/>
<int key="NSvFlags">2330</int>
<set class="NSMutableSet" key="NSDragTypes">
<string>Apple HTML pasteboard type</string>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple PNG pasteboard type</string>
<string>Apple URL pasteboard type</string>
<string>CorePasteboardFlavorType 0x6D6F6F76</string>
<string>NSColor pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NSStringPboardType</string>
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT RTFD pasteboard type</string>
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
<string>NeXT font pasteboard type</string>
<string>NeXT ruler pasteboard type</string>
<string>WebURLsWithTitlesPboardType</string>
<string>public.url</string>
</set>
<string key="NSFrameSize">{498, 18}</string>
<reference key="NSSuperview" ref="915392651"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1016719665"/>
<string key="NSReuseIdentifierKey">_NS:3760</string>
<object class="NSTextContainer" key="NSTextContainer" id="986559100">
Expand Down Expand Up @@ -3529,7 +3491,6 @@
</array>
<string key="NSFrameSize">{498, 18}</string>
<reference key="NSSuperview" ref="613525633"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="474308682"/>
<string key="NSReuseIdentifierKey">_NS:3758</string>
<reference key="NSDocView" ref="474308682"/>
Expand Down Expand Up @@ -3565,7 +3526,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{481, 1}, {16, 13}}</string>
<reference key="NSSuperview" ref="613525633"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:3774</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="613525633"/>
Expand All @@ -3577,7 +3537,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="613525633"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="915392651"/>
<string key="NSReuseIdentifierKey">_NS:3762</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
Expand All @@ -3590,7 +3549,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</array>
<string key="NSFrame">{{144, 9}, {498, 18}}</string>
<reference key="NSSuperview" ref="606779342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="915392651"/>
<string key="NSReuseIdentifierKey">_NS:148</string>
<int key="NSsFlags">133648</int>
Expand All @@ -3606,7 +3564,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">260</int>
<string key="NSFrame">{{10, 5}, {124, 25}}</string>
<reference key="NSSuperview" ref="606779342"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="305722326"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
Expand Down Expand Up @@ -3660,7 +3617,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</array>
<string key="NSFrameSize">{652, 550}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="100056217"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Styles/Style Default Templates/newMessagePostedWithSender.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

{{#inlineMediaAvailable}}
{{#inlineMediaArray}}
<a href="{{{anchorLink}}}" onclick="return Textual.hideInlineImage(this)"><img src="{{{imageURL}}}" class="inlineimage" style="max-width: {{preferredMaximumWidth}}px;" title="{{localizedHideTitle}}" /></a>
<a href="{{{anchorLink}}}" onclick="return Textual.hideInlineImage(this)"><img src="{{{imageURL}}}" class="inlineimage" style="max-width: {{preferredMaximumWidth}}px;" title="{{localizedHideImageTitle}}" /></a>
{{/inlineMediaArray}}
{{/inlineMediaAvailable}}
</span>
Expand Down

0 comments on commit e11e63d

Please sign in to comment.