kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge to master

Browse Source
This commit is contained in:
German Laullom
2010-09-27 11:45:33 -07:00
parent cdd011d993 cad928126e
commit d2c7cfc0d8
238 changed files with 31092 additions and 4674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/views/commit/commit.css
-4
View File
@@ -81,10 +81,6 @@ table.diff {
-webkit-border-radius: 2px;
}
.diff .hunkbutton:hover{
padding: 0 1px 0 1px;
border: 2px solid #3465a4;
}
#selected {
background-color: #B5D5FE !important;
}
html/views/commit/commit.js
+5 -24
View File
@@ -1,7 +1,8 @@
/* Commit: Interface for selecting, staging, discarding, and unstaging
hunks, individual lines, or ranges of lines. */
contextLines = getCookie("GitXContextLines");
var contextLines = 0;
var showNewFile = function(file)
{
setTitle("New file: " + file.path);
@@ -38,24 +39,7 @@ var setTitle = function(status) {
var displayContext = function() {
$("contextSize").style.display = "";
$("contextTitle").style.display = "";
}
var showFileBlame = function(file, cached) {
if (!file) {
setState("No file selected");
return;
}
//setState("blame "+file.path);
var changes = Index.blameFile_(file);
hideNotification();
hideState();
$("diff").style.display = "";
$("diff").innerHTML="<pre>"+changes+"</pre>";
return;
contextLines = $("contextSize").value;
}
var showFileChanges = function(file, cached) {
@@ -68,7 +52,8 @@ var showFileChanges = function(file, cached) {
hideState();
$("contextSize").oninput = function(element) {
contextSize = $("contextSize").value;
contextLines = $("contextSize").value;
Controller.refresh();
}
if (file.status == 0) // New file?
@@ -178,10 +163,6 @@ var diffHeader;
var originalDiff;
var originalCached;
var showFile = function(diff) {
displayDiff(diff,false);
}
var displayDiff = function(diff, cached)
{
diffHeader = diff.split("\n").slice(0,4).join("\n");
html/views/commit/index.html
+7 -23
View File
@@ -8,36 +8,20 @@
<script src="../../lib/keyboardNavigation.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="commit.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script type="text/javascript" src="../../lib/jquery-1.3.2.min.js"></script>
<script src="multipleSelection.js" type="text/javascript" charset="utf-8"></script>
<script src="commit.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" charset="utf-8">
jQuery.noConflict();
jQuery(document).ready(function() {
var fadeInTime = 3;
var timeoutTime = 3;
setTimeout(function(){
jQuery('body').css("visibility", "visible").hide().fadeIn(fadeInTime);
}, timeoutTime);
document.getElementById("contextSize").value = getCookie("GitXContextLines");
jQuery('#contextSize').mouseup(function(){
setCookie("GitXContextLines", document.getElementById("contextSize").value, 10);
document.location.reload();
});
});
</script>
<script src="commit.js" type="text/javascript" chahrset="utf-8"></script>
<script src="multipleSelection.js" type="text/javascript" chahrset="utf-8"></script>
</head>
<body style="visibility: hidden;">
<body>
<h1 id='title'>
<input type="range" min="1" value="2" max="10" id="contextSize" onLoad="this.value = getCookie('GitXContextLines');">
<input type="range" min="0" max="10" value="3" id="contextSize">
<span id="contextTitle">Context:</span>
<span id="status">Nothing to commit</span>
</h1>
<div id="notification" style="display: none;">
<img src="../../images/spinner.gif" alt="Spinner" id="spinner"/>
<div id="notification" style="display:none">
<img src="../../images/spinner.gif" alt="Spinner" id="spinner"></img>
<div id="notification_message"></div>
</div>