Nest hover/click function, better code folding plus error catching

You can now hover mouse over nest positions to have them selected Can also click to set cursor position to within that nest Removed old code folding function in favour of lib that comes with CodeMirror Errors catched so clicking on a blank area of the file manager doesn't attempt anything
Overwrite permission prompt plus better display & error catching
2026-03-15 21:07:12 +01:00 · 2012-04-07 21:17:33 +01:00 · 2012-04-07 21:14:24 +01:00 · 2012-04-07 21:11:45 +01:00 · 2012-04-07 20:27:40 +01:00 · 2012-04-05 07:58:09 +01:00
16 changed files with 182 additions and 26 deletions
--- a/editor.php
+++ b/editor.php
@@ -13,6 +13,7 @@
 <script src="<?php echo $codeMirrorDir; ?>/mode/php/php.js"></script>
 <script src="<?php echo $codeMirrorDir; ?>/lib/util/searchcursor.js"></script>
 <script src="<?php echo $codeMirrorDir; ?>/lib/util/match-highlighter.js"></script>
+<script src="<?php echo $codeMirrorDir; ?>/lib/util/foldcode.js"></script>
 <link rel="stylesheet" href="lib/editor.css">
 <style type="text/css">
 .CodeMirror {position: absolute; width: 0px; background-color: #ffffff}
@@ -26,7 +27,12 @@
 <body onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);">

 <script>
-function createNewCMInstance(num) {window['cM'+num] = CodeMirror(document.body, {
+function createNewCMInstance(num) {
+	var fileName = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1];
+	var codeFold = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #bb0000; color: #ffffff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
+	var codeFold_JS_PHP = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #bb0000; color: #ffffff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
+
+	window['cM'+num] = CodeMirror(document.body, {
        mode: "application/x-httpd-php",
 	theme: "icecoder",
        lineNumbers: true,
@@ -52,6 +58,7 @@ function createNewCMInstance(num) {window['cM'+num] = CodeMirror(document.body,
 			top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
 		}
 		top.ICEcoder.getCaretPosition();
+		top.ICEcoder.dontUpdateNest = false;
 		top.ICEcoder.updateCharDisplay();
 		top.ICEcoder.updateNestingIndicator();
 		if (top.ICEcoder.findMode) {
@@ -77,7 +84,6 @@ function createNewCMInstance(num) {window['cM'+num] = CodeMirror(document.body,
 			if(top.ICEcoder.tagString.slice(0,1)=="/"||top.ICEcoder.tagString.slice(0,1)=="?") {
 				canDoEndTag=false;
 			}
-			fileName = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1];
 			if (!top.ICEcoder.codeAssist||fileName.indexOf(".js")>0||fileName.indexOf(".css")>0) {
 				canDoEndTag=false;
 			}
@@ -106,11 +112,12 @@ function createNewCMInstance(num) {window['cM'+num] = CodeMirror(document.body,
 		};
 		lastKeyCode = e.keyCode;
 	},
+	onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".php") == -1) ? codeFold : codeFold_JS_PHP,
 	extraKeys: {"Tab": "indentMore", "Shift-Tab": "indentLess"}
-});
+	});

-// Now create the active line for this CodeMirror object
-top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab] = window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setLineClass(0, "cm-s-activeLine");
+	// Now create the active line for this CodeMirror object
+	top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab] = window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setLineClass(0, "cm-s-activeLine");
 };

 </script>
--- a/files.php
+++ b/files.php
@@ -95,7 +95,7 @@ function fileManager_dir($directory, $return_link, $first_call=true) {
 						$fileManager .= fileManager_dir("$directory/$this_file", $return_link , false);
 						$fileManager .= "</li>";
 					} else {
-						$fileManager .= "<li class=\"pft-directory\" style=\"cursor: default\"><span style=\"position: relative; left:-22px; color: #888888\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN] ".$fileAtts."</span></li>";
+						$fileManager .= "<li class=\"pft-directory\" style=\"cursor: pointer\"><span style=\"position: relative; left:-22px; color: #888888\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN] ".$fileAtts."</span></li>";
 					}
 				} else {
 					// File
@@ -117,7 +117,7 @@ function fileManager_dir($directory, $return_link, $first_call=true) {
 							$chmodInfo = substr(sprintf('%o', fileperms($link)), -4);
 							$fileAtts = '<span style="color: #888888; font-size: 8px">'.$chmodInfo.'</span>';
 						}
-						$fileManager .= "<li class=\"pft-file " . strtolower($ext) . "\"><a nohref onMouseOver=\"top.ICEcoder.overFileFolder('file','$link')\" onMouseOut=\"top.ICEcoder.overFileFolder('file','')\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace("/","|",str_replace($docRoot,"",$link))."\">" . htmlspecialchars($this_file) . "</span> ".$fileAtts."</a></li>";
+						$fileManager .= "<li class=\"pft-file " . strtolower($ext) . "\"><a nohref onMouseOver=\"top.ICEcoder.overFileFolder('file','$link')\" onMouseOut=\"top.ICEcoder.overFileFolder('file','')\" style=\"position: relative; left:-22px; cursor: pointer\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace("/","|",str_replace($docRoot,"",$link))."\">" . htmlspecialchars($this_file) . "</span> ".$fileAtts."</a></li>";
 					} else {
 						$fileAtts = "<img src=\"images/file-manager-icons/padlock.png\" style=\"cursor: pointer\" onClick=\"alert('Sorry, you need higher admin level rights to view.')\">";
 						$fileManager .= "<li class=\"pft-file " . strtolower($ext) . "\" style=\"cursor: default\"><span style=\"position: relative; left:-22px; color: #888888\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN] ".$fileAtts."</span></li>";
@@ -142,14 +142,14 @@ function php4_scandir($dir) {
 ?>
 <!DOCTYPE html>

-<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="top.ICEcoder.getMouseXY(event);top.ICEcoder.canResizeFilesW()" onContextMenu="top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink; top.ICEcoder.selectFileFolder(); return top.ICEcoder.showMenu()" onClick="top.document.getElementById('fileMenu').style.display='none'">
+<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="top.ICEcoder.getMouseXY(event);top.ICEcoder.canResizeFilesW()" onContextMenu="top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink; top.ICEcoder.selectFileFolder(); return top.ICEcoder.showMenu()" onClick="top.ICEcoder.selectFileFolder()">
 <head>
 <title>ICE Coder File Manager</title>
 <link rel="stylesheet" type="text/css" href="lib/files.css">
 <script src="lib/coder.js" type="text/javascript"></script>
 </head>

-<body onLoad="top.ICEcoder.fileManager()" onClick="top.ICEcoder.selectFileFolder()" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);">
+<body onLoad="top.ICEcoder.fileManager()" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);">
 <?php
 	echo fileManager($_SERVER['DOCUMENT_ROOT'], "[link]");
 ?>
--- a/images/delete.png
+++ b/images/delete.png
--- a/images/new-file.png
+++ b/images/new-file.png
--- a/images/new-folder.png
+++ b/images/new-folder.png
--- a/images/open.png
+++ b/images/open.png
--- a/images/rename.png
+++ b/images/rename.png
--- a/images/save.png
+++ b/images/save.png
--- a/images/view.png
+++ b/images/view.png
--- a/index.php
+++ b/index.php
@@ -87,11 +87,25 @@ echo 'fullPath = "'.$docRoot.'";'.PHP_EOL;

 <div id="files" class="files" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract'); top.document.getElementById('fileMenu').style.display='none';">
 	<div class="account" id="account">
-		<form name="login" action="index.php" method="POST">
-		<input type="password" name="loginPassword" class="accountPassword">
-		<input type="submit" name="submit" value="Login" class="button">
-		</form>
-		<a nohref style="cursor: pointer" onClick="ICEcoder.lockUnlockNav()"><img src="images/file-manager-icons/padlock.png" id="fmLock" class="lock"></a>
+		<?php if($_SESSION['userLevel']<10) {?>
+			<form name="login" action="index.php" method="POST">
+			<input type="password" name="loginPassword" class="accountPassword">
+			<input type="submit" name="submit" value="Login" class="button">
+			</form>
+		<?php } else {
+		$lockStyleExtra = ' style="margin-top: -22px"';
+		?>
+			<div class="accountOptions">
+			<a nohref title="Save" onClick="ICEcoder.fMIcon('save')"><img src="images/save.png" alt="Save" id="fMSave" style="opacity: 0.3"></a>
+			<a nohref title="Open" onClick="ICEcoder.fMIcon('open')"><img src="images/open.png" alt="Open" id="fMOpen" style="margin-left: 7px; opacity: 0.3"></a>
+			<a nohref title="New File" onClick="ICEcoder.fMIcon('newFile')"><img src="images/new-file.png" alt="New File" id="fMNewFile" style="margin: 8px 0px 0px 10px; opacity: 0.3"></a>
+			<a nohref title="New Folder" onClick="ICEcoder.fMIcon('newFolder')"><img src="images/new-folder.png" alt="New Folder" id="fMNewFolder" style="margin: 9px 0px 0px 5px; opacity: 0.3"></a>
+			<a nohref title="Delete" onClick="ICEcoder.fMIcon('delete')"><img src="images/delete.png" alt="Delete" id="fMDelete" style="margin: 9px 0px 0px 5px; opacity: 0.3"></a>
+			<a nohref title="Rename" onClick="ICEcoder.fMIcon('rename')"><img src="images/rename.png" alt="Rename" id="fMRename" style="margin: 9px 0px 0px 5px; opacity: 0.3"></a>
+			<a nohref title="View" onClick="ICEcoder.fMIcon('view')"><img src="images/view.png" alt="View" id="fMView" style="margin: 9px 0px 0px 5px; opacity: 0.3"></a>
+			</div>
+		<?php ;};?>
+		<a nohref style="cursor: pointer" onClick="ICEcoder.lockUnlockNav()"><img src="images/file-manager-icons/padlock.png" id="fmLock" class="lock"<?php echo $lockStyleExtra; ?>></a>
 	</div>
 	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1'"></iframe>
 	<div class="serverMessage" id="serverMessage"></div>
--- a/lib/coder.css
+++ b/lib/coder.css
@@ -64,7 +64,7 @@ body {overflow: hidden;
 }

 .header {position: absolute; display: inline-block; width: 100%; height: 40px; background-color: #ffffff; text-align: right; z-index: 2}
-.header .plugins {position: absolute; display: inline-block; left: 27px; top: 3px}
+.header .plugins {position: absolute; display: inline-block; left: 15px; top: 3px}
 .header .plugins img {position: relative; display: inline-block; margin-right: 15px}
 .header .version {position: relative; display: inline-block; margin-top: 25px; font-size: 10px; color: #bbbbbb}
 .header .logo {position: relative; margin: 5px 10px 0px 5px}
@@ -75,6 +75,8 @@ body {overflow: hidden;
 	box-shadow: 0px 0px 10px 4px rgba(0,0,0,0.4);
 }
 .files .account {display: inline-block; height: 50px; width: 250px; margin-top: 40px; background-color: #888888}
+.files .accountOptions {position: relative; height: 31px; width: 200px; margin-left: 15px; margin-top: 8px}
+.files .accountOptions img {cursor: pointer}
 .files .accountPassword {position: relative; border: 1px solid #888888; background-color: #999999; height: 18px; width: 140px; margin-left: 14px; margin-top: 15px}
 .files .button {position: absolute; border: 0px; background: #999999; color: #555555; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
 .files .button:hover {background-color: #444444; color: #eeeeee}
--- a/lib/coder.js
+++ b/lib/coder.js
@@ -167,7 +167,7 @@ var ICEcoder = {
 		}

 		// Now we've built up our nest depth array, if we're due to show it in the display
-		if (updateNestDisplay) {
+		if (updateNestDisplay && !top.ICEcoder.dontUpdateNest) {

 			// Clear the display
 			ICEcoder.nestDisplay.innerHTML = "";
@@ -177,7 +177,7 @@ var ICEcoder = {

 					// Then for all the array items, output as the nest display
 					for (var i=0;i<ICEcoder.htmlTagArray.length;i++) {
-						ICEcoder.nestDisplay.innerHTML += ICEcoder.htmlTagArray[i];
+						ICEcoder.nestDisplay.innerHTML += '<a onMouseover="top.ICEcoder.highlightBlock('+i+')" onMouseout="top.ICEcoder.highlightBlock('+i+',\'hide\')" onClick="top.ICEcoder.setPosition('+i+',top.ICEcoder.startPosLine,\''+ICEcoder.htmlTagArray[i]+'\')" style="cursor: pointer">'+ICEcoder.htmlTagArray[i]+'</a>';
 						if(i<ICEcoder.htmlTagArray.length-1) {ICEcoder.nestDisplay.innerHTML += " &gt; "};
 					}
 				}
@@ -246,11 +246,16 @@ var ICEcoder = {
 			top.ICEcoder.ctrlKeyDown = false;
 	        	return false;

-		// ESC (Comment/Uncomment line)
+		// ESC in content area (Comment/Uncomment line)
       		} else if(key==27 && area == "content") {
 			top.ICEcoder.lineCommentToggle();
 	        	return false;

+		// ESC not in content area (Cancel all actions)
+       		} else if(key==27 && area != "content") {
+			top.ICEcoder.cancelAllActions();
+	        	return false;
+
 		// Any other key
 		} else {
 	        	return key;
@@ -348,6 +353,7 @@ var ICEcoder = {
 			i==selectedTab ? ICEcoder.changedContent[selectedTab-1]==1 ? bgVPos = -33 : bgVPos = -22 : bgVPos = bgVPos;
 			document.getElementById('tab'+i).style.backgroundPosition = "0px "+bgVPos+"px";
 		}
+		ICEcoder.changedContent[selectedTab-1]==1 ? top.ICEcoder.fMIconVis('fMSave',1) : top.ICEcoder.fMIconVis('fMSave',0.3);
 	},

 	// Starts a new file by setting a few vars & creating a new cM instance
@@ -520,6 +526,7 @@ var ICEcoder = {
 			// hide the content area if we have no tabs open
 			if (ICEcoder.openFiles.length==0) {
 				top.document.getElementById('content').style.visibility = "hidden";
+				top.ICEcoder.fMIconVis('fMView',0.3);
 			} else {
 				// Switch the mode & the tab
 				ICEcoder.switchMode();
@@ -594,10 +601,10 @@ var ICEcoder = {
 						ICEcoder.selectDeselectFile('deselect',resetFile);
 					}
 				}
-				// Set our arrray to contain 0 items
+				// Set our array to contain 0 items
 				top.ICEcoder.selectedFiles.length = 0;
 			}
-		} else {
+		} else if (top.ICEcoder.thisFileFolderLink) {
 			// We clicked a file/folder. Work out a shortened URL for the file, with pipes instead of slashes
 			shortURL = top.ICEcoder.thisFileFolderLink.substr((top.ICEcoder.thisFileFolderLink.indexOf(shortURLStarts)+top.shortURLStarts.length),top.ICEcoder.thisFileFolderLink.length).replace(/\//g,"|");
 		
@@ -642,6 +649,13 @@ var ICEcoder = {
 			document.findAndReplace.target[2].innerHTML = "selected files";
 			document.findAndReplace.target[3].innerHTML = "selected filenames";
 		}
+
+		// Finally, show or grey out the relevant file manager icons
+		top.ICEcoder.selectedFiles.length == 1 ? top.ICEcoder.fMIconVis('fMOpen',1) : top.ICEcoder.fMIconVis('fMOpen',0.3);
+		top.ICEcoder.selectedFiles.length == 1 && top.ICEcoder.thisFileFolderType == "folder" ? top.ICEcoder.fMIconVis('fMNewFile',1) : top.ICEcoder.fMIconVis('fMNewFile',0.3);
+		top.ICEcoder.selectedFiles.length == 1 && top.ICEcoder.thisFileFolderType == "folder" ? top.ICEcoder.fMIconVis('fMNewFolder',1) : top.ICEcoder.fMIconVis('fMNewFolder',0.3);
+		top.ICEcoder.selectedFiles.length == 1 ? top.ICEcoder.fMIconVis('fMDelete',1) : top.ICEcoder.fMIconVis('fMDelete',0.3);
+		top.ICEcoder.selectedFiles.length == 1 ? top.ICEcoder.fMIconVis('fMRename',1) : top.ICEcoder.fMIconVis('fMRename',0.3);
 	},

 	// Select or deselect file
@@ -709,6 +723,7 @@ var ICEcoder = {
 				} else {
 					top.ICEcoder.createNewTab();
 				}
+				top.ICEcoder.fMIconVis('fMView',1);
 			}
 		}
 	},
@@ -718,6 +733,7 @@ var ICEcoder = {
 		var saveType;

 		saveAs ? saveType = "saveAs" : saveType = "save";
+		
 		top.ICEcoder.serverQueue("add","lib/file-control.php?action=save&file="+ICEcoder.openFiles[ICEcoder.selectedTab-1].replace(/\//g,"|")+"&saveType="+saveType);
 		top.ICEcoder.serverMessage('<b>Saving</b><br>'+ICEcoder.openFiles[ICEcoder.selectedTab-1]);
 	},
@@ -1178,5 +1194,111 @@ var ICEcoder = {
 			top.document.getElementById('header').appendChild(newBlock);
 			cM.addWidget(cM.getCursor(), top.document.getElementById('cssColor'), true);
 		}
+	},
+
+	// Carry out actions when clicking icons above file manager
+	fMIcon: function(action) {
+
+		if (action=="save" && ICEcoder.openFiles.length>0) {
+			top.ICEcoder.saveFile();
+		}
+
+		if (ICEcoder.selectedFiles.length==1) {
+			top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.fullPath+top.ICEcoder.selectedFiles[0].replace('|','/');
+
+			if (action=="open" && ICEcoder.selectedFiles[0].indexOf(".")>0) {
+				top.ICEcoder.thisFileFolderType='file';
+				top.ICEcoder.openFile();
+			}
+			if (action=="newFile")	 {top.ICEcoder.newFile();}
+			if (action=="newFolder") {top.ICEcoder.newFolder();}
+			if (action=="delete")	 {top.ICEcoder.deleteFile(top.ICEcoder.rightClickedFile);}
+			if (action=="rename")	 {top.ICEcoder.renameFile(top.ICEcoder.rightClickedFile);}
+		}
+
+		if (action=="view" && ICEcoder.openFiles.length>0) {
+			window.open(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]);
+		}
+	},
+
+	// Change opacity of the file manager icons on demand
+	fMIconVis: function(icon, vis) {
+		if (top.document.getElementById(icon)) {
+			top.document.getElementById(icon).style.opacity = vis;
+		}
+	},
+
+	// Cancel all actions on pressing Esc in non content areas
+	cancelAllActions: function() {
+		// Stop whatever the parent may be loading, plus clear any file manager tasks other than the current one
+		window.stop();
+		if (ICEcoder.serverQueueItems.length>0) {
+			ICEcoder.serverQueueItems.splice(1,ICEcoder.serverQueueItems.length);
+		}
+		top.document.getElementById('loadingMask').style.visibility = "hidden";
+		top.ICEcoder.serverMessage('<b style="color: #dd0000">Cancelled tasks</b>');
+		setTimeout(function() {top.ICEcoder.serverMessage();},2000);
+	},
+
+	// Highlight or hide block upon roll over/out of nest positions
+	highlightBlock: function(nestPos,hide) {
+		var cM;
+
+		cM = ICEcoder.getcMInstance();
+		// Hiding the block
+		if (hide) {
+			// Either set our cursor back to the orig position if we have't clicked or redo the nest display if we have
+			top.ICEcoder.dontUpdateNest ? cM.setCursor(top.ICEcoder.cursorOrigLine,top.ICEcoder.cursorOrigCh) : top.ICEcoder.getNestLocation('updateNestDisplay');
+			top.ICEcoder.dontUpdateNest = false;
+		} else {
+			// Showing the block, get orig cursor position
+			top.ICEcoder.cursorOrigCh = cM.getCursor().ch;
+			top.ICEcoder.cursorOrigLine = cM.getCursor().line;
+			top.ICEcoder.dontUpdateNest = true;
+		
+			// Set a cursor position object to begin with
+			searchPos = new Object();
+			searchPos.ch = cM.getCursor().ch;
+			searchPos.line = cM.getCursor().line;
+			// Then find our cursor position for our target nest depth
+			for (var i=top.ICEcoder.htmlTagArray.length-1;i>=nestPos;i--) {
+				cursor = cM.getSearchCursor("<"+top.ICEcoder.htmlTagArray[i],searchPos);
+				cursor.findPrevious();
+				searchPos.ch = cursor.from().ch;
+				searchPos.line = cursor.from().line;
+			}
+			// Once we've found our tag
+			if (cursor.from()) {
+				// Set our vars to match the start position
+				startPos = new Object();
+				top.ICEcoder.startPosCh = startPos.ch = cursor.from().ch;
+				top.ICEcoder.startPosLine = startPos.line = cursor.from().line;
+				// Now set an end position object that matches this start tag
+				endPos = new Object();
+				endPos.line = top.ICEcoder.content.contentWindow.CodeMirror.tagRangeFinder(cM,startPos.line)-1 || startPos.line;
+				endPos.ch = cM.getLine(endPos.line).indexOf("</"+top.ICEcoder.htmlTagArray[nestPos]+">")+top.ICEcoder.htmlTagArray[nestPos].length+3;
+				// Set the selection or escape out of not selecting
+				!top.ICEcoder.dontSelect ? cM.setSelection(startPos,endPos) : top.ICEcoder.dontSelect = false;
+			}
+		}
+	},
+
+	// Set our cursor position upon mouse click of the nest position
+	setPosition: function(nestPos,line,tag) {
+		var cM;
+
+		cM = ICEcoder.getcMInstance();
+		// Set out char position just after the tag, and refocus on the editor
+		char = cM.getLine(line).indexOf(">",cM.getLine(line).indexOf("<"+tag))+1;
+		cM.setCursor(line,char);
+		cM.focus();
+		// Now update the nest display up to this nest depth & without any HTML tags to kill further interactivity
+		charPos = 0;
+		for (i=0;i<=nestPos;i++) {
+			charPos = ICEcoder.nestDisplay.innerHTML.indexOf("&gt;",charPos+1);
+		}
+		ICEcoder.nestDisplay.innerHTML = ICEcoder.nestDisplay.innerHTML.substr(0,charPos).replace(/<(?:.|\n)*?>/gm, '');
+		top.ICEcoder.dontUpdateNest = false;
+		top.ICEcoder.dontSelect = true;
 	}
 };
--- a/lib/editor.css
+++ b/lib/editor.css
@@ -36,8 +36,8 @@ html, body {margin: 0px}
 .cm-s-icecoder span.cm-link {color: #ff0;}

 .cm-s-icecoder .CodeMirror-selected {background: #037 !important;}
-.cm-s-icecoder .CodeMirror-gutter {background: #333; border-right: 1px solid #e8e8e8;}
-.cm-s-icecoder .CodeMirror-gutter-text {color: #999; width: 35px;}
+.cm-s-icecoder .CodeMirror-gutter {background: #333; border-right: 1px solid #e8e8e8}
+.cm-s-icecoder .CodeMirror-gutter-text {color: #999; width: 35px; cursor: default}
 .cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important;}
 .cm-s-icecoder .CodeMirror-matchingbracket{border: 1px solid grey; color: black !important;}

--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -219,10 +219,21 @@ if (action=="save") {
 		} else {
 			newFileName = prompt('Enter Filename','/');
 		}
+		if (newFileName && top.document.getElementById('filesFrame').contentWindow.document.getElementById(newFileName.replace(/\//g,"|"))) {
+			overwriteOK = confirm('That file exists already, overwrite?');
+		}
 		document.saveFile.newFileName.value = newFileName;
 	<?php ;};?>
-	document.saveFile.contents.innerHTML = top.document.getElementById('saveTemp1').value;
-	document.saveFile.submit();
+	if ("undefined" == typeof newFileName || (newFileName && "undefined" == typeof overwriteOK) || ("undefined" != typeof overwriteOK && overwriteOK)) {
+		if ("undefined" != typeof newFileName) {
+			top.ICEcoder.serverMessage('<b>Saving</b><br>'+newFileName);
+		}
+		document.saveFile.contents.innerHTML = top.document.getElementById('saveTemp1').value;
+		document.saveFile.submit();
+	} else {
+		top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);
+		action=="nothing";
+	}
 }
 </script>

--- a/lib/files.css
+++ b/lib/files.css
@@ -35,7 +35,7 @@ body {margin: 0px; overflow: auto}
 .fileManager li {margin-left: 15px;}
 	
 /* Default file */
-.fileManager LI.pft-file { list-style-image: url(../images/file-manager-icons/file.png); cursor: pointer;}
+.fileManager LI.pft-file { list-style-image: url(../images/file-manager-icons/file.png); }

 /* Additional file types */
 .fileManager LI.ext-3gp { list-style-image: url(../images/file-manager-icons/film.png); }
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -1,5 +1,5 @@
 <?php
-$versionNo		= "v 0.6.0";
+$versionNo		= "v 0.6.2";
 $codeMirrorDir		= "CodeMirror-2.23";
 $cMThisVer		= 2.23;
 $testcMVersion		= false; // test if we're using the latest CodeMirror version
Author	SHA1	Message	Date
Matt Pass	ef9d8ed5de	Nest hover/click function, better code folding plus error catching You can now hover mouse over nest positions to have them selected Can also click to set cursor position to within that nest Removed old code folding function in favour of lib that comes with CodeMirror Errors catched so clicking on a blank area of the file manager doesn't attempt anything	2012-04-07 21:17:33 +01:00
Matt Pass	07e44ecfb5	Overwrite permission prompt plus better display & error catching Now asks for overwrite permission if saving new file or save as over another file Server message now shows your new filename when saving Error catching so if not saving it clears server message	2012-04-07 21:14:24 +01:00
Matt Pass	fee53144d9	Code folding upon gutter click New fileName var CodeMirror lib used to allow folding of code on clicking gutter HTML folds on <tags> and JS & PHP fold on {braces} + in gutter indicates folded area	2012-04-07 21:11:45 +01:00
Matt Pass	e899c2f1bd	Version no. update to v0.6.2	2012-04-07 20:27:40 +01:00
Matt Pass	579dc7d5d0	Version no update to v0.6.1	2012-04-05 07:58:09 +01:00
Matt Pass	bdb7433c4a	Minor CSS adjustment to show pointer mouse cursor on file names	2012-04-05 07:54:28 +01:00
Matt Pass	2a2a631c99	Minor CSS adjustment to show default mouse cursor on gutter text	2012-04-05 07:53:56 +01:00
Matt Pass	a28213983b	Hitting escape key outside of content area now cancels all actions This stops parent from loading, hides the loading mask and clears server queue tasks other than one that is processing Also displays message to inform you it's cancelled tasks Function added to mediate file manager icon clicks to relevant functions Icon visibility changes depending on actions you are taking and what is available to you right now Simple function to handle icon visibility added Code folding function added to allow collapsing and expanding of code blocks (Its a bit slow & basic right now and only works for HTML, but improvements to come)	2012-04-05 07:52:57 +01:00
Matt Pass	0bcbc1a222	Account Options CSS added New classes added to cover file manager icons Also small adjustment to plugin icons position to line up with them	2012-04-05 07:46:48 +01:00
Matt Pass	978e2145e6	File Manager Icon Options Added When you are logged in, in place of the login box there are now icons These icons relate to tasks you can perform using key combos Functions already established for these, though on click calls mediating function Icons are mostly hidden by default, and light up/hide depending on functions available to you	2012-04-05 07:45:38 +01:00
Matt Pass	e4e75ccbef	New file manager icons Icons added to allow users option to click rather than press keys Also means ICE coder now works with tablets as well as via mouse devices These icons only show when you are logged in	2012-04-05 07:42:32 +01:00
Matt Pass	4a804e71df	Interaction improvements via CSS and alternate functions Pointing mouse over file manager icons now shows a CSS pointer cursor On click of the HTML tag, selectFileFolder function is called, rather than just hide context menu Calling this from HTML rather than body tag now This in turn means the whole line for a file isn't clickable, just the name	2012-04-05 07:40:58 +01:00
Matt Pass	c758a2ff37	Gutter click now triggers code folding Clicking gutter in CM editor triggers new code fold/expand function	2012-04-05 07:34:14 +01:00