Skip to content

Commit d1d4a2e

Browse files
laullonlaullon
committed
Merge remote branch 'refs/remotes/suranyami/experimental'
2 parents 3092129 + 1c31a4c commit d1d4a2e

File tree

5 files changed

+145
-15
lines changed

5 files changed

+145
-15
lines changed

‎GLFileView.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ - (void) showFile
7777
if ([files count]>0) {
7878
PBGitTree *file=[files objectAtIndex:0];
7979

80-
NSString *fileTxt=@"";
80+
NSString *fileTxt = @"";
8181
if(startFile==@"fileview")
8282
fileTxt=[self parseHTML:[file textContents]];
8383
else if(startFile==@"blame")
@@ -86,7 +86,8 @@ - (void) showFile
8686
fileTxt=[file log:logFormat];
8787

8888
id script = [view windowScriptObject];
89-
[script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObject:fileTxt]];
89+
NSString *filePath = [file fullPath];
90+
[script callWebScriptMethod:@"showFile" withArguments:[NSArray arrayWithObjects:fileTxt, filePath, nil]];
9091
}
9192

9293
#if 0

‎README renamed to ‎README.markdown

File renamed without changes.

‎html/lib/syntaxhighlighter/scripts/shBrushObjC.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ SyntaxHighlighter.brushes.ObjC = function()
5555
};
5656

5757
SyntaxHighlighter.brushes.ObjC.prototype = new SyntaxHighlighter.Highlighter();
58-
SyntaxHighlighter.brushes.ObjC.aliases = ['objc'];
58+
SyntaxHighlighter.brushes.ObjC.aliases = ['objc', 'm', 'h'];
5959

‎html/views/fileview/fileview.js

Lines changed: 114 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,118 @@
1-
var showFile = function(txt) {
2-
$("source").style.display = "";
3-
$("source").innerHTML="<pre class='first-line: 1;brush: objc'>"+txt+"</pre>";
4-
5-
SyntaxHighlighter.defaults['toolbar'] = false;
6-
SyntaxHighlighter.highlight();
7-
8-
return;
1+
var showFile = function(txt, fileName) {
2+
$("source").style.display = "";
3+
var suffix_map = {
4+
"m": "objc",
5+
"h": "objc",
6+
7+
"rb": "ruby",
8+
"rbx": "ruby",
9+
"rjs": "ruby",
10+
"Rakefile": "ruby",
11+
"rake": "ruby",
12+
"gemspec": "ruby",
13+
"irbrc": "ruby",
14+
"capfile": "ruby",
15+
16+
"xml": "xml",
17+
"tld": "xml",
18+
"jsp": "xml",
19+
"pt": "xml",
20+
"cpt": "xml",
21+
"dtml": "xml",
22+
"rss": "xml",
23+
"opml": "xml",
24+
"xsl": "xml",
25+
"xslt": "xml",
26+
27+
"js": "javascript",
28+
"htc": "javascript",
29+
"jsx": "javascript",
30+
"jscript": "javascript",
31+
"javascript": "javascript",
32+
33+
"sql": "sql",
34+
"ddl": "sql",
35+
"dml": "sql",
36+
37+
"sass": "sass",
38+
"scss": "sass",
39+
40+
"sh": "bash",
41+
"bash": "bash",
42+
"zsh": "bash",
43+
"bashrc": "bash",
44+
"bash_profile": "bash",
45+
"bash_login": "bash",
46+
"profile": "bash",
47+
"bash_logout": "bash",
48+
49+
"diff": "diff",
50+
"patch": "diff",
51+
52+
"java": "java",
53+
"bsh": "java",
54+
55+
"css": "css",
56+
"css": "css.erb",
57+
"pl": "perl",
58+
"pm": "perl",
59+
"pod": "perl",
60+
"t": "perl",
61+
"PL": "perl",
62+
63+
"erl": "erlang",
64+
"hrl": "erlang",
65+
66+
"php": "php",
67+
68+
"py": "python",
69+
"rpy": "python",
70+
"pyw": "python",
71+
"cpy": "python",
72+
"SConstruct": "python",
73+
"Sconstruct": "python",
74+
"sconstruct": "python",
75+
"SConscript": "python",
76+
77+
"cc": "cpp",
78+
"cpp": "cpp",
79+
"cp": "cpp",
80+
"cxx": "cpp",
81+
"c++":"cpp",
82+
"C": "cpp",
83+
"h": "cpp",
84+
"hh": "cpp",
85+
"hpp": "cpp",
86+
"cpp": "h++",
87+
"c": "cpp"
88+
}
89+
var brush = "objc";
90+
var suffix = "";
91+
if (fileName && fileName != '') {
92+
suffix = fileName.substr(fileName.lastIndexOf('.') + 1);
93+
}
94+
95+
brush = suffix_map[suffix];
96+
97+
$("source").innerHTML="<pre class='first-line: 1;brush: " + brush + "'>" + txt + "</pre>";
98+
99+
SyntaxHighlighter.defaults['toolbar'] = false;
100+
SyntaxHighlighter.highlight();
101+
102+
return;
9103
}
10104

11105
var test=function(txt) {
12-
SyntaxHighlighter.defaults['toolbar'] = false;
13-
SyntaxHighlighter.highlight();
14-
15-
return;
106+
SyntaxHighlighter.defaults['toolbar'] = false;
107+
SyntaxHighlighter.highlight();
108+
109+
return;
110+
}
111+
112+
var get_keys = function(obj) {
113+
var keys = [];
114+
for (var key in obj) {
115+
keys.push(key);
116+
}
117+
return keys;
16118
}

‎html/views/fileview/index.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,34 @@
22
<head>
33
<script src="../../lib/GitX.js" type="text/javascript" charset="utf-8"></script>
44
<script src="../../lib/syntaxhighlighter/scripts/shCore.js" type="text/javascript" charset="utf-8"></script>
5+
<script src="../../lib/syntaxhighlighter/scripts/shAutoloader.js" type="text/javascript" charset="utf-8"></script>
6+
<script src="../../lib/syntaxhighlighter/scripts/shBrushAS3.js" type="text/javascript" charset="utf-8"></script>
7+
<script src="../../lib/syntaxhighlighter/scripts/shBrushAppleScript.js" type="text/javascript" charset="utf-8"></script>
8+
<script src="../../lib/syntaxhighlighter/scripts/shBrushBash.js" type="text/javascript" charset="utf-8"></script>
9+
<script src="../../lib/syntaxhighlighter/scripts/shBrushCSharp.js" type="text/javascript" charset="utf-8"></script>
10+
<script src="../../lib/syntaxhighlighter/scripts/shBrushColdFusion.js" type="text/javascript" charset="utf-8"></script>
11+
<script src="../../lib/syntaxhighlighter/scripts/shBrushCpp.js" type="text/javascript" charset="utf-8"></script>
12+
<script src="../../lib/syntaxhighlighter/scripts/shBrushCss.js" type="text/javascript" charset="utf-8"></script>
13+
<script src="../../lib/syntaxhighlighter/scripts/shBrushDelphi.js" type="text/javascript" charset="utf-8"></script>
14+
<script src="../../lib/syntaxhighlighter/scripts/shBrushDiff.js" type="text/javascript" charset="utf-8"></script>
15+
<script src="../../lib/syntaxhighlighter/scripts/shBrushErlang.js" type="text/javascript" charset="utf-8"></script>
16+
<script src="../../lib/syntaxhighlighter/scripts/shBrushGroovy.js" type="text/javascript" charset="utf-8"></script>
17+
<script src="../../lib/syntaxhighlighter/scripts/shBrushJScript.js" type="text/javascript" charset="utf-8"></script>
18+
<script src="../../lib/syntaxhighlighter/scripts/shBrushJava.js" type="text/javascript" charset="utf-8"></script>
19+
<script src="../../lib/syntaxhighlighter/scripts/shBrushJavaFX.js" type="text/javascript" charset="utf-8"></script>
520
<script src="../../lib/syntaxhighlighter/scripts/shBrushObjC.js" type="text/javascript" charset="utf-8"></script>
21+
<script src="../../lib/syntaxhighlighter/scripts/shBrushPerl.js" type="text/javascript" charset="utf-8"></script>
22+
<script src="../../lib/syntaxhighlighter/scripts/shBrushPhp.js" type="text/javascript" charset="utf-8"></script>
23+
<script src="../../lib/syntaxhighlighter/scripts/shBrushPlain.js" type="text/javascript" charset="utf-8"></script>
24+
<script src="../../lib/syntaxhighlighter/scripts/shBrushPowerShell.js" type="text/javascript" charset="utf-8"></script>
25+
<script src="../../lib/syntaxhighlighter/scripts/shBrushPython.js" type="text/javascript" charset="utf-8"></script>
26+
<script src="../../lib/syntaxhighlighter/scripts/shBrushRuby.js" type="text/javascript" charset="utf-8"></script>
27+
<script src="../../lib/syntaxhighlighter/scripts/shBrushSass.js" type="text/javascript" charset="utf-8"></script>
28+
<script src="../../lib/syntaxhighlighter/scripts/shBrushScala.js" type="text/javascript" charset="utf-8"></script>
29+
<script src="../../lib/syntaxhighlighter/scripts/shBrushSql.js" type="text/javascript" charset="utf-8"></script>
30+
<script src="../../lib/syntaxhighlighter/scripts/shBrushVb.js" type="text/javascript" charset="utf-8"></script>
31+
<script src="../../lib/syntaxhighlighter/scripts/shBrushXml.js" type="text/javascript" charset="utf-8"></script>
32+
<script src="../../lib/syntaxhighlighter/scripts/shLegacy.js" type="text/javascript" charset="utf-8"></script>
633
<script src="fileview.js" type="text/javascript" charset="utf-8"></script>
734
<link rel="stylesheet" href="source.css" type="text/css" media="screen" title="no title" charset="utf-8">
835
<link rel="stylesheet" href="../../css/shCoreGitX.css" type="text/css" media="screen" title="no title" charset="utf-8">

0 commit comments

Comments
 (0)