mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Pieter de Bie
ab2ddd87cc
Just before releasing 0.6, I cleaned up some old code.
In c6895105e2 (Remove old code in Commit/Diff views),
I removed some pre and code tags, causing new files
in the commit view to be displayed without line breaks
119 lines
2.8 KiB
JavaScript
119 lines
2.8 KiB
JavaScript
var showNewFile = function(file)
|
|
{
|
|
setTitle("New file: " + file.path);
|
|
|
|
var contents = IndexController.unstagedChangesForFile_(file);
|
|
if (!contents) {
|
|
notify("Can not display changes (Binary file?)", -1);
|
|
diff.innerHTML = "";
|
|
return;
|
|
}
|
|
|
|
diff.innerHTML = "<pre>" + contents.escapeHTML() + "</pre>";
|
|
diff.style.display = '';
|
|
}
|
|
|
|
var hideState = function() {
|
|
$("state").style.display = "none";
|
|
}
|
|
|
|
var setState = function(state) {
|
|
setTitle(state);
|
|
hideNotification();
|
|
$("state").style.display = "";
|
|
$("diff").style.display = "none";
|
|
$("state").innerHTML = state.escapeHTML();
|
|
}
|
|
|
|
var setTitle = function(status) {
|
|
$("status").innerHTML = status;
|
|
$("contextSize").style.display = "none";
|
|
$("contextTitle").style.display = "none";
|
|
}
|
|
|
|
var displayContext = function() {
|
|
$("contextSize").style.display = "";
|
|
$("contextTitle").style.display = "";
|
|
}
|
|
|
|
var showFileChanges = function(file, cached) {
|
|
if (!file) {
|
|
setState("No file selected");
|
|
return;
|
|
}
|
|
|
|
hideNotification();
|
|
hideState();
|
|
|
|
$("contextSize").oninput = function(element) {
|
|
Controller.setContextSize_($("contextSize").value);
|
|
}
|
|
|
|
if (file.status == 0) // New file?
|
|
return showNewFile(file);
|
|
|
|
var changes;
|
|
if (cached) {
|
|
setTitle("Staged changes for " + file.path);
|
|
displayContext();
|
|
changes = IndexController.stagedChangesForFile_(file);
|
|
}
|
|
else {
|
|
setTitle("Unstaged changes for " + file.path);
|
|
displayContext();
|
|
changes = IndexController.unstagedChangesForFile_(file);
|
|
}
|
|
|
|
if (changes == "") {
|
|
notify("This file has no more changes", 1);
|
|
return;
|
|
}
|
|
|
|
displayDiff(changes, cached);
|
|
}
|
|
|
|
var diffHeader;
|
|
var originalDiff;
|
|
|
|
var displayDiff = function(diff, cached)
|
|
{
|
|
diffHeader = diff.split("\n").slice(0,4).join("\n");
|
|
originalDiff = diff;
|
|
|
|
$("diff").style.display = "";
|
|
highlightDiff(diff, $("diff"));
|
|
hunkHeaders = $("diff").getElementsByClassName("hunkheader");
|
|
|
|
for (i = 0; i < hunkHeaders.length; ++i) {
|
|
var header = hunkHeaders[i];
|
|
if (cached)
|
|
header.innerHTML = "<a href='#' class='stagebutton' onclick='addHunk(this, true); return false'>Unstage</a>" + header.innerHTML;
|
|
else
|
|
header.innerHTML = "<a href='#' class='stagebutton' onclick='addHunk(this, false); return false'>Stage</a>" + header.innerHTML;
|
|
}
|
|
}
|
|
|
|
var addHunk = function(hunk, reverse)
|
|
{
|
|
hunkHeader = hunk.nextSibling.data.split("\n")[0];
|
|
if (m = hunkHeader.match(/@@.*@@/))
|
|
hunkHeader = m;
|
|
|
|
start = originalDiff.indexOf(hunkHeader);
|
|
end = originalDiff.indexOf("\n@@", start + 1);
|
|
end2 = originalDiff.indexOf("\ndiff", start + 1);
|
|
if (end2 < end && end2 > 0)
|
|
end = end2;
|
|
|
|
if (end == -1)
|
|
end = originalDiff.length;
|
|
|
|
hunkText = originalDiff.substring(start, end);
|
|
hunkText = diffHeader + "\n" + hunkText + "\n";
|
|
|
|
if (Controller.stageHunk_reverse_)
|
|
Controller.stageHunk_reverse_(hunkText, reverse);
|
|
else
|
|
alert(hunkText);
|
|
}
|