Skip to content

Commit 3ee7fb3

Browse files
committed
Added aliases for 'm' & 'h' for objc.
Added a hash of possible values to select the correct brush based on the suffix. This fixes a problem where some suffixes did not match brush aliases.
1 parent 09e25ad commit 3ee7fb3

File tree

3 files changed

+40
-3
lines changed

3 files changed

+40
-3
lines changed

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: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,37 @@
11
var showFile = function(txt, fileName) {
22
$("source").style.display = "";
3+
var suffix_map = {
4+
"objc": ["m", "h"],
5+
"ruby": ["rb", "rbx", "rjs", "Rakefile", "rake", "gemspec", "irbrc", "capfile"],
6+
"xml": ['xml', 'tld', 'jsp', 'pt', 'cpt', 'dtml', 'rss', 'opml', 'xsl', 'xslt'],
7+
"javascript": ['js', 'htc', 'jsx', 'jscript', 'javascript'],
8+
"sql": ['sql', 'ddl', 'dml'],
9+
"sass": ['sass', 'scss'],
10+
"bash": ['sh', 'bash', 'zsh', 'bashrc', 'bash_profile', 'bash_login', 'profile', 'bash_logout'],
11+
"diff": ['diff', 'patch'],
12+
"java": ['java', 'bsh'],
13+
"css": ['css', 'css.erb'],
14+
"perl": ['pl', 'pm', 'pod', 't', 'PL'],
15+
"erlang": ['erl', 'hrl'],
16+
"php": ['php'],
17+
"python": ['py', 'rpy', 'pyw', 'cpy', 'SConstruct', 'Sconstruct', 'sconstruct', 'SConscript'],
18+
"cpp": ['cc', 'cpp', 'cp', 'cxx', 'c++', 'C', 'h', 'hh', 'hpp', 'h++', 'c']
19+
}
320
var brush = "objc";
21+
var suffix = "";
422
if (fileName && fileName != '') {
5-
brush = fileName.substr(fileName.lastIndexOf('.') + 1);
23+
suffix = fileName.substr(fileName.lastIndexOf('.') + 1);
24+
}
25+
var keys = get_keys(suffix_map);
26+
for (var key in keys) {
27+
var suffixes = suffix_map[key];
28+
for (var possible_suffix in suffixes) {
29+
if (possible_suffix == suffix) {
30+
brush = key;
31+
}
32+
}
633
}
34+
735
$("source").innerHTML="<pre class='first-line: 1;brush: " + brush + "'>" + txt + "</pre>";
836

937
SyntaxHighlighter.defaults['toolbar'] = false;
@@ -18,3 +46,11 @@ var test=function(txt) {
1846

1947
return;
2048
}
49+
50+
var get_keys = function(obj) {
51+
var keys = [];
52+
for (var key in obj) {
53+
keys.push(key);
54+
}
55+
return keys;
56+
}

html/views/fileview/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
<script src="../../lib/syntaxhighlighter/scripts/shBrushVb.js" type="text/javascript" charset="utf-8"></script>
3131
<script src="../../lib/syntaxhighlighter/scripts/shBrushXml.js" type="text/javascript" charset="utf-8"></script>
3232
<script src="../../lib/syntaxhighlighter/scripts/shCore.js" type="text/javascript" charset="utf-8"></script>
33-
<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>
33+
<script src="../../lib/syntaxhighlighter/scripts/shLegacy.js" type="text/javascript" charset="utf-8"></script>
34+
<script src="fileview.js" type="text/javascript" charset="utf-8"></script>
3435
<link rel="stylesheet" href="source.css" type="text/css" media="screen" title="no title" charset="utf-8">
3536
<link rel="stylesheet" href="../../css/shCoreGitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
3637
<link rel="stylesheet" href="../../css/shThemeGitX.css" type="text/css" media="screen" title="no title" charset="utf-8">

0 commit comments

Comments
 (0)