tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	public/js/app.js
This commit is contained in:
FuXiaoHei 2014-03-20 21:29:02 +08:00
commit 7f1fdf441f
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public/css/gogs.css
View file

@ -647,6 +647,9 @@ html, body {
padding: 30px 30px 50px; padding: 30px 30px 50px;
border: none; border: none;
background-color: #FFF; background-color: #FFF;
overflow: auto;
overflow-x: auto;
overflow-y: hidden;
} }
.file-content .file-body pre { .file-content .file-body pre {

48
public/js/app.js
View file

@ -72,18 +72,16 @@ var Gogits = {
prettyPrint(); prettyPrint();
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;
for (var i = 1; i <= nums; i++) { for(var i=0;i < nums;i++){
$lineNums.append('<span id="L' + i + '" rel=".L' + i + '">' + i + '</span>'); $lineNums.append('<span id="L'+i+'" rel=".L'+i+'">'+(i+1)+'</span>');
} }
var last; var last;
$(document).on('click', '.lines-num span', function () { $(document).on('click', '.lines-num span', function(){
var $e = $(this); var $e = $(this);
console.log($e.parent().siblings('.lines-code').find('ol.linenums > ' + $e.attr('rel'))); if(last){
console.log('ol.linenums > ' + $e.attr('rel'));
if (last) {
last.removeClass('active'); last.removeClass('active');
} }
last = $e.parent().siblings('.lines-code').find('ol.linenums > ' + $e.attr('rel')); last = $e.parent().siblings('.lines-code').find('ol.linenums > ' + $e.attr('rel'));
@ -98,12 +96,12 @@ var Gogits = {
var node = $(this); var node = $(this);
var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\w\- ]/g, '').replace(/[ ]/g, '-')); var val = encodeURIComponent(node.text().toLowerCase().replace(/[^\w\- ]/g, '').replace(/[ ]/g, '-'));
var name = val; var name = val;
if (headers[val] > 0) { if(headers[val] > 0){
name = val + '-' + headers[val]; name = val + '-' + headers[val];
} }
if (headers[val] == undefined) { if(headers[val] == undefined){
headers[val] = 1; headers[val] = 1;
} else { }else{
headers[val] += 1; headers[val] += 1;
} }
node = node.wrap('<div id="' + name + '" class="anchor-wrap" ></div>'); node = node.wrap('<div id="' + name + '" class="anchor-wrap" ></div>');
@ -183,22 +181,20 @@ function initUserSetting() {
} }
function initRepository() { function initRepository() {
(function () { var $guide = $('.guide-box');
var $guide = $('.guide-box'); if ($guide.length) {
if ($guide.length) { var $url = $('#guide-clone-url');
var $url = $('#guide-clone-url'); $guide.find('button[data-url]').on("click",function () {
$guide.find('button[data-url]').on("click",function () { var $this = $(this);
var $this = $(this); if (!$this.hasClass('btn-primary')) {
if (!$this.hasClass('btn-primary')) { $guide.find('.btn-primary').removeClass('btn-primary').addClass("btn-default");
$guide.find('.btn-primary').removeClass('btn-primary').addClass("btn-default"); $(this).addClass('btn-primary').removeClass('btn-default');
$(this).addClass('btn-primary').removeClass('btn-default'); $url.val($this.data("url"));
$url.val($this.data("url")); $guide.find('span.clone-url').text($this.data('url'));
$guide.find('span.clone-url').text($this.data('url')); }
} }).eq(0).trigger("click");
}).eq(0).trigger("click"); // todo copy to clipboard
// todo copy to clipboard }
}
})();
} }
(function ($) { (function ($) {