diff --git a/GLFileView.m b/GLFileView.m index b374146..90b05ec 100644 --- a/GLFileView.m +++ b/GLFileView.m @@ -77,6 +77,12 @@ id script = [view windowScriptObject]; [script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObject:fileTxt]]; } + +#ifdef DEBUG + NSString *dom=[[[[view mainFrame] DOMDocument] documentElement] outerHTML]; + NSString *tmpFile=@"~/tmp/test.html"; + [dom writeToFile:[tmpFile stringByExpandingTildeInPath] atomically:true encoding:NSUTF8StringEncoding error:nil]; +#endif } #pragma mark JavaScript log.js methods @@ -147,6 +153,7 @@ - (NSString *) parseHTML:(NSString *)txt { + txt=[txt stringByReplacingOccurrencesOfString:@"&" withString:@"&"]; txt=[txt stringByReplacingOccurrencesOfString:@"<" withString:@"<"]; txt=[txt stringByReplacingOccurrencesOfString:@">" withString:@">"]; @@ -180,7 +187,16 @@ summary=[line stringByReplacingOccurrencesOfString:@"summary" withString:@""]; } } - NSString *block=[NSString stringWithFormat:@"

%@

%@

\n\n",author,summary]; + NSRange trunc={0,30}; + NSString *truncate_a=author; + if([author length]>30){ + truncate_a=[author substringWithRange:trunc]; + } + NSString *truncate_s=summary; + if([summary length]>30){ + truncate_s=[summary substringWithRange:trunc]; + } + NSString *block=[NSString stringWithFormat:@"

%@

%@

\n\n",truncate_a,truncate_s]; [headers setObject:block forKey:[header objectAtIndex:0]]; } [res appendString:[headers objectForKey:[header objectAtIndex:0]]]; @@ -189,6 +205,7 @@ do{ line=[lines objectAtIndex:i++]; }while([line characterAtIndex:0]!='\t'); + line=[line substringFromIndex:1]; line=[line stringByReplacingOccurrencesOfString:@"\t" withString:@"    "]; [code appendString:line]; [code appendString:@"\n"]; diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index ff2820e..ea765bb 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -1590,6 +1590,7 @@ buildSettings = { ARCHS = "$(NATIVE_ARCH_ACTUAL)"; GCC_ENABLE_OBJC_GC = required; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = DEBUG_BUILD; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/html/css/shThemeGitX.css b/html/css/shThemeGitX.css index fda832c..e134c46 100644 --- a/html/css/shThemeGitX.css +++ b/html/css/shThemeGitX.css @@ -38,6 +38,8 @@ } .syntaxhighlighter .gutter .line { border-right: 3px solid #6ce26c !important; + display: block !important; + width: 30px !important; } .syntaxhighlighter .gutter .line.highlighted { background-color: #6ce26c !important; diff --git a/html/views/blame/blame.css b/html/views/blame/blame.css index 615575b..c16ffc0 100644 --- a/html/views/blame/blame.css +++ b/html/views/blame/blame.css @@ -13,13 +13,19 @@ body,th, td { background: transparent !important; } +p.summary { +} + p{ margin: 0 !important; padding: 0 !important; + font-size: 11px; + font-family: Menlo, Consolas, 'Bitstream Vera Sans Mono', 'Courier New', Courier, monospace; + white-space: nowrap; } -tr.block.l2 p.summary, tr.block.l3 p.summary, +tr.block.l2 p.summary, tr.block.l1 p.summary{ display: none !important; }