Skip to content

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

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.

Sign up for GitHub

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

Open
suranyami wants to merge 7 commits into
base: experimental
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
14a1b61
Now passing the full file path to the Javascript "showFile" method, so
suranyami Nov 24, 2010
4e208d5
Reading the full file path, extracting the suffix, then using that to…
suranyami Nov 24, 2010
e12180a
Now importing all the syntax highlighting brush files, so we can use …
suranyami Nov 24, 2010
09e25ad
Changed name of README to README.markdown, so that Github automatically
suranyami Nov 24, 2010
3ee7fb3
Added aliases for 'm' & 'h' for objc.
suranyami Nov 24, 2010
a8ff004
Changed the structure of the suffix-brush mapping, so the code is muc…
suranyami Nov 24, 2010
1c31a4c
Fixed silly mistake with duplicated shCore.js included.
suranyami Nov 25, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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.
  • Loading branch information
@suranyami
suranyami committed Nov 24, 2010
commit 3ee7fb304237e196104f6ab698f4486cf4fdbc1c
2 changes: 1 addition & 1 deletion html/lib/syntaxhighlighter/scripts/shBrushObjC.js
View file
Open in desktop
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'];

38 changes: 37 additions & 1 deletion html/views/fileview/fileview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
var showFile = function(txt, fileName) {
$("source").style.display = "";
var suffix_map = {
"objc": ["m", "h"],
"ruby": ["rb", "rbx", "rjs", "Rakefile", "rake", "gemspec", "irbrc", "capfile"],
"xml": ['xml', 'tld', 'jsp', 'pt', 'cpt', 'dtml', 'rss', 'opml', 'xsl', 'xslt'],
"javascript": ['js', 'htc', 'jsx', 'jscript', 'javascript'],
"sql": ['sql', 'ddl', 'dml'],
"sass": ['sass', 'scss'],
"bash": ['sh', 'bash', 'zsh', 'bashrc', 'bash_profile', 'bash_login', 'profile', 'bash_logout'],
"diff": ['diff', 'patch'],
"java": ['java', 'bsh'],
"css": ['css', 'css.erb'],
"perl": ['pl', 'pm', 'pod', 't', 'PL'],
"erlang": ['erl', 'hrl'],
"php": ['php'],
"python": ['py', 'rpy', 'pyw', 'cpy', 'SConstruct', 'Sconstruct', 'sconstruct', 'SConscript'],
"cpp": ['cc', 'cpp', 'cp', 'cxx', 'c++', 'C', 'h', 'hh', 'hpp', 'h++', 'c']
}
var brush = "objc";
var suffix = "";
if (fileName && fileName != '') {
brush = fileName.substr(fileName.lastIndexOf('.') + 1);
suffix = fileName.substr(fileName.lastIndexOf('.') + 1);
}
var keys = get_keys(suffix_map);
for (var key in keys) {
var suffixes = suffix_map[key];
for (var possible_suffix in suffixes) {
if (possible_suffix == suffix) {
brush = key;
}
}
}

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

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

return;
}

var get_keys = function(obj) {
var keys = [];
for (var key in obj) {
keys.push(key);
}
return keys;
}
3 changes: 2 additions & 1 deletion html/views/fileview/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<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/shCore.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>
<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">
<link rel="stylesheet" href="../../css/shThemeGitX.css" type="text/css" media="screen" title="no title" charset="utf-8">
Expand Down