diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2016-07-03 00:20:27 -0700 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2016-07-03 00:20:27 -0700 |
| commit | 9a53b0f44a67905e6d0b45b264ebcccf88485dc5 (patch) | |
| tree | c921e11eaacc8ff9f7b38be310d5d99bab9f47f6 /guides/source | |
| parent | 173bf3506d99c0767a41d30fbe4d306201369194 (diff) | |
| download | rails-9a53b0f44a67905e6d0b45b264ebcccf88485dc5.tar.gz rails-9a53b0f44a67905e6d0b45b264ebcccf88485dc5.tar.bz2 rails-9a53b0f44a67905e6d0b45b264ebcccf88485dc5.zip | |
- Update Syntax Highlighter to version 4.
- Build Syntax Highlighter based on https://github.com/syntaxhighlighter/syntaxhighlighter/wiki/Building and use theme generated by fxn.
- This also bundles these brushes in the file itself- ruby,css,xml,sql,javascript,plain. Generation command used:
gulp build --compat --brushes=javascript,ruby,xml,sql,plain --theme=/Path/To/RailsSource/rails/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
- rm all old js and css files
- Moved over how JS configuration is created for Syntax Highlighter
- Fixed layout for all imports
- Fixes bug with old copy paste, generating wrong space character on webkit https://github.com/syntaxhighlighter/syntaxhighlighter/blob/7caa9632e7fe470d944fc06b4db7d35352ebaa36/src/dom.js#L227
Fixes #25655
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/layout.html.erb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/guides/source/layout.html.erb b/guides/source/layout.html.erb index 9abb863da6..943fd3fd7f 100644 --- a/guides/source/layout.html.erb +++ b/guides/source/layout.html.erb @@ -127,13 +127,11 @@ <script type="text/javascript" src="javascripts/jquery.min.js"></script> <script type="text/javascript" src="javascripts/responsive-tables.js"></script> <script type="text/javascript" src="javascripts/guides.js"></script> - <script type="text/javascript" src="javascripts/syntaxhighlighter/shCore.js"></script> - <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushRuby.js"></script> - <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushXml.js"></script> - <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushSql.js"></script> - <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushPlain.js"></script> + <script type="text/javascript" src="javascripts/syntaxhighlighter.js"></script> <script type="text/javascript"> - SyntaxHighlighter.all(); + syntaxhighlighterConfig = { + autoLinks: false, + }; $(guidesIndex.bind); </script> </body> |