Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-03 07:13:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deleted files show up now

Browse Source 
Excluded array paths have slashes not pipes
Don't add deleted files to diffPaths array also, keep them seperate
Can't use a for loop to add deleted files, only adds last reference as
happens before a tickover
Instead use a setInterval as a loop, with k as the counter instead of j
to avoid confusion
Check if it's not excluded dir/file as an outer if statement, with path
fix for root
3 cases set up for adding deleted dirs/files in a sub-dir, plus folder
or file in the root
Clear the interval when finished looping
This commit is contained in:
Matt Pass
2014-08-29 19:28:42 +01:00
parent 28881db771
commit 4cb2ac98d3
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/get-branch.php
View File

@@ -93,9 +93,9 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
// Cycle through all .gitignore files running above function to get a list of $excluded files
// Exclude the .git dir as first item as we don't want to see that
$excluded = array("|.git");
$excluded = array("/.git");
foreach ($gi as $scanpath) {
$excludedTest = (parseGitignore($scanpath));
$excludedTest = (parseGitignore($scanpath));
if (count($excludedTest) > 0) {
$excluded = array_merge($excluded, $excludedTest);
}
@@ -246,7 +246,6 @@ if ($_SESSION['githubDiff']) {
// DELETED FILES are kept
// ======================
} else {
diffPaths.push(tree[i].path);
deletedPaths.push(tree[i].path);
}
}
@@ -338,15 +337,36 @@ if ($_SESSION['githubDiff']) {
showContent = showContent.slice(0,-2);
// If we've got some deleted files (as we're in GitHub diff mode), add those into the file manager
if ("undefined" != typeof deletedPaths && deletedPaths.length > 0) {
for (var j=0; j<deletedPaths.length; j++) {
fSplit = deletedPaths[j].lastIndexOf("/");
thePath = deletedPaths[j].substr(0,fSplit);
theFile = deletedPaths[j].substr(fSplit+1);
// If we're opening a dir that contains a deleted dir and it's not excluded, inject into the file manager
if ("<?php echo $location;?>" == "/"+thePath && excludedArray.indexOf("/"+thePath+"/"+theFile) == -1) {
setTimeout(function(){top.ICEcoder.updateFileManagerList('add','/'+thePath,theFile,false,false,false,'file');},4);
k = 0;
top.addDeletedFiles = setInterval(function() {
fSplit = deletedPaths[k].lastIndexOf("/");
thePath = deletedPaths[k].substr(0,fSplit);
theFile = deletedPaths[k].substr(fSplit+1);
// If it's not excluded
if (excludedArray.indexOf((thePath == "" ? "" : "/" + thePath)+"/"+theFile) == -1) {
// If we're adding a deleted dir/file in a sub-dir
if ("<?php echo $location;?>" == "/"+thePath) {
top.ICEcoder.updateFileManagerList('add','/'+thePath,theFile,false,false,false,'file');
// If we're adding a deleted dir/file at the root level
} else {
// Folder
if (thePath != "") {
top.ICEcoder.updateFileManagerList('add',top.iceRoot,thePath,false,false,false,'folder');
// File
} else {
top.ICEcoder.updateFileManagerList('add',top.iceRoot+thePath,theFile,false,false,false,'file');
}
}
}
}
k++;
if ("undefined" == typeof deletedPaths[k]) {
clearInterval(top.addDeletedFiles);
}
},20);
}
setTimeout(function(){top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);},4);
if (!top.ICEcoder.fmReady) {top.ICEcoder.fmReady=true;};
@@ -376,4 +396,4 @@ if ($_SESSION['githubDiff']) {
}
</script>
</body>
</html>
</html>