Don't show .git dir, show diffs in non anim mode

icecoder · Nov 13, 2016 · 3284134 · 3284134
1 parent 3e31879
commit 3284134
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/get-branch.php b/lib/get-branch.php
@@ -71,8 +71,8 @@ function hasGitignore($dir) {
 		if (is_dir($scanpath) && strpos($scanpath,".git") == false) {
 		$thisDir = str_replace("\\","/",$scanpath);
 			if(hasGitignore($thisDir)) {
-			$gi[] = $thisDir."/.gitignore";
-		}
+				$gi[] = $thisDir."/.gitignore";
+			}
 		}
 	}
 
@@ -149,6 +149,10 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 	if (!isset($ftpSite) && $docRoot.$iceRoot.$location."/".$entry == $docRoot.$ICEcoderDir) {
 		$canAdd = false;
 	}
+	// Ignore .git dir in GitHub diff mode
+	if (!isset($ftpSite) && $_SESSION['githubDiff'] && strpos($docRoot.$iceRoot.$location."/".$entry,"/.git") !== false) {
+		$canAdd = false;
+	}
 	if ($entry != "." && $entry != ".." && $canAdd) {
 		if (!isset($ftpSite)) {
 			is_dir($docRoot.$iceRoot.$location."/".$entry)
@@ -388,7 +392,7 @@ function parseGitignore($file) { # $file = '/absolute/path/to/.gitignore'
 		// Now display folders & files
 
 		// Animate into view?
-		if (folderItems.length <= 50) {
+		if (<?php echo !$_SESSION['githubDiff'] ? "true" : "false";?> && folderItems.length <= 50) {
 			showFileI=0;
 			animFolders = setInterval(function() {
 				showFileI++;