From 440c7cbb8b3fa82282b3974ca5c58e0a3a196ac6 Mon Sep 17 00:00:00 2001
From: mattpass <matt@helical-levity.com>
Date: Sat, 14 Mar 2020 08:31:20 +0000
Subject: [PATCH] Backup versions theme and scrollbars set, rejig order

---
 lib/backup-versions.php | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/lib/backup-versions.php b/lib/backup-versions.php
index 0921d02..39aa19d 100644
--- a/lib/backup-versions.php
+++ b/lib/backup-versions.php
@@ -40,22 +40,14 @@ $versions = $fileCountInfo['count'];
 .CodeMirror-foldgutter-folded {background: #800; color: #ddd}
 .CodeMirror-foldgutter-folded:after {position: relative; top: -3px}
 </style>
+<link rel="stylesheet" href="<?php
+echo ($ICEcoder["theme"] === "default"
+    ? dirname(basename(__DIR__)).'/editor.css'
+    : "../".$ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css'
+) . "?microtime=".microtime(true);
+?>">
 <link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/fold/foldgutter.css?microtime=<?php echo microtime(true);?>">
-<link rel="stylesheet" href="editor.css?microtime=<?php echo microtime(true);?>">
-<?php
-$themeArray = array();
-$handle = opendir('../'.$ICEcoder["codeMirrorDir"].'/theme/');
-
-while (false !== ($cssFile = readdir($handle))) {
-	if ($cssFile !== "." && $cssFile != "..") {
-		array_push($themeArray,basename($cssFile,".css"));
-	}
-}
-sort($themeArray);
-for ($i=0;$i<count($themeArray);$i++) {
-	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css?microtime='.microtime(true).'">'.PHP_EOL;
-}
-?>
+<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/addon/scroll/simplescrollbars.css?microtime=<?php echo microtime(true);?>">
 </head>
 
 <body class="backup-versions">
@@ -124,10 +116,11 @@ var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
 	matchBrackets: parent.parent.ICEcoder.matchBrackets,
 	electricChars: false,
 	highlightSelectionMatches: true,
+    scrollbarStyle: parent.parent.ICEcoder.scrollbarStyle,
 	showTrailingSpace: parent.parent.ICEcoder.showTrailingSpace,
 	lint: false,
 	readOnly: "nocursor",
-	theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
+    theme: parent.parent.ICEcoder.theme
 	});
 editor.setSize("480px","500px");
 
