summaryrefslogtreecommitdiffstats
path: root/public
diff options
context:
space:
mode:
authorRory McNamara <psychomario@users.noreply.github.com>2016-08-09 20:35:20 +0100
committer无闻 <u@gogs.io>2016-08-09 12:35:20 -0700
commitc8b45ecc2762a9d64dbe83cafd68b137661448a5 (patch)
treedf16d7b1b41d3fcade098cfe550cc61955d048c6 /public
parent9e8a8867ea3b4c977b436951a28d84e0c2ad2e4b (diff)
downloadgitea-c8b45ecc2762a9d64dbe83cafd68b137661448a5.tar.gz
gitea-c8b45ecc2762a9d64dbe83cafd68b137661448a5.zip
Render the Code view on the server (minus syntax highlighting) (#2942)
* render code view server side * remove debug print * fix multiline selection bug * change string concatenation to bytes.Buffer for efficiency * Fix newlines added by previous for hljs * fix selection highlighting * make css changes in .less
Diffstat (limited to 'public')
-rw-r--r--public/css/gogs.css2
-rw-r--r--public/js/gogs.js18
-rw-r--r--public/less/_repository.less2
3 files changed, 5 insertions, 17 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css
index ae58c7c54e..c39c52ca22 100644
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1316,6 +1316,8 @@ footer .ui.language .menu {
.repository.file.list #file-content .code-view .lines-num .hljs li,
.repository.file.list #file-content .code-view .lines-code .hljs li {
padding-left: 5px;
+ display: inline-block;
+ width: 100%;
}
.repository.file.list #file-content .code-view .lines-num pre li.active,
.repository.file.list #file-content .code-view .lines-code pre li.active,
diff --git a/public/js/gogs.js b/public/js/gogs.js
index 226bb6bae5..c6a1b6b624 100644
--- a/public/js/gogs.js
+++ b/public/js/gogs.js
@@ -1088,7 +1088,7 @@ $(window).load(function () {
b = c;
}
var classes = [];
- for (i = a; i <= b; i++) {
+ for (var i = a; i <= b; i++) {
classes.push('.L' + i);
}
$list.filter(classes.join(',')).addClass('active');
@@ -1102,22 +1102,6 @@ $(window).load(function () {
// Code view.
if ($('.code-view .linenums').length > 0) {
- var $block = $('.code-view .linenums');
- var lines = $block.html().split("\n");
- $block.html('');
-
- var $num_list = $('.code-view .lines-num');
-
- // Building blocks.
- var $toappendblock = [];
- var $toappendnum_list = [];
- for (var i = 0; i < lines.length; i++) {
- $toappendblock.push('<li class="L' + (i + 1) + '" rel="L' + (i + 1) + '">' + lines[i] + '</li>');
- $toappendnum_list.push('<span id="L' + (i + 1) + '">' + (i + 1) + '</span>');
- }
- $block.append($toappendblock.join(''));
- $num_list.append($toappendnum_list.join(''));
-
$(document).on('click', '.lines-num span', function (e) {
var $select = $(this);
var $list = $select.parent().siblings('.lines-code').find('ol.linenums > li');
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 474b8ade6d..cb1cc121ce 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -251,6 +251,8 @@
padding: 0 !important;
li {
padding-left: 5px;
+ display: inline-block;
+ width: 100%;
&.active {
background: #ffffdd;
}