Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syntax Highlighting, now Fixed silly mistake with duplicated shCore.js #80

Open
wants to merge 7 commits into
base: experimental
Choose a base branch
from
5 changes: 3 additions & 2 deletions GLFileView.m
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ - (void) showFile
if ([files count]>0) {
PBGitTree *file=[files objectAtIndex:0];

NSString *fileTxt=@"";
NSString *fileTxt = @"";
if(startFile==@"fileview")
fileTxt=[self parseHTML:[file textContents]];
else if(startFile==@"blame")
Expand All @@ -86,7 +86,8 @@ - (void) showFile
fileTxt=[file log:logFormat];

id script = [view windowScriptObject];
[script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObject:fileTxt]];
NSString *filePath = [file fullPath];
[script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObjects:fileTxt, filePath, nil]];
}

#if 0
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion html/lib/syntaxhighlighter/scripts/shBrushObjC.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ SyntaxHighlighter.brushes.ObjC = function()
};

SyntaxHighlighter.brushes.ObjC.prototype = new SyntaxHighlighter.Highlighter();
SyntaxHighlighter.brushes.ObjC.aliases = ['objc'];
SyntaxHighlighter.brushes.ObjC.aliases = ['objc', 'm', 'h'];

126 changes: 114 additions & 12 deletions html/views/fileview/fileview.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,118 @@
var showFile = function(txt) {
$("source").style.display = "";
$("source").innerHTML="<pre class='first-line: 1;brush: objc'>"+txt+"</pre>";

SyntaxHighlighter.defaults['toolbar'] = false;
SyntaxHighlighter.highlight();

return;
var showFile = function(txt, fileName) {
$("source").style.display = "";
var suffix_map = {
"m": "objc",
"h": "objc",

"rb": "ruby",
"rbx": "ruby",
"rjs": "ruby",
"Rakefile": "ruby",
"rake": "ruby",
"gemspec": "ruby",
"irbrc": "ruby",
"capfile": "ruby",

"xml": "xml",
"tld": "xml",
"jsp": "xml",
"pt": "xml",
"cpt": "xml",
"dtml": "xml",
"rss": "xml",
"opml": "xml",
"xsl": "xml",
"xslt": "xml",

"js": "javascript",
"htc": "javascript",
"jsx": "javascript",
"jscript": "javascript",
"javascript": "javascript",

"sql": "sql",
"ddl": "sql",
"dml": "sql",

"sass": "sass",
"scss": "sass",

"sh": "bash",
"bash": "bash",
"zsh": "bash",
"bashrc": "bash",
"bash_profile": "bash",
"bash_login": "bash",
"profile": "bash",
"bash_logout": "bash",

"diff": "diff",
"patch": "diff",

"java": "java",
"bsh": "java",

"css": "css",
"css": "css.erb",
"pl": "perl",
"pm": "perl",
"pod": "perl",
"t": "perl",
"PL": "perl",

"erl": "erlang",
"hrl": "erlang",

"php": "php",

"py": "python",
"rpy": "python",
"pyw": "python",
"cpy": "python",
"SConstruct": "python",
"Sconstruct": "python",
"sconstruct": "python",
"SConscript": "python",

"cc": "cpp",
"cpp": "cpp",
"cp": "cpp",
"cxx": "cpp",
"c++":"cpp",
"C": "cpp",
"h": "cpp",
"hh": "cpp",
"hpp": "cpp",
"cpp": "h++",
"c": "cpp"
}
var brush = "objc";
var suffix = "";
if (fileName && fileName != '') {
suffix = fileName.substr(fileName.lastIndexOf('.') + 1);
}

brush = suffix_map[suffix];

$("source").innerHTML="<pre class='first-line: 1;brush: " + brush + "'>" + txt + "</pre>";

SyntaxHighlighter.defaults['toolbar'] = false;
SyntaxHighlighter.highlight();

return;
}

var test=function(txt) {
SyntaxHighlighter.defaults['toolbar'] = false;
SyntaxHighlighter.highlight();

return;
SyntaxHighlighter.defaults['toolbar'] = false;
SyntaxHighlighter.highlight();

return;
}

var get_keys = function(obj) {
var keys = [];
for (var key in obj) {
keys.push(key);
}
return keys;
}
27 changes: 27 additions & 0 deletions html/views/fileview/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,34 @@
<head>
<script src="../../lib/GitX.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shCore.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shAutoloader.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushAS3.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushAppleScript.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushBash.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushCSharp.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushColdFusion.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushCpp.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushCss.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushDelphi.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushDiff.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushErlang.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushGroovy.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushJScript.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushJava.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushJavaFX.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushObjC.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushPerl.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushPhp.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushPlain.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushPowerShell.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushPython.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushRuby.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushSass.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushScala.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushSql.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushVb.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shBrushXml.js" type="text/javascript" charset="utf-8"></script>
<script src="../../lib/syntaxhighlighter/scripts/shLegacy.js" type="text/javascript" charset="utf-8"></script>
<script src="fileview.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="source.css" type="text/css" media="screen" title="no title" charset="utf-8">
<link rel="stylesheet" href="../../css/shCoreGitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
Expand Down