fix code view indentation

tokarchuk/v1.17
slene 11 years ago
parent 97e82a0ff6
commit 559cd63fc5
  1. 5
      public/css/markdown.css
  2. 42
      public/js/app.js
  3. 4
      templates/repo/single_file.tmpl

@ -135,13 +135,12 @@
box-shadow: inset 40px 0 0 #f5f5f5, inset 41px 0 0 #ccc; box-shadow: inset 40px 0 0 #f5f5f5, inset 41px 0 0 #ccc;
} }
.markdown > pre > code, .markdown > pre > code {
.markdown > pre > ol.linenums > li > code {
white-space: pre; white-space: pre;
word-wrap: normal; word-wrap: normal;
} }
.markdown > pre > ol.linenums > li > code { .markdown > pre > ol.linenums > li {
padding: 0 10px; padding: 0 10px;
} }

@ -110,6 +110,28 @@ var Gogits = {
$pre.addClass('prettyprint linenums'); $pre.addClass('prettyprint linenums');
prettyPrint(); prettyPrint();
// Set anchor.
var headers = {};
$md.find('h1, h2, h3, h4, h5, h6').each(function () {
var node = $(this);
var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\w\- ]/g, '').replace(/[ ]/g, '-'));
var name = val;
if (headers[val] > 0) {
name = val + '-' + headers[val];
}
if (headers[val] == undefined) {
headers[val] = 1;
} else {
headers[val] += 1;
}
node = node.wrap('<div id="' + name + '" class="anchor-wrap" ></div>');
node.append('<a class="anchor" href="#' + name + '"><span class="octicon octicon-link"></span></a>');
});
}
Gogits.renderCodeView = function () {
$('.code-view .lines-code > pre').each(function(){
var $pre = $(this);
var $lineNums = $pre.parent().siblings('.lines-num'); var $lineNums = $pre.parent().siblings('.lines-num');
if ($lineNums.length > 0) { if ($lineNums.length > 0) {
var nums = $pre.find('ol.linenums > li').length; var nums = $pre.find('ol.linenums > li').length;
@ -128,25 +150,8 @@ var Gogits = {
window.location.href = '#' + $e.attr('id'); window.location.href = '#' + $e.attr('id');
}); });
} }
// Set anchor.
var headers = {};
$md.find('h1, h2, h3, h4, h5, h6').each(function () {
var node = $(this);
var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\w\- ]/g, '').replace(/[ ]/g, '-'));
var name = val;
if (headers[val] > 0) {
name = val + '-' + headers[val];
}
if (headers[val] == undefined) {
headers[val] = 1;
} else {
headers[val] += 1;
}
node = node.wrap('<div id="' + name + '" class="anchor-wrap" ></div>');
node.append('<a class="anchor" href="#' + name + '"><span class="octicon octicon-link"></span></a>');
}); });
} };
})(jQuery); })(jQuery);
@ -177,6 +182,7 @@ function initCore() {
Gogits.initModals(); Gogits.initModals();
Gogits.initDropDown(); Gogits.initDropDown();
Gogits.renderMarkdown(); Gogits.renderMarkdown();
Gogits.renderCodeView();
} }
function initRegister() { function initRegister() {

@ -16,12 +16,12 @@
{{.FileContent|str2html}} {{.FileContent|str2html}}
</div> </div>
{{else}} {{else}}
<div class="panel-body file-body file-code"> <div class="panel-body file-body file-code code-view">
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td class="lines-num"></td> <td class="lines-num"></td>
<td class="lines-code markdown"><pre class="linenums lang-{{.FileExt}}"><code>{{.FileContent}}</code></pre></td> <td class="lines-code markdown"><pre class="prettyprint linenums lang-{{.FileExt}}">{{.FileContent}}</pre></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

Loading…
Cancel
Save