From 2a93778df7d2244723a401382c0ccf6803c77a87 Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Tue, 9 Oct 2012 07:49:03 +0100
Subject: [PATCH] First sort of file into logical sections

---
 lib/coder.js | 1622 ++++++++++++++++++++++++++------------------------
 1 file changed, 830 insertions(+), 792 deletions(-)

diff --git a/lib/coder.js b/lib/coder.js
index 72a6b0d..b846c47 100644
--- a/lib/coder.js
+++ b/lib/coder.js
@@ -1,4 +1,9 @@
 var ICEcoder = {
+
+// ==============
+// INIT
+// ==============
+
 	// Define settings
 	filesW: 250,			// Initial width of the files pane
 	minFilesW: 14,			// Min width of the files pane
@@ -62,6 +67,10 @@ var ICEcoder = {
 		top.ICEcoder.ready = true;
 	},
 
+// ==============
+// LAYOUT
+// ==============
+
 	// Set our layout according to the browser size
 	setLayout: function(dontSetEditor) {
 		var winW, winH, headerH, footerH, accountH, tabsBarH, findBarH;
@@ -91,186 +100,6 @@ var ICEcoder = {
 		}
 	},
 
-	// Clean up our loaded code
-	contentCleanUp: function() {
-		var fileName, cM, content;
-
-		// If it's not a JS, CoffeeScript Ruby, CSS or LESS file, replace our temp </textarea> value
-		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
-		if (["js","coffee","rb","css","less"].indexOf(fileName.split(".")[1])<0) {
-			cM = ICEcoder.getcMInstance();
-			content = cM.getValue();
-			content = content.replace(/<ICEcoder:\/:textarea>/g,'</textarea>');
-
-			// Then set the content in the editor & clear the history
-			cM.setValue(content);
-			cM.clearHistory();
-		}
-	},
-
-	// Work out the nesting depth location on demand and update our display if required
-	getNestLocation: function(updateNestDisplay) {
-		var cM, nestCheck, state, cx, startPos, fileName;
-
-		cM = ICEcoder.getcMInstance();
-		nestCheck = cM.getValue();
-
-		// Set up array to store nest data
-		state = cM.getTokenAt(cM.getCursor()).state;
-		if ("undefined" != typeof state.curState) {
-			ICEcoder.htmlTagArray = [];
-			for (cx = state.curState.context; cx; cx = cx.prev) {
-				ICEcoder.htmlTagArray.unshift(cx.tagName);
-			}
-		}
-		ICEcoder.tagString = ICEcoder.htmlTagArray[ICEcoder.htmlTagArray.length-1];
-		if (ICEcoder.caretLocType=="JavaScript") {
-			ICEcoder.tagString = "script";
-		}
-
-		// Now we've built up our nest depth array, if we're due to show it in the display
-		if (updateNestDisplay && !top.ICEcoder.dontUpdateNest) {
-			// Clear the display
-			ICEcoder.nestDisplay.innerHTML = "";
-			if ("undefined" != typeof ICEcoder.openFiles[ICEcoder.selectedTab-1]) {
-				fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
-				if (["js","coffee","rb","css","less"].indexOf(fileName.split(".")[1])<0 &&
-					(nestCheck.indexOf("include(")==-1)&&(nestCheck.indexOf("include_once(")==-1)&&
-					(nestCheck.indexOf("<html")>-1||nestCheck.indexOf("<body")>-1)) {
-
-					// Then for all the array items, output as the nest display
-					for (var i=0;i<ICEcoder.htmlTagArray.length;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; "};
-					}
-				}
-			}
-		}
-	},
-
-	// Detect keys/combos plus identify our area and set the vars, perform actions
-	interceptKeys: function(area, evt) {
-		var key;
-
-		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
-
-		// DEL (Delete file)
-		if (key==46 && area == "files") {
-			top.ICEcoder.delKeyDown = true;
-			top.ICEcoder.deleteFile();
-	        	return false;
-
-		// CTRL key down
-       		} else if(key==17) {
-			top.ICEcoder.ctrlKeyDown = true;
-	        	return false;
-
-		// Shift key down
-       		} else if(key==16) {
-			top.ICEcoder.shiftKeyDown = true;
-	        	return false;
-
-		// CTRL+F (Find)
-		} else if(key==70 && top.ICEcoder.ctrlKeyDown==true) {
-			top.document.getElementById('find').focus();
-			top.ICEcoder.ctrlKeyDown = false;
-	        	return false;
-
-		// CTRL+G (Go to line)
-		} else if(key==71 && top.ICEcoder.ctrlKeyDown==true) {
-			top.document.getElementById('goToLineNo').focus();
-			top.ICEcoder.ctrlKeyDown = false;
-	        	return false;
-
-		// CTRL+I (Get info)
-		} else if(key==73 && top.ICEcoder.ctrlKeyDown==true && area == "content") {
-			var searchPrefix = "";
-			if (top.ICEcoder.caretLocType!="Content") {
-				searchPrefix = top.ICEcoder.caretLocType.toLowerCase()+" ";
-			}
-			window.open("http://www.google.com/#output=search&q="+searchPrefix+top.ICEcoder.getcMInstance().getSelection());
-			top.ICEcoder.ctrlKeyDown = false;
-	        	return false;
-
-		// CTRL+right arrow (Next tab)
-		} else if(key==39 && top.ICEcoder.ctrlKeyDown==true && area!="content") {
-			top.ICEcoder.nextTab();
-	        	return false;
-
-		// CTRL+left arrow (Previous tab)
-		} else if(key==37 && top.ICEcoder.ctrlKeyDown==true && area!="content") {
-			top.ICEcoder.previousTab();
-	        	return false;
-
-		// CTRL+up arrow (Move line up)
-		} else if(key==38 && top.ICEcoder.ctrlKeyDown==true && area=="content") {
-			top.ICEcoder.moveLine('up');
-	        	return false;
-
-		// CTRL+down arrow (Move line down)
-		} else if(key==40 && top.ICEcoder.ctrlKeyDown==true && area=="content") {
-			top.ICEcoder.moveLine('down');
-	        	return false;
-
-		// CTRL+numeric plus (New tab)
-		} else if(key==107 && top.ICEcoder.ctrlKeyDown==true) {
-			top.ICEcoder.newTab();
-	        	return false;
-
-		// CTRL+numeric minus (Close tab)
-		} else if(key==109 && top.ICEcoder.ctrlKeyDown==true) {
-			top.ICEcoder.closeTab(top.ICEcoder.selectedTab);
-	        	return false;
-
-		// CTRL+S (Save), CTRL+Shift+S (Save As)
-		} else if(key==83 && top.ICEcoder.ctrlKeyDown==true) {
-			if(top.ICEcoder.shiftKeyDown==true) {
-				top.ICEcoder.saveFile('saveAs');
-				top.ICEcoder.shiftKeyDown = false;
-			} else {
-				top.ICEcoder.saveFile();
-			}
-			top.ICEcoder.stickyTabMaybe = true;
-	        	return false;
-
-		// CTRL+Enter (Open Webpage)
-		} else if(key==13 && top.ICEcoder.ctrlKeyDown==true && top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1] != "/[NEW]") {
-			if (top.ICEcoder.stickyTabMaybe) {
-				top.ICEcoder.stickyTabWindow = window.open(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1],"stickyTab");
-				top.ICEcoder.stickyTab = true;
-			} else {
-				window.open(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]);
-			}
-			top.ICEcoder.ctrlKeyDown = false;
-	        	return false;
-
-		// 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;
-        	}
-	},
-
-	// Reset the state of keys back to the normal state
-	resetKeys: function(evt) {
-		var key;
-
-		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
-
-		if (key==17) {top.ICEcoder.ctrlKeyDown = false; top.ICEcoder.stickyTabMaybe = false}
-		if (key==16) {top.ICEcoder.shiftKeyDown = false}
-		if (key==46) {top.ICEcoder.delKeyDown = false}
-	},
-
 	// Set the width of the file manager on demand
 	changeFilesW: function(expandContract) {
 
@@ -312,273 +141,213 @@ var ICEcoder = {
 		}
 	},
 
-	// Change tabs by switching visibility of instances
-	switchTab: function(newTab,noFocus) {
-		var cM;
+	// Lock & unlock the file manager navigation on demand
+	lockUnlockNav: function() {
+		var lockIcon;
 
-		// Identify tab that's currently selected & get the instance
-		ICEcoder.selectedTab = newTab;
-		cM = ICEcoder.getcMInstance();
-
-		if (cM) {
-			// Switch mode to HTML, PHP, CSS etc
-			ICEcoder.switchMode();
-
-			// Set all cM instances to be hidden, then make our selected instance visible
-			for (var i=0;i<ICEcoder.cMInstances.length;i++) {
-				ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].getWrapperElement().style.display = "none";
-			}
-			cM.setOption('theme',top.theme);
-			cM.getWrapperElement().style.display = "block";
-
-			// Focus on & refresh our selected instance
-			if (!noFocus) {cM.focus();}
-			cM.refresh();
-
-			// Highlight the selected tab
-			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
-
-			// Redo our find display
-			top.ICEcoder.findMode = false;
-			ICEcoder.findReplace('find',true,false);
-
-			// Finally, update the cursor display
-			top.ICEcoder.getCaretPosition();
-			top.ICEcoder.updateCharDisplay();
-		}
+		lockIcon = top.document.getElementById('fmLock');
+		ICEcoder.lockedNav = ICEcoder.lockedNav ? false : true;
+		lockIcon.style.backgroundPosition = ICEcoder.lockedNav ? "-64px -16px" : "-80px -16px";
 	},
 
-	// Reset all tabs to be without a highlight and then highlight the selected
-	redoTabHighlight: function(selectedTab) {
-		var cM, bgVPos, tColor, fileLink;
+// ==============
+// EDITOR
+// ==============
 
-		cM = ICEcoder.getcMInstance();
-		for(var i=1;i<=ICEcoder.changedContent.length;i++) {
-			if (document.getElementById('closeTabButton'+i)) {
-				document.getElementById('closeTabButton'+i).style.backgroundColor = ICEcoder.changedContent[i-1]==1 && cM.historySize().undo>0
-				? "#b00" : "rgba(255,255,255,0.3)";
-			}
-			tColor = i==selectedTab ? "#000" : "#fff";
-			if ("undefined" != typeof top.ICEcoder.openFiles[i-1] && top.ICEcoder.openFiles[i-1] != "/[NEW]") {
-				fileLink = top.ICEcoder.filesFrame.contentWindow.document.getElementById(top.ICEcoder.openFiles[i-1].replace(/\//g,"|"));
-				if (fileLink) {fileLink.style.backgroundColor = i==selectedTab ? "#49d" : "rgba(255,255,255,0.15)";};
-			}
-			document.getElementById('tab'+i).style.color = tColor;
-			bgVPos = i==selectedTab ? -22 : 0;
-			document.getElementById('tab'+i).style.backgroundPosition = "0 "+bgVPos+"px";
-		}
-		top.ICEcoder.fMIconVis('fMSave',ICEcoder.changedContent[selectedTab-1]==1 ? 1 : 0.3);
-	},
+	// Clean up our loaded code
+	contentCleanUp: function() {
+		var fileName, cM, content;
 
-	// Starts a new file by setting a few vars & creating a new cM instance
-	newTab: function() {
-		var cM;
-
-		ICEcoder.cMInstances.push(ICEcoder.nextcMInstance);
-		ICEcoder.selectedTab = ICEcoder.cMInstances.length;
-		ICEcoder.showHide('show',ICEcoder.content);
-		ICEcoder.content.contentWindow.createNewCMInstance(ICEcoder.nextcMInstance);
-		ICEcoder.setLayout();
-
-		ICEcoder.thisFileFolderType='file';
-		ICEcoder.thisFileFolderLink='/[NEW]';
-		ICEcoder.openFile();
-
-		cM = ICEcoder.getcMInstance('new');
-		ICEcoder.switchTab(ICEcoder.openFiles.length);
-
-		cM.setLineClass(ICEcoder['cMActiveLine'+ICEcoder.selectedTab], null);
-		ICEcoder['cMActiveLine'+ICEcoder.selectedTab] = cM.setLineClass(0, "cm-s-activeLine");
-		ICEcoder.nextcMInstance++;
-	},
-
-	// Create a new tab for a file
-	createNewTab: function() {
-		var closeTabLink;
-
-		// Push new file into array
-		top.ICEcoder.openFiles.push(top.ICEcoder.shortURL);
-
-		// Setup a new tab
-		closeTabLink = '<a nohref onClick="top.ICEcoder.closeTab('+(top.ICEcoder.openFiles.length)+')"><img src="images/nav-close.gif" id="closeTabButton'+(top.ICEcoder.openFiles.length)+'" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'" onMouseOut="this.style.backgroundColor=prevBG"></a>';
-		top.document.getElementById('tab'+(top.ICEcoder.openFiles.length)).style.display = "inline-block";
-		top.document.getElementById('tab'+(top.ICEcoder.openFiles.length)).innerHTML = top.ICEcoder.openFiles[top.ICEcoder.openFiles.length-1] + " " + closeTabLink;
-
-		// Highlight it and state it's selected
-		top.ICEcoder.redoTabHighlight(top.ICEcoder.openFiles.length);
-		top.ICEcoder.selectedTab=top.ICEcoder.openFiles.length;
-
-		// Add a new value ready to indicate if this content has been changed
-		top.ICEcoder.changedContent.push(0);
-
-		top.ICEcoder.setPreviousFiles();
-	},
-
-	// Cycle to next tab
-	nextTab: function() {
-		var goToTab;
-
-		goToTab = top.ICEcoder.selectedTab+1 <= top.ICEcoder.openFiles.length ? top.ICEcoder.selectedTab+1 : 1;
-		top.ICEcoder.switchTab(goToTab,'noFocus');
-	},
-
-	// Cycle to next tab
-	previousTab: function() {
-		var goToTab;
-
-		goToTab = top.ICEcoder.selectedTab-1 >= 1 ? top.ICEcoder.selectedTab-1 : top.ICEcoder.openFiles.length;
-		top.ICEcoder.switchTab(goToTab,'noFocus');
-	},
-
-	// Create a new tab for a file
-	renameTab: function(tabNum,newName) {
-		var closeTabLink;
-
-		// Push new file into array
-		top.ICEcoder.openFiles[tabNum-1] = newName;
-
-		// Setup a new tab
-		closeTabLink = '<a nohref onClick="parent.ICEcoder.closeTab('+tabNum+')"><img src="images/nav-close.gif" id="closeTabButton'+tabNum+'" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'" onMouseOut="this.style.backgroundColor=prevBG"></a>';
-		top.document.getElementById('tab'+tabNum).innerHTML = top.ICEcoder.openFiles[tabNum-1] + " " + closeTabLink;
-	},
-
-	// Indicate if the nesting structure of the code is OK
-	updateNestingIndicator: function () {
-		var cM, nestOK, fileName;
-
-		cM = ICEcoder.getcMInstance();
-		nestOK = true;
+		// If it's not a JS, CoffeeScript Ruby, CSS or LESS file, replace our temp </textarea> value
 		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
-		if (cM && fileName && ["js","coffee","rb","css","less"].indexOf(fileName.split(".")[1])==-1) {
-			nestOK = cM.getTokenAt({line:cM.lineCount(),ch:cM.lineInfo(cM.lineCount()-1).text.length}).className != "error" ? true : false;
+		if (["js","coffee","rb","css","less"].indexOf(fileName.split(".")[1])<0) {
+			cM = ICEcoder.getcMInstance();
+			content = cM.getValue();
+			content = content.replace(/<ICEcoder:\/:textarea>/g,'</textarea>');
+
+			// Then set the content in the editor & clear the history
+			cM.setValue(content);
+			cM.clearHistory();
 		}
-		ICEcoder.nestValid.style.backgroundColor = nestOK ? "#0b0" : "#f00";
-		ICEcoder.nestValid.innerHTML = nestOK ? "Nesting OK" : "Nesting Broken";
 	},
 
-	// Get the caret position on demand
-	getCaretPosition: function() {
-		var cM, content, line, char, charPos, charCount;
+	// Move current line up/down
+	moveLine: function(dir) {
+		var cM, line, swapLineNo, swapLine;
 
-		cM = ICEcoder.getcMInstance();
-		content = cM.getValue();
+		cM = top.ICEcoder.getcMInstance();
 		line = cM.getCursor().line;
-		char = cM.getCursor().ch;
-		charPos = 0;
-		for (var i=0;i<line;i++) {
-			charCount = content.indexOf("\n",charPos);
-			charPos=charCount+1;
+		if (dir=="up" && line>0) {swapLineNo = line-1}
+		if (dir=="down" && line<cM.lineCount()-1) {swapLineNo = line+1}
+		if (!isNaN(swapLineNo)) {
+			swapLine = cM.getLine(swapLineNo);
+			cM.setLine(swapLineNo,cM.getLine(line));
+			cM.setLine(line,swapLine);
+			ICEcoder.highlightLine(swapLineNo);
 		}
-		ICEcoder.caretPos=(charPos+char-1);
-		ICEcoder.getNestLocation('yes');
 	},
 
-	// Update the code type, line & character display
-	updateCharDisplay: function() {
+	// Highlight specified line
+	highlightLine: function(line) {
+		var cM;
+
+		cM = top.ICEcoder.getcMInstance();
+		cM.setSelection({line:line,ch:0}, {line:line,ch:cM.lineInfo(line).text.length});
+	},
+
+	// Go to a specific line number
+	goToLine: function(lineNo) {
 		var cM;
 
 		cM = ICEcoder.getcMInstance();
-		ICEcoder.caretLocationType();
-		ICEcoder.charDisplay.innerHTML = ICEcoder.caretLocType + ", Line: " + (cM.getCursor().line+1) + ", Char: " + cM.getCursor().ch;
+		cM.setCursor(lineNo ? lineNo-1 : document.getElementById('goToLineNo').value-1);
+		cM.focus();
+		return false;
 	},
 
-	// Determine which area of the document we're in
-	caretLocationType: function() {
-		var cM, caretLocType, caretChunk, fileName;
+	// Switch the CodeMirror mode on demand
+	switchMode: function() {
+		var cM;
 
 		cM = ICEcoder.getcMInstance();
-		caretLocType = "Unknown";
-		caretChunk = cM.getValue().substr(0,ICEcoder.caretPos+1);
-		if (caretChunk.lastIndexOf("<script")>caretChunk.lastIndexOf("</script>")&&caretLocType=="Unknown") {caretLocType = "JavaScript"};
-		if (caretChunk.lastIndexOf("<?")>caretChunk.lastIndexOf("?>")&&caretLocType=="Unknown") {caretLocType = "PHP"};
-		if (caretChunk.lastIndexOf("<%")>caretChunk.lastIndexOf("%>")&&caretLocType=="Unknown") {caretLocType = "Ruby"};
-		if (caretChunk.lastIndexOf("<")>caretChunk.lastIndexOf(">")&&caretLocType=="Unknown") {caretLocType = "HTML"};
-		if (caretLocType=="Unknown") {caretLocType = "Content"};
-
 		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
-		if (fileName.indexOf(".js")>0) {caretLocType="JavaScript"};
-		if (fileName.indexOf(".coffee")>0) {caretLocType="CoffeeScript"};
-		if (fileName.indexOf(".rb")>0) {caretLocType="Ruby"};
-		if (fileName.indexOf(".css")>0) {caretLocType="CSS"};
-		if (fileName.indexOf(".less")>0) {caretLocType="LESS"};
-
-		ICEcoder.caretLocType = caretLocType;
-
-		// If we're in a JS, CoffeeScript PHP or Ruby code block, add that to the nest display
-		if (["JavaScript","CoffeeScript","PHP","Ruby"].indexOf(caretLocType)>-1) {
-			ICEcoder.nestDisplay.innerHTML += " &gt; " + caretLocType;
+		if (fileName) {
+			fileName.indexOf('.js')>0	? cM.setOption("mode","javascript")
+			: fileName.indexOf('.coffee')>0	? cM.setOption("mode","coffeescript")
+			: fileName.indexOf('.rb')>0	? cM.setOption("mode","ruby")
+			: fileName.indexOf('.css')>0	? cM.setOption("mode","css")
+			: fileName.indexOf('.less')>0	? cM.setOption("mode","less")
+			: cM.setOption("mode","application/x-httpd-php");
 		}
 	},
 
-	// Alter array indicating which files have changed
-	redoChangedContent: function(evt) {
-		var key;
-		
-		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
-		// Exclude a few keys such as Escape...
-		if (top.ICEcoder.ctrlKeyDown==false && key!=27 && key!=20 && (key<16||key>19) && (key<37||key>40) && (key!=144||key!=145) && (key!=44||key!=45) && (key<33||key>36) && (key!=91||key!=92) && (key<112||key>123)) {
-			ICEcoder.changedContent[ICEcoder.selectedTab-1] = 1;
-			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
-		}
-	},
-
-	// Close the tab upon request
-	closeTab: function(closeTabNum) {
-		var cM, okToRemove, closeFileName;
+	// Comment or uncomment line on keypress
+	lineCommentToggle: function() {
+		var cM, cursorPos, linePos, lineContent, lCLen, adjustCursor, startLine, endLine;
 
 		cM = ICEcoder.getcMInstance();
-		okToRemove = true;
-		if (ICEcoder.changedContent[closeTabNum-1]==1) {
-			okToRemove = top.ICEcoder.ask('You have made changes.\n\nAre you sure you want to close without saving?');
-		}
+		cursorPos = cM.getCursor().ch;
+		linePos = cM.getCursor().line;
+		lineContent = cM.getLine(linePos);
+		lCLen = lineContent.length;
+		adjustCursor = 3;
 
-		if (okToRemove) {
-			// Get the filename of tab we're closing
-			closeFileName = top.ICEcoder.openFiles[closeTabNum-1];
-
-			// recursively copy over all tabs & data from the tab to the right, if there is one
-			for (var i=closeTabNum;i<ICEcoder.openFiles.length;i++) {
-				top.document.getElementById('tab'+i).innerHTML = top.document.getElementById('tab'+(i+1)).innerHTML;
-				ICEcoder.openFiles[i-1] = ICEcoder.openFiles[i];
-
-				// reduce the tab reference number on the closeTab link by 1
-				top.document.getElementById('tab'+i).innerHTML = top.document.getElementById('tab'+i).innerHTML.replace(("closeTab("+(i+1)+")"),"closeTab("+i+")").replace(("closeTabButton("+(i+1)+")"),"closeTabButton("+i+")");
-			}
-			// hide the instance we're closing by setting the hide class and removing from the array
-			ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[closeTabNum-1]].getWrapperElement().style.display = "none";
-			top.ICEcoder.cMInstances.splice(closeTabNum-1,1);
-			// clear the rightmost tab (or only one left in a 1 tab scenario) & remove from the array
-			top.document.getElementById('tab'+ICEcoder.openFiles.length).style.display = "none";
-			top.document.getElementById('tab'+ICEcoder.openFiles.length).innerHTML = "";
-			ICEcoder.openFiles.pop();
-			ICEcoder.openFileMDTs.pop();
-			// If we're closing the selected tab, determin the new selectedTab number, reduced by 1 if we have some tabs, 0 for a reset state
-			if (ICEcoder.selectedTab==closeTabNum) {
-				ICEcoder.openFiles.length>0 ? ICEcoder.selectedTab-=1 : ICEcoder.selectedTab = 0;
-			}
-			if (ICEcoder.openFiles.length>0 && ICEcoder.selectedTab==0) {ICEcoder.selectedTab=1};
-
-			// grey out the view icon
-			if (ICEcoder.openFiles.length==0) {
-				top.ICEcoder.fMIconVis('fMView',0.3);
+		if (["JavaScript","CoffeeScript","PHP","Ruby","CSS"].indexOf(ICEcoder.caretLocType)>-1) {
+			if (cM.somethingSelected()) {
+				if (ICEcoder.caretLocType=="Ruby") {
+					startLine = cM.getCursor(true).line;
+					endLine = cM.getCursor().line;
+					for (var i=startLine; i<=endLine; i++) {
+						cM.setLine(i, cM.getLine(i).slice(0,2)!="# "
+						? "# " + cM.getLine(i)
+						: cM.getLine(i).slice(2,cM.getLine(i).length));
+					}
+				} else {
+					cM.replaceSelection(cM.getSelection().slice(0,2)!="/*"
+					? "/*" + cM.getSelection() + "*/"
+					: cM.getSelection().slice(2,cM.getSelection().length-2));
+				}
 			} else {
-				// Switch the mode & the tab
-				ICEcoder.switchMode();
-				ICEcoder.switchTab(ICEcoder.selectedTab);
+				if (["CoffeeScript","CSS"].indexOf(ICEcoder.caretLocType)>-1) {
+					cM.setLine(linePos, lineContent.slice(0,3)!="/* "
+					? "/* " + lineContent + " */"
+					: lineContent.slice(3,lCLen).slice(0,lCLen-5));
+					if (lineContent.slice(0,3)=="/* ") {adjustCursor = -adjustCursor};
+				} else if (ICEcoder.caretLocType=="Ruby") {
+					cM.setLine(linePos, lineContent.slice(0,2)!="# "
+					? "# " + lineContent
+					: lineContent.slice(2,lCLen));
+					if (lineContent.slice(0,2)=="# ") {adjustCursor = -adjustCursor};
+				} else {
+					cM.setLine(linePos, lineContent.slice(0,3)!="// "
+					? "// " + lineContent
+					: lineContent.slice(3,lCLen));
+					if (lineContent.slice(0,3)=="// ") {adjustCursor = -adjustCursor};
+				}
+			}
+		} else {
+			if (cM.somethingSelected()) {
+				cM.replaceSelection(cM.getSelection().slice(0,4)!="<!--"
+				? "<!--" + cM.getSelection() + "//-->"
+				: cM.getSelection().slice(4,cM.getSelection().length-5));
+			} else {
+				cM.setLine(linePos, lineContent.slice(0,4)!="<!--"
+				? "<!--" + lineContent + "//-->"
+				: lineContent.slice(4,lCLen).slice(0,lCLen-9));
+				adjustCursor = lineContent.slice(0,4)=="<!--" ? -4 : 4;
 			}
-			// Highlight the selected tab after splicing the change state out of the array
-			top.ICEcoder.changedContent.splice(closeTabNum-1,1);
-			top.parent.ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
-
-			// Remove any highlighting from the file manager
-			top.ICEcoder.selectDeselectFile('deselect',top.ICEcoder.filesFrame.contentWindow.document.getElementById(closeFileName.replace(/\//g,"|")));
-
-			top.ICEcoder.setPreviousFiles();
 		}
-		// Lastly, stop it from trying to also switch tab
-		top.ICEcoder.canSwitchTabs=false;
+		if (!cM.somethingSelected()) {cM.setCursor(linePos, cursorPos+adjustCursor)};
 	},
 
+	// Highlight or hide block upon roll over/out of nest positions
+	highlightBlock: function(nestPos,hide) {
+		var cM, searchPos, cursor, startPos, endPos;
+
+		cM = ICEcoder.getcMInstance();
+		// Hiding the block
+		if (hide) {
+			// Set cursor back to orig pos if we haven't clicked, or redo 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, set 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) || 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, char, charPos;
+
+		cM = ICEcoder.getcMInstance();
+		// Set our 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 nest display to this nest depth & without any HTML tags to kill further interactivity
+		charPos = 0;
+		for (var 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;
+	},
+
+// ==============
+// FILES
+// ==============
+
 	// Setup the file manager
 	fileManager: function() {
 		ICEcoder.filesFrame = top.document.getElementById('filesFrame');
@@ -834,35 +603,157 @@ var ICEcoder = {
 		return false;
 	},
 
-	// Show & hide target element
-	showHide: function(doVis,elem) {
-		elem.style.visibility = doVis=="show" ? 'visible' : 'hidden';
-	},
+	// Update the file manager tree list on demand
+	updateFileManagerList: function(action,location,file,perms,oldName) {
+		var actionElemType, cssStyle, perms, targetElem, locNest, newText, innerLI, newUL, newLI, elemType, nameLI, shortURL, newMouseOver;
 
-	// Move current line up/down
-	moveLine: function(dir) {
-		var cM, line, swapLineNo, swapLine;
+		// Adding files
+		if (action=="add") {
+			// Is this is a file or folder and based on that, set the CSS styling & link
+			actionElemType = file.indexOf(".")>-1 ? "file" : "folder";
+			cssStyle = actionElemType=="file" ? "pft-file ext-" + file.substr(file.indexOf(".")+1) : "pft-directory";
+			perms = actionElemType=="file" ? 664 : 705;
 
-		cM = top.ICEcoder.getcMInstance();
-		line = cM.getCursor().line;
-		if (dir=="up" && line>0) {swapLineNo = line-1}
-		if (dir=="down" && line<cM.lineCount()-1) {swapLineNo = line+1}
-		if (!isNaN(swapLineNo)) {
-			swapLine = cM.getLine(swapLineNo);
-			cM.setLine(swapLineNo,cM.getLine(line));
-			cM.setLine(line,swapLine);
-			ICEcoder.highlightLine(swapLineNo);
+			// Identify our target element & the first child element in it's location
+			if (!location) {location="/"}
+			location = location.replace(top.iceRoot,"");
+			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(location.replace(/\//g,"|"));
+			locNest = targetElem.parentNode.parentNode.nextSibling;
+			if (locNest.nextSibling) {locNest = locNest.nextSibling}
+			newText = document.createTextNode("\n");
+			innerLI = '<a nohref title="'+location+"/"+file+'" onMouseOver="top.ICEcoder.overFileFolder(\''+actionElemType+'\',\''+location.replace(/\//g,"|")+"|"+file+'\')" onMouseOut="top.ICEcoder.overFileFolder(\''+actionElemType+'\',\'\')" style="position: relative; left:-22px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id="'+location.replace(/\//g,"|")+"|"+file+'">'+file+'</span> <span style="color: #888; font-size: 8px" id="'+location.replace(/\//g,"|")+"|"+file+'_perms">'+perms+'</span></a>';
+
+			// If we don't have at least 3 DOM items in here, it's an empty folder
+			if(!locNest.childNodes.length<3) {
+				// We now need to begin a new UL list
+				newUL = document.createElement("ul");
+				locNest = targetElem.parentNode.parentNode;
+				locNest.parentNode.insertBefore(newUL,locNest.nextSibling);
+
+				// Now we can add the first LI for this file/folder we're adding
+				newLI = document.createElement("li");
+				newLI.className = cssStyle;
+				newLI.innerHTML = innerLI
+				locNest.nextSibling.appendChild(newLI);
+				locNest.nextSibling.appendChild(newText);
+
+			// There are items in that location, so add our new item in the right position
+			} else {
+				for (var i=0;i<=locNest.childNodes.length-1;i++) {
+					if (locNest.childNodes[i].className) {
+						// Identify if the item we're considering is a file or folder
+						elemType = locNest.childNodes[i].className.indexOf('directory')>0 ? "folder" : "file";
+					
+						// Get the name of the item
+						nameLI = locNest.childNodes[i].getElementsByTagName('span')[0].innerHTML;
+
+						// If it's of the same type & the name is greater, or we're adding a folder and it's a file or if we're at the end of the list
+						if ((elemType==actionElemType && nameLI > file) || (actionElemType=="folder" && elemType=="file") || i==locNest.childNodes.length-1) {
+							newLI = document.createElement("li");
+							newLI.className = cssStyle;
+							newLI.innerHTML = innerLI;
+							// Append or insert depending on which of the above if statements is true
+							if (i==locNest.childNodes.length-1) {
+								locNest.appendChild(newLI);
+								locNest.appendChild(newText);
+							} else {
+								locNest.insertBefore(newLI,locNest.childNodes[i]);
+								locNest.insertBefore(newText,locNest.childNodes[i+1]);
+							}
+							break;
+						}
+					}
+				}
+			}
+			// If we added a new file, we've saved it under a new filename, so set that
+			if (actionElemType=="file") {
+				top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]=location+file;
+			}
+		}
+
+		// Renaming files
+		if (action=="rename") {
+			// Get short URL of our right clicked file and get target elem based on this
+			shortURL = oldName;
+			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|"));
+			// Set the name to be as per our new file/folder name
+			targetElem.innerHTML = file;
+			// Finally, update the ID of the target & set a new mouseover function for the parent too
+			targetElem.id = location.replace(/\//g,"|") + "|" + file;
+			newMouseOver = targetElem.parentNode.onmouseover.toString().replace(shortURL.substring(shortURL.lastIndexOf("|")+1),file).split('\'');
+			eval("targetElem.parentNode.onmouseover = function() { top.ICEcoder.overFileFolder('"+newMouseOver[1]+"','"+newMouseOver[3]+"');}");
+			targetElemPerms = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|")+"_perms");
+			targetElemPerms.id = location.replace(/\//g,"|") + "|" + file + "_perms";
+		}
+
+		// Chmod on files
+		if (action=="chmod") {
+			// Get short URL for our file and get our target elem based on this
+			shortURL = top.ICEcoder.rightClickedFile.replace(/\|/g,"/");
+			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|")+"_perms");
+			// Set the new perms
+			targetElem.innerHTML = perms;
+			}
+
+		// Deleting files
+		if (action=="delete") {
+			// Simply get our target and make it dissapear
+			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(location.replace(/\//g,"|")+"|"+file);
+			targetElem.parentNode.parentNode.style.display = "none";
 		}
 	},
 
-	// Highlight specified line
-	highlightLine: function(line) {
-		var cM;
+	// Carry out actions when clicking icons above file manager
+	fMIcon: function(action) {
 
-		cM = top.ICEcoder.getcMInstance();
-		cM.setSelection({line:line,ch:0}, {line:line,ch:cM.lineInfo(line).text.length});
+		if (action=="save" && ICEcoder.openFiles.length>0) {
+			top.ICEcoder.saveFile();
+		}
+
+		if (ICEcoder.selectedFiles.length==1) {
+			top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.ICEcoder.selectedFiles[0].replace('|','/');
+
+			if (action=="open" && ICEcoder.selectedFiles[0].indexOf(".")>-1) {
+				top.ICEcoder.thisFileFolderType='file';
+				top.ICEcoder.openFile();
+			}
+			if (action=="newFile")	 {top.ICEcoder.newFile();}
+			if (action=="newFolder") {top.ICEcoder.newFolder();}
+			if (action=="rename")	 {top.ICEcoder.renameFile(top.ICEcoder.rightClickedFile);}
+		}
+
+		if (action=="delete" && ICEcoder.selectedFiles.length>0) {
+			top.ICEcoder.deleteFile();
+		}
+
+		if (action=="view" && ICEcoder.openFiles.length>0) {
+			window.open(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]);
+		}
 	},
 
+	// Refresh file manager on demand
+	refreshFileManager: function() {
+		var pB;
+
+		pB = top.document.getElementById('progressBar').style;
+
+		pB.webkitAnimation = pB.mozAnimation = '';
+		setTimeout(function () {
+			pB.webkitAnimation = pB.mozAnimation = 'fullexpand 10s ease-out';
+		}, 4);
+		top.ICEcoder.showHide('show',top.document.getElementById('loadingMask'));
+		top.ICEcoder.filesFrame.src="files.php";
+		top.ICEcoder.filesFrame.style.opacity="0";
+		top.ICEcoder.filesFrame.onload = function() {
+			top.ICEcoder.filesFrame.style.opacity="1";
+			top.ICEcoder.showHide('hide',top.document.getElementById('loadingMask'));
+		}
+	},
+
+// ==============
+// FIND & REPLACE
+// ==============
+
 	// Update find & replace options based on user selection
 	findReplaceOptions: function() {
 		top.document.getElementById('rText').style.display =
@@ -986,41 +877,142 @@ var ICEcoder = {
 		}
 	},
 
-	// Go to a specific line number
-	goToLine: function(lineNo) {
-		var cM;
-
-		cM = ICEcoder.getcMInstance();
-		cM.setCursor(lineNo ? lineNo-1 : document.getElementById('goToLineNo').value-1);
-		cM.focus();
-		return false;
+	// Replace text in a file
+	replaceInFile: function(fileRef,find,replace) {
+		top.ICEcoder.serverQueue("add","lib/file-control.php?action=replaceText&fileRef="+fileRef.replace(/\//g,"|")+"&find="+find+"&replace="+replace);
+		top.ICEcoder.serverMessage('<b>Replacing text in</b><br>'+fileRef);
 	},
 
-	// Switch the CodeMirror mode on demand
-	switchMode: function() {
-		var cM;
+// ==============
+// INFO & DISPLAY
+// ==============
+
+	// Work out the nesting depth location on demand and update our display if required
+	getNestLocation: function(updateNestDisplay) {
+		var cM, nestCheck, state, cx, startPos, fileName;
 
 		cM = ICEcoder.getcMInstance();
-		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
-		if (fileName) {
-			fileName.indexOf('.js')>0	? cM.setOption("mode","javascript")
-			: fileName.indexOf('.coffee')>0	? cM.setOption("mode","coffeescript")
-			: fileName.indexOf('.rb')>0	? cM.setOption("mode","ruby")
-			: fileName.indexOf('.css')>0	? cM.setOption("mode","css")
-			: fileName.indexOf('.less')>0	? cM.setOption("mode","less")
-			: cM.setOption("mode","application/x-httpd-php");
+		nestCheck = cM.getValue();
+
+		// Set up array to store nest data
+		state = cM.getTokenAt(cM.getCursor()).state;
+		if ("undefined" != typeof state.curState) {
+			ICEcoder.htmlTagArray = [];
+			for (cx = state.curState.context; cx; cx = cx.prev) {
+				ICEcoder.htmlTagArray.unshift(cx.tagName);
+			}
+		}
+		ICEcoder.tagString = ICEcoder.htmlTagArray[ICEcoder.htmlTagArray.length-1];
+		if (ICEcoder.caretLocType=="JavaScript") {
+			ICEcoder.tagString = "script";
+		}
+
+		// Now we've built up our nest depth array, if we're due to show it in the display
+		if (updateNestDisplay && !top.ICEcoder.dontUpdateNest) {
+			// Clear the display
+			ICEcoder.nestDisplay.innerHTML = "";
+			if ("undefined" != typeof ICEcoder.openFiles[ICEcoder.selectedTab-1]) {
+				fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
+				if (["js","coffee","rb","css","less"].indexOf(fileName.split(".")[1])<0 &&
+					(nestCheck.indexOf("include(")==-1)&&(nestCheck.indexOf("include_once(")==-1)&&
+					(nestCheck.indexOf("<html")>-1||nestCheck.indexOf("<body")>-1)) {
+
+					// Then for all the array items, output as the nest display
+					for (var i=0;i<ICEcoder.htmlTagArray.length;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; "};
+					}
+				}
+			}
 		}
 	},
 
-	// Lock & unlock the file manager navigation on demand
-	lockUnlockNav: function() {
-		var lockIcon;
+	// Indicate if the nesting structure of the code is OK
+	updateNestingIndicator: function () {
+		var cM, nestOK, fileName;
 
-		lockIcon = top.document.getElementById('fmLock');
-		ICEcoder.lockedNav = ICEcoder.lockedNav ? false : true;
-		lockIcon.style.backgroundPosition = ICEcoder.lockedNav ? "-64px -16px" : "-80px -16px";
+		cM = ICEcoder.getcMInstance();
+		nestOK = true;
+		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
+		if (cM && fileName && ["js","coffee","rb","css","less"].indexOf(fileName.split(".")[1])==-1) {
+			nestOK = cM.getTokenAt({line:cM.lineCount(),ch:cM.lineInfo(cM.lineCount()-1).text.length}).className != "error" ? true : false;
+		}
+		ICEcoder.nestValid.style.backgroundColor = nestOK ? "#0b0" : "#f00";
+		ICEcoder.nestValid.innerHTML = nestOK ? "Nesting OK" : "Nesting Broken";
 	},
 
+	// Get the caret position on demand
+	getCaretPosition: function() {
+		var cM, content, line, char, charPos, charCount;
+
+		cM = ICEcoder.getcMInstance();
+		content = cM.getValue();
+		line = cM.getCursor().line;
+		char = cM.getCursor().ch;
+		charPos = 0;
+		for (var i=0;i<line;i++) {
+			charCount = content.indexOf("\n",charPos);
+			charPos=charCount+1;
+		}
+		ICEcoder.caretPos=(charPos+char-1);
+		ICEcoder.getNestLocation('yes');
+	},
+
+	// Update the code type, line & character display
+	updateCharDisplay: function() {
+		var cM;
+
+		cM = ICEcoder.getcMInstance();
+		ICEcoder.caretLocationType();
+		ICEcoder.charDisplay.innerHTML = ICEcoder.caretLocType + ", Line: " + (cM.getCursor().line+1) + ", Char: " + cM.getCursor().ch;
+	},
+
+	// Determine which area of the document we're in
+	caretLocationType: function() {
+		var cM, caretLocType, caretChunk, fileName;
+
+		cM = ICEcoder.getcMInstance();
+		caretLocType = "Unknown";
+		caretChunk = cM.getValue().substr(0,ICEcoder.caretPos+1);
+		if (caretChunk.lastIndexOf("<script")>caretChunk.lastIndexOf("</script>")&&caretLocType=="Unknown") {caretLocType = "JavaScript"};
+		if (caretChunk.lastIndexOf("<?")>caretChunk.lastIndexOf("?>")&&caretLocType=="Unknown") {caretLocType = "PHP"};
+		if (caretChunk.lastIndexOf("<%")>caretChunk.lastIndexOf("%>")&&caretLocType=="Unknown") {caretLocType = "Ruby"};
+		if (caretChunk.lastIndexOf("<")>caretChunk.lastIndexOf(">")&&caretLocType=="Unknown") {caretLocType = "HTML"};
+		if (caretLocType=="Unknown") {caretLocType = "Content"};
+
+		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
+		if (fileName.indexOf(".js")>0) {caretLocType="JavaScript"};
+		if (fileName.indexOf(".coffee")>0) {caretLocType="CoffeeScript"};
+		if (fileName.indexOf(".rb")>0) {caretLocType="Ruby"};
+		if (fileName.indexOf(".css")>0) {caretLocType="CSS"};
+		if (fileName.indexOf(".less")>0) {caretLocType="LESS"};
+
+		ICEcoder.caretLocType = caretLocType;
+
+		// If we're in a JS, CoffeeScript PHP or Ruby code block, add that to the nest display
+		if (["JavaScript","CoffeeScript","PHP","Ruby"].indexOf(caretLocType)>-1) {
+			ICEcoder.nestDisplay.innerHTML += " &gt; " + caretLocType;
+		}
+	},
+
+	// Alter array indicating which files have changed
+	redoChangedContent: function(evt) {
+		var key;
+		
+		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
+		// Exclude a few keys such as Escape...
+		if (top.ICEcoder.ctrlKeyDown==false && key!=27 && key!=20 && (key<16||key>19) && (key<37||key>40) && (key!=144||key!=145) && (key!=44||key!=45) && (key<33||key>36) && (key!=91||key!=92) && (key<112||key>123)) {
+			ICEcoder.changedContent[ICEcoder.selectedTab-1] = 1;
+			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
+		}
+	},
+
+	// Show & hide target element
+	showHide: function(doVis,elem) {
+		elem.style.visibility = doVis=="show" ? 'visible' : 'hidden';
+	},
+
+
 	// Determine the CodeMirror instance we're using on demand
 	getcMInstance: function(newTab) {
 		return top.ICEcoder.content.contentWindow[
@@ -1030,83 +1022,6 @@ var ICEcoder = {
 		];
 	},
 
-	// Start running plugin intervals according to given specifics
-	startPluginIntervals: function(plugRef,plugURL,plugTarget,plugTimer) {
-		top.ICEcoder['plugTimer'+plugRef] = 
-		// This window instances
-			["_parent","_top","_self",""].indexOf(plugTarget) > -1
-			? top.ICEcoder['plugTimer'+plugRef] = setInterval('window.location=\''+plugURL+'\'',plugTimer*1000*60)
-		// fileControl iframe instances
-			: plugTarget.indexOf("fileControl") == 0
-			? top.ICEcoder['plugTimer'+plugRef] = setInterval(function() {
-				top.ICEcoder.serverQueue("add",plugURL);top.ICEcoder.serverMessage(plugTarget.split(":")[1]);
-				},plugTimer*1000*60)
-		// _blank or named target window instances
-			: top.ICEcoder['plugTimer'+plugRef] = setInterval('window.open(\''+plugURL+'\',\''+plugTarget+'\')',plugTimer*1000*60);
-
-		// push the plugin ref into our array
-		top.ICEcoder.pluginIntervalRefs.push(plugRef);
-	},
-
-	// Comment or uncomment line on keypress
-	lineCommentToggle: function() {
-		var cM, cursorPos, linePos, lineContent, lCLen, adjustCursor, startLine, endLine;
-
-		cM = ICEcoder.getcMInstance();
-		cursorPos = cM.getCursor().ch;
-		linePos = cM.getCursor().line;
-		lineContent = cM.getLine(linePos);
-		lCLen = lineContent.length;
-		adjustCursor = 3;
-
-		if (["JavaScript","CoffeeScript","PHP","Ruby","CSS"].indexOf(ICEcoder.caretLocType)>-1) {
-			if (cM.somethingSelected()) {
-				if (ICEcoder.caretLocType=="Ruby") {
-					startLine = cM.getCursor(true).line;
-					endLine = cM.getCursor().line;
-					for (var i=startLine; i<=endLine; i++) {
-						cM.setLine(i, cM.getLine(i).slice(0,2)!="# "
-						? "# " + cM.getLine(i)
-						: cM.getLine(i).slice(2,cM.getLine(i).length));
-					}
-				} else {
-					cM.replaceSelection(cM.getSelection().slice(0,2)!="/*"
-					? "/*" + cM.getSelection() + "*/"
-					: cM.getSelection().slice(2,cM.getSelection().length-2));
-				}
-			} else {
-				if (["CoffeeScript","CSS"].indexOf(ICEcoder.caretLocType)>-1) {
-					cM.setLine(linePos, lineContent.slice(0,3)!="/* "
-					? "/* " + lineContent + " */"
-					: lineContent.slice(3,lCLen).slice(0,lCLen-5));
-					if (lineContent.slice(0,3)=="/* ") {adjustCursor = -adjustCursor};
-				} else if (ICEcoder.caretLocType=="Ruby") {
-					cM.setLine(linePos, lineContent.slice(0,2)!="# "
-					? "# " + lineContent
-					: lineContent.slice(2,lCLen));
-					if (lineContent.slice(0,2)=="# ") {adjustCursor = -adjustCursor};
-				} else {
-					cM.setLine(linePos, lineContent.slice(0,3)!="// "
-					? "// " + lineContent
-					: lineContent.slice(3,lCLen));
-					if (lineContent.slice(0,3)=="// ") {adjustCursor = -adjustCursor};
-				}
-			}
-		} else {
-			if (cM.somethingSelected()) {
-				cM.replaceSelection(cM.getSelection().slice(0,4)!="<!--"
-				? "<!--" + cM.getSelection() + "//-->"
-				: cM.getSelection().slice(4,cM.getSelection().length-5));
-			} else {
-				cM.setLine(linePos, lineContent.slice(0,4)!="<!--"
-				? "<!--" + lineContent + "//-->"
-				: lineContent.slice(4,lCLen).slice(0,lCLen-9));
-				adjustCursor = lineContent.slice(0,4)=="<!--" ? -4 : 4;
-			}
-		}
-		if (!cM.somethingSelected()) {cM.setCursor(linePos, cursorPos+adjustCursor)};
-	},
-
 	// Get the mouse position on demand
 	getMouseXY: function(e,area) {
 		var tempX, tempY, scrollTop;
@@ -1142,104 +1057,78 @@ var ICEcoder = {
 		}
 	},
 
-	// Update the file manager tree list on demand
-	updateFileManagerList: function(action,location,file,perms,oldName) {
-		var actionElemType, cssStyle, perms, targetElem, locNest, newText, innerLI, newUL, newLI, elemType, nameLI, shortURL, newMouseOver;
+	// Show or hide a server message
+	serverMessage: function(message) {
+		var serverMessage;
 
-		// Adding files
-		if (action=="add") {
-			// Is this is a file or folder and based on that, set the CSS styling & link
-			actionElemType = file.indexOf(".")>-1 ? "file" : "folder";
-			cssStyle = actionElemType=="file" ? "pft-file ext-" + file.substr(file.indexOf(".")+1) : "pft-directory";
-			perms = actionElemType=="file" ? 664 : 705;
+		serverMessage =	document.getElementById('serverMessage');
+		if (message) {serverMessage.innerHTML = message};
+		serverMessage.style.opacity = message ? 1 : 0;
+	},
 
-			// Identify our target element & the first child element in it's location
-			if (!location) {location="/"}
-			location = location.replace(top.iceRoot,"");
-			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(location.replace(/\//g,"|"));
-			locNest = targetElem.parentNode.parentNode.nextSibling;
-			if (locNest.nextSibling) {locNest = locNest.nextSibling}
-			newText = document.createTextNode("\n");
-			innerLI = '<a nohref title="'+location+"/"+file+'" onMouseOver="top.ICEcoder.overFileFolder(\''+actionElemType+'\',\''+location.replace(/\//g,"|")+"|"+file+'\')" onMouseOut="top.ICEcoder.overFileFolder(\''+actionElemType+'\',\'\')" style="position: relative; left:-22px">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id="'+location.replace(/\//g,"|")+"|"+file+'">'+file+'</span> <span style="color: #888; font-size: 8px" id="'+location.replace(/\//g,"|")+"|"+file+'_perms">'+perms+'</span></a>';
+	// Show a CSS color block next to our text cursor
+	cssColorPreview: function() {
+		var cM, string, rx, match, oldBlock, newBlock;
 
-			// If we don't have at least 3 DOM items in here, it's an empty folder
-			if(!locNest.childNodes.length<3) {
-				// We now need to begin a new UL list
-				newUL = document.createElement("ul");
-				locNest = targetElem.parentNode.parentNode;
-				locNest.parentNode.insertBefore(newUL,locNest.nextSibling);
+		cM = ICEcoder.getcMInstance();
+		string = cM.getLine(cM.getCursor().line);
+		rx = /(#[\da-f]{3}(?:[\da-f]{3})?\b|\b(?:rgb|hsl)a?\([\s\d%,.-]+\)|\b[a-z]+\b)/gi;
 
-				// Now we can add the first LI for this file/folder we're adding
-				newLI = document.createElement("li");
-				newLI.className = cssStyle;
-				newLI.innerHTML = innerLI
-				locNest.nextSibling.appendChild(newLI);
-				locNest.nextSibling.appendChild(newText);
+		while((match = rx.exec(string)) && cM.getCursor().ch > match.index+match[0].length);
 
-			// There are items in that location, so add our new item in the right position
-			} else {
-				for (var i=0;i<=locNest.childNodes.length-1;i++) {
-					if (locNest.childNodes[i].className) {
-						// Identify if the item we're considering is a file or folder
-						elemType = locNest.childNodes[i].className.indexOf('directory')>0 ? "folder" : "file";
-					
-						// Get the name of the item
-						nameLI = locNest.childNodes[i].getElementsByTagName('span')[0].innerHTML;
-
-						// If it's of the same type & the name is greater, or we're adding a folder and it's a file or if we're at the end of the list
-						if ((elemType==actionElemType && nameLI > file) || (actionElemType=="folder" && elemType=="file") || i==locNest.childNodes.length-1) {
-							newLI = document.createElement("li");
-							newLI.className = cssStyle;
-							newLI.innerHTML = innerLI;
-							// Append or insert depending on which of the above if statements is true
-							if (i==locNest.childNodes.length-1) {
-								locNest.appendChild(newLI);
-								locNest.appendChild(newText);
-							} else {
-								locNest.insertBefore(newLI,locNest.childNodes[i]);
-								locNest.insertBefore(newText,locNest.childNodes[i+1]);
-							}
-							break;
-						}
-					}
-				}
-			}
-			// If we added a new file, we've saved it under a new filename, so set that
-			if (actionElemType=="file") {
-				top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]=location+file;
-			}
+		oldBlock = top.document.getElementById('content').contentWindow.document.getElementById('cssColor');
+		if (oldBlock) {oldBlock.parentNode.removeChild(oldBlock)};
+		if (top.ICEcoder.codeAssist && top.ICEcoder.caretLocType=="CSS") {
+			newBlock = top.document.createElement("div");
+			newBlock.id = "cssColor";
+			newBlock.style.position = "absolute";
+			newBlock.style.display = "block";
+			newBlock.style.width = newBlock.style.height = "20px";
+			newBlock.style.background = match ? match[0] : '';
+			if (newBlock.style.backgroundColor=="") {newBlock.style.display = "none"};
+			top.document.getElementById('header').appendChild(newBlock);
+			cM.addWidget(cM.getCursor(), top.document.getElementById('cssColor'), true);
 		}
+	},
 
-		// Renaming files
-		if (action=="rename") {
-			// Get short URL of our right clicked file and get target elem based on this
-			shortURL = oldName;
-			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|"));
-			// Set the name to be as per our new file/folder name
-			targetElem.innerHTML = file;
-			// Finally, update the ID of the target & set a new mouseover function for the parent too
-			targetElem.id = location.replace(/\//g,"|") + "|" + file;
-			newMouseOver = targetElem.parentNode.onmouseover.toString().replace(shortURL.substring(shortURL.lastIndexOf("|")+1),file).split('\'');
-			eval("targetElem.parentNode.onmouseover = function() { top.ICEcoder.overFileFolder('"+newMouseOver[1]+"','"+newMouseOver[3]+"');}");
-			targetElemPerms = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|")+"_perms");
-			targetElemPerms.id = location.replace(/\//g,"|") + "|" + file + "_perms";
+	// Change opacity of the file manager icons on demand
+	fMIconVis: function(icon, vis) {
+		var i;
+
+		if (i = top.document.getElementById(icon)) {
+			i.style.opacity = vis;
 		}
+	},
 
-		// Chmod on files
-		if (action=="chmod") {
-			// Get short URL for our file and get our target elem based on this
-			shortURL = top.ICEcoder.rightClickedFile.replace(/\|/g,"/");
-			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(shortURL.replace(/\//g,"|")+"_perms");
-			// Set the new perms
-			targetElem.innerHTML = perms;
-			}
+	// Check if a file is already open
+	isOpen: function(file) {
+		var i;
 
-		// Deleting files
-		if (action=="delete") {
-			// Simply get our target and make it dissapear
-			targetElem = document.getElementById('filesFrame').contentWindow.document.getElementById(location.replace(/\//g,"|")+"|"+file);
-			targetElem.parentNode.parentNode.style.display = "none";
-		}
+		file = file.replace(/\|/g, "/").replace(top.docRoot+top.iceRoot,"");
+		i = top.ICEcoder.openFiles.indexOf(file);
+		return i!=-1 ? i : false;
+	},
+
+// ==============
+// SYSTEM
+// ==============
+
+	// Start running plugin intervals according to given specifics
+	startPluginIntervals: function(plugRef,plugURL,plugTarget,plugTimer) {
+		top.ICEcoder['plugTimer'+plugRef] = 
+		// This window instances
+			["_parent","_top","_self",""].indexOf(plugTarget) > -1
+			? top.ICEcoder['plugTimer'+plugRef] = setInterval('window.location=\''+plugURL+'\'',plugTimer*1000*60)
+		// fileControl iframe instances
+			: plugTarget.indexOf("fileControl") == 0
+			? top.ICEcoder['plugTimer'+plugRef] = setInterval(function() {
+				top.ICEcoder.serverQueue("add",plugURL);top.ICEcoder.serverMessage(plugTarget.split(":")[1]);
+				},plugTimer*1000*60)
+		// _blank or named target window instances
+			: top.ICEcoder['plugTimer'+plugRef] = setInterval('window.open(\''+plugURL+'\',\''+plugTarget+'\')',plugTimer*1000*60);
+
+		// push the plugin ref into our array
+		top.ICEcoder.pluginIntervalRefs.push(plugRef);
 	},
 
 	// Turning on/off the Code Assist
@@ -1252,15 +1141,6 @@ var ICEcoder = {
 		cM.focus();
 	},
 
-	// Show or hide a server message
-	serverMessage: function(message) {
-		var serverMessage;
-
-		serverMessage =	document.getElementById('serverMessage');
-		if (message) {serverMessage.innerHTML = message};
-		serverMessage.style.opacity = message ? 1 : 0;
-	},
-
 	// Queue items up for processing in turn
 	serverQueue: function(action,item) {
 		var cM,nextSaveID,txtArea,topSaveID,element;
@@ -1304,68 +1184,6 @@ var ICEcoder = {
 		}
 	},
 
-	// Show a CSS color block next to our text cursor
-	cssColorPreview: function() {
-		var cM, string, rx, match, oldBlock, newBlock;
-
-		cM = ICEcoder.getcMInstance();
-		string = cM.getLine(cM.getCursor().line);
-		rx = /(#[\da-f]{3}(?:[\da-f]{3})?\b|\b(?:rgb|hsl)a?\([\s\d%,.-]+\)|\b[a-z]+\b)/gi;
-
-		while((match = rx.exec(string)) && cM.getCursor().ch > match.index+match[0].length);
-
-		oldBlock = top.document.getElementById('content').contentWindow.document.getElementById('cssColor');
-		if (oldBlock) {oldBlock.parentNode.removeChild(oldBlock)};
-		if (top.ICEcoder.codeAssist && top.ICEcoder.caretLocType=="CSS") {
-			newBlock = top.document.createElement("div");
-			newBlock.id = "cssColor";
-			newBlock.style.position = "absolute";
-			newBlock.style.display = "block";
-			newBlock.style.width = newBlock.style.height = "20px";
-			newBlock.style.background = match ? match[0] : '';
-			if (newBlock.style.backgroundColor=="") {newBlock.style.display = "none"};
-			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.ICEcoder.selectedFiles[0].replace('|','/');
-
-			if (action=="open" && ICEcoder.selectedFiles[0].indexOf(".")>-1) {
-				top.ICEcoder.thisFileFolderType='file';
-				top.ICEcoder.openFile();
-			}
-			if (action=="newFile")	 {top.ICEcoder.newFile();}
-			if (action=="newFolder") {top.ICEcoder.newFolder();}
-			if (action=="rename")	 {top.ICEcoder.renameFile(top.ICEcoder.rightClickedFile);}
-		}
-
-		if (action=="delete" && ICEcoder.selectedFiles.length>0) {
-			top.ICEcoder.deleteFile();
-		}
-
-		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) {
-		var i;
-
-		if (i = top.document.getElementById(icon)) {
-			i.style.opacity = vis;
-		}
-	},
-
 	// Cancel all actions on pressing Esc in non content areas
 	cancelAllActions: function() {
 		// Stop whatever the parent may be loading and clear tasks other than the current one
@@ -1378,70 +1196,6 @@ var ICEcoder = {
 		setTimeout(function() {top.ICEcoder.serverMessage();},2000);
 	},
 
-	// Highlight or hide block upon roll over/out of nest positions
-	highlightBlock: function(nestPos,hide) {
-		var cM, searchPos, cursor, startPos, endPos;
-
-		cM = ICEcoder.getcMInstance();
-		// Hiding the block
-		if (hide) {
-			// Set cursor back to orig pos if we haven't clicked, or redo 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, set 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) || 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, char, charPos;
-
-		cM = ICEcoder.getcMInstance();
-		// Set our 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 nest display to this nest depth & without any HTML tags to kill further interactivity
-		charPos = 0;
-		for (var 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;
-	},
-
 	// Set the current previousFiles in the settings file
 	setPreviousFiles: function() {
 		var previousFiles;
@@ -1461,34 +1215,6 @@ var ICEcoder = {
 		}
 	},
 
-	// Check if a file is already open
-	isOpen: function(file) {
-		var i;
-
-		file = file.replace(/\|/g, "/").replace(top.docRoot+top.iceRoot,"");
-		i = top.ICEcoder.openFiles.indexOf(file);
-		return i!=-1 ? i : false;
-	},
-
-	// Refresh file manager on demand
-	refreshFileManager: function() {
-		var pB;
-
-		pB = top.document.getElementById('progressBar').style;
-
-		pB.webkitAnimation = pB.mozAnimation = '';
-		setTimeout(function () {
-			pB.webkitAnimation = pB.mozAnimation = 'fullexpand 10s ease-out';
-		}, 4);
-		top.ICEcoder.showHide('show',top.document.getElementById('loadingMask'));
-		top.ICEcoder.filesFrame.src="files.php";
-		top.ICEcoder.filesFrame.style.opacity="0";
-		top.ICEcoder.filesFrame.onload = function() {
-			top.ICEcoder.filesFrame.style.opacity="1";
-			top.ICEcoder.showHide('hide',top.document.getElementById('loadingMask'));
-		}
-	},
-
 	// Show the settings screen
 	settingsScreen: function(hide) {
 		if (!hide) {
@@ -1672,9 +1398,321 @@ var ICEcoder = {
 		return prompt(question,defaultValue);
 	},
 
-	// Replace text in a file
-	replaceInFile: function(fileRef,find,replace) {
-		top.ICEcoder.serverQueue("add","lib/file-control.php?action=replaceText&fileRef="+fileRef.replace(/\//g,"|")+"&find="+find+"&replace="+replace);
-		top.ICEcoder.serverMessage('<b>Replacing text in</b><br>'+fileRef);
+// ==============
+// TABS
+// ==============
+
+	// Change tabs by switching visibility of instances
+	switchTab: function(newTab,noFocus) {
+		var cM;
+
+		// Identify tab that's currently selected & get the instance
+		ICEcoder.selectedTab = newTab;
+		cM = ICEcoder.getcMInstance();
+
+		if (cM) {
+			// Switch mode to HTML, PHP, CSS etc
+			ICEcoder.switchMode();
+
+			// Set all cM instances to be hidden, then make our selected instance visible
+			for (var i=0;i<ICEcoder.cMInstances.length;i++) {
+				ICEcoder.content.contentWindow['cM'+ICEcoder.cMInstances[i]].getWrapperElement().style.display = "none";
+			}
+			cM.setOption('theme',top.theme);
+			cM.getWrapperElement().style.display = "block";
+
+			// Focus on & refresh our selected instance
+			if (!noFocus) {cM.focus();}
+			cM.refresh();
+
+			// Highlight the selected tab
+			ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
+
+			// Redo our find display
+			top.ICEcoder.findMode = false;
+			ICEcoder.findReplace('find',true,false);
+
+			// Finally, update the cursor display
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.updateCharDisplay();
+		}
+	},
+
+	// Starts a new file by setting a few vars & creating a new cM instance
+	newTab: function() {
+		var cM;
+
+		ICEcoder.cMInstances.push(ICEcoder.nextcMInstance);
+		ICEcoder.selectedTab = ICEcoder.cMInstances.length;
+		ICEcoder.showHide('show',ICEcoder.content);
+		ICEcoder.content.contentWindow.createNewCMInstance(ICEcoder.nextcMInstance);
+		ICEcoder.setLayout();
+
+		ICEcoder.thisFileFolderType='file';
+		ICEcoder.thisFileFolderLink='/[NEW]';
+		ICEcoder.openFile();
+
+		cM = ICEcoder.getcMInstance('new');
+		ICEcoder.switchTab(ICEcoder.openFiles.length);
+
+		cM.setLineClass(ICEcoder['cMActiveLine'+ICEcoder.selectedTab], null);
+		ICEcoder['cMActiveLine'+ICEcoder.selectedTab] = cM.setLineClass(0, "cm-s-activeLine");
+		ICEcoder.nextcMInstance++;
+	},
+
+	// Create a new tab for a file
+	createNewTab: function() {
+		var closeTabLink;
+
+		// Push new file into array
+		top.ICEcoder.openFiles.push(top.ICEcoder.shortURL);
+
+		// Setup a new tab
+		closeTabLink = '<a nohref onClick="top.ICEcoder.closeTab('+(top.ICEcoder.openFiles.length)+')"><img src="images/nav-close.gif" id="closeTabButton'+(top.ICEcoder.openFiles.length)+'" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'" onMouseOut="this.style.backgroundColor=prevBG"></a>';
+		top.document.getElementById('tab'+(top.ICEcoder.openFiles.length)).style.display = "inline-block";
+		top.document.getElementById('tab'+(top.ICEcoder.openFiles.length)).innerHTML = top.ICEcoder.openFiles[top.ICEcoder.openFiles.length-1] + " " + closeTabLink;
+
+		// Highlight it and state it's selected
+		top.ICEcoder.redoTabHighlight(top.ICEcoder.openFiles.length);
+		top.ICEcoder.selectedTab=top.ICEcoder.openFiles.length;
+
+		// Add a new value ready to indicate if this content has been changed
+		top.ICEcoder.changedContent.push(0);
+
+		top.ICEcoder.setPreviousFiles();
+	},
+
+	// Cycle to next tab
+	nextTab: function() {
+		var goToTab;
+
+		goToTab = top.ICEcoder.selectedTab+1 <= top.ICEcoder.openFiles.length ? top.ICEcoder.selectedTab+1 : 1;
+		top.ICEcoder.switchTab(goToTab,'noFocus');
+	},
+
+	// Cycle to next tab
+	previousTab: function() {
+		var goToTab;
+
+		goToTab = top.ICEcoder.selectedTab-1 >= 1 ? top.ICEcoder.selectedTab-1 : top.ICEcoder.openFiles.length;
+		top.ICEcoder.switchTab(goToTab,'noFocus');
+	},
+
+	// Create a new tab for a file
+	renameTab: function(tabNum,newName) {
+		var closeTabLink;
+
+		// Push new file into array
+		top.ICEcoder.openFiles[tabNum-1] = newName;
+
+		// Setup a new tab
+		closeTabLink = '<a nohref onClick="parent.ICEcoder.closeTab('+tabNum+')"><img src="images/nav-close.gif" id="closeTabButton'+tabNum+'" class="closeTab" onMouseOver="prevBG=this.style.backgroundColor;this.style.backgroundColor=\'#333\'" onMouseOut="this.style.backgroundColor=prevBG"></a>';
+		top.document.getElementById('tab'+tabNum).innerHTML = top.ICEcoder.openFiles[tabNum-1] + " " + closeTabLink;
+	},
+
+	// Reset all tabs to be without a highlight and then highlight the selected
+	redoTabHighlight: function(selectedTab) {
+		var cM, bgVPos, tColor, fileLink;
+
+		cM = ICEcoder.getcMInstance();
+		for(var i=1;i<=ICEcoder.changedContent.length;i++) {
+			if (document.getElementById('closeTabButton'+i)) {
+				document.getElementById('closeTabButton'+i).style.backgroundColor = ICEcoder.changedContent[i-1]==1 && cM.historySize().undo>0
+				? "#b00" : "rgba(255,255,255,0.3)";
+			}
+			tColor = i==selectedTab ? "#000" : "#fff";
+			if ("undefined" != typeof top.ICEcoder.openFiles[i-1] && top.ICEcoder.openFiles[i-1] != "/[NEW]") {
+				fileLink = top.ICEcoder.filesFrame.contentWindow.document.getElementById(top.ICEcoder.openFiles[i-1].replace(/\//g,"|"));
+				if (fileLink) {fileLink.style.backgroundColor = i==selectedTab ? "#49d" : "rgba(255,255,255,0.15)";};
+			}
+			document.getElementById('tab'+i).style.color = tColor;
+			bgVPos = i==selectedTab ? -22 : 0;
+			document.getElementById('tab'+i).style.backgroundPosition = "0 "+bgVPos+"px";
+		}
+		top.ICEcoder.fMIconVis('fMSave',ICEcoder.changedContent[selectedTab-1]==1 ? 1 : 0.3);
+	},
+
+	// Close the tab upon request
+	closeTab: function(closeTabNum) {
+		var cM, okToRemove, closeFileName;
+
+		cM = ICEcoder.getcMInstance();
+		okToRemove = true;
+		if (ICEcoder.changedContent[closeTabNum-1]==1) {
+			okToRemove = top.ICEcoder.ask('You have made changes.\n\nAre you sure you want to close without saving?');
+		}
+
+		if (okToRemove) {
+			// Get the filename of tab we're closing
+			closeFileName = top.ICEcoder.openFiles[closeTabNum-1];
+
+			// recursively copy over all tabs & data from the tab to the right, if there is one
+			for (var i=closeTabNum;i<ICEcoder.openFiles.length;i++) {
+				top.document.getElementById('tab'+i).innerHTML = top.document.getElementById('tab'+(i+1)).innerHTML;
+				ICEcoder.openFiles[i-1] = ICEcoder.openFiles[i];
+
+				// reduce the tab reference number on the closeTab link by 1
+				top.document.getElementById('tab'+i).innerHTML = top.document.getElementById('tab'+i).innerHTML.replace(("closeTab("+(i+1)+")"),"closeTab("+i+")").replace(("closeTabButton("+(i+1)+")"),"closeTabButton("+i+")");
+			}
+			// hide the instance we're closing by setting the hide class and removing from the array
+			ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[closeTabNum-1]].getWrapperElement().style.display = "none";
+			top.ICEcoder.cMInstances.splice(closeTabNum-1,1);
+			// clear the rightmost tab (or only one left in a 1 tab scenario) & remove from the array
+			top.document.getElementById('tab'+ICEcoder.openFiles.length).style.display = "none";
+			top.document.getElementById('tab'+ICEcoder.openFiles.length).innerHTML = "";
+			ICEcoder.openFiles.pop();
+			ICEcoder.openFileMDTs.pop();
+			// If we're closing the selected tab, determin the new selectedTab number, reduced by 1 if we have some tabs, 0 for a reset state
+			if (ICEcoder.selectedTab==closeTabNum) {
+				ICEcoder.openFiles.length>0 ? ICEcoder.selectedTab-=1 : ICEcoder.selectedTab = 0;
+			}
+			if (ICEcoder.openFiles.length>0 && ICEcoder.selectedTab==0) {ICEcoder.selectedTab=1};
+
+			// grey out the view icon
+			if (ICEcoder.openFiles.length==0) {
+				top.ICEcoder.fMIconVis('fMView',0.3);
+			} else {
+				// Switch the mode & the tab
+				ICEcoder.switchMode();
+				ICEcoder.switchTab(ICEcoder.selectedTab);
+			}
+			// Highlight the selected tab after splicing the change state out of the array
+			top.ICEcoder.changedContent.splice(closeTabNum-1,1);
+			top.parent.ICEcoder.redoTabHighlight(ICEcoder.selectedTab);
+
+			// Remove any highlighting from the file manager
+			top.ICEcoder.selectDeselectFile('deselect',top.ICEcoder.filesFrame.contentWindow.document.getElementById(closeFileName.replace(/\//g,"|")));
+
+			top.ICEcoder.setPreviousFiles();
+		}
+		// Lastly, stop it from trying to also switch tab
+		top.ICEcoder.canSwitchTabs=false;
+	},
+
+// ==============
+// UI
+// ==============
+
+	// Detect keys/combos plus identify our area and set the vars, perform actions
+	interceptKeys: function(area, evt) {
+		var key;
+
+		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
+
+		// DEL (Delete file)
+		if (key==46 && area == "files") {
+			top.ICEcoder.delKeyDown = true;
+			top.ICEcoder.deleteFile();
+	        	return false;
+
+		// CTRL key down
+       		} else if(key==17) {
+			top.ICEcoder.ctrlKeyDown = true;
+	        	return false;
+
+		// Shift key down
+       		} else if(key==16) {
+			top.ICEcoder.shiftKeyDown = true;
+	        	return false;
+
+		// CTRL+F (Find)
+		} else if(key==70 && top.ICEcoder.ctrlKeyDown==true) {
+			top.document.getElementById('find').focus();
+			top.ICEcoder.ctrlKeyDown = false;
+	        	return false;
+
+		// CTRL+G (Go to line)
+		} else if(key==71 && top.ICEcoder.ctrlKeyDown==true) {
+			top.document.getElementById('goToLineNo').focus();
+			top.ICEcoder.ctrlKeyDown = false;
+	        	return false;
+
+		// CTRL+I (Get info)
+		} else if(key==73 && top.ICEcoder.ctrlKeyDown==true && area == "content") {
+			var searchPrefix = "";
+			if (top.ICEcoder.caretLocType!="Content") {
+				searchPrefix = top.ICEcoder.caretLocType.toLowerCase()+" ";
+			}
+			window.open("http://www.google.com/#output=search&q="+searchPrefix+top.ICEcoder.getcMInstance().getSelection());
+			top.ICEcoder.ctrlKeyDown = false;
+	        	return false;
+
+		// CTRL+right arrow (Next tab)
+		} else if(key==39 && top.ICEcoder.ctrlKeyDown==true && area!="content") {
+			top.ICEcoder.nextTab();
+	        	return false;
+
+		// CTRL+left arrow (Previous tab)
+		} else if(key==37 && top.ICEcoder.ctrlKeyDown==true && area!="content") {
+			top.ICEcoder.previousTab();
+	        	return false;
+
+		// CTRL+up arrow (Move line up)
+		} else if(key==38 && top.ICEcoder.ctrlKeyDown==true && area=="content") {
+			top.ICEcoder.moveLine('up');
+	        	return false;
+
+		// CTRL+down arrow (Move line down)
+		} else if(key==40 && top.ICEcoder.ctrlKeyDown==true && area=="content") {
+			top.ICEcoder.moveLine('down');
+	        	return false;
+
+		// CTRL+numeric plus (New tab)
+		} else if(key==107 && top.ICEcoder.ctrlKeyDown==true) {
+			top.ICEcoder.newTab();
+	        	return false;
+
+		// CTRL+numeric minus (Close tab)
+		} else if(key==109 && top.ICEcoder.ctrlKeyDown==true) {
+			top.ICEcoder.closeTab(top.ICEcoder.selectedTab);
+	        	return false;
+
+		// CTRL+S (Save), CTRL+Shift+S (Save As)
+		} else if(key==83 && top.ICEcoder.ctrlKeyDown==true) {
+			if(top.ICEcoder.shiftKeyDown==true) {
+				top.ICEcoder.saveFile('saveAs');
+				top.ICEcoder.shiftKeyDown = false;
+			} else {
+				top.ICEcoder.saveFile();
+			}
+			top.ICEcoder.stickyTabMaybe = true;
+	        	return false;
+
+		// CTRL+Enter (Open Webpage)
+		} else if(key==13 && top.ICEcoder.ctrlKeyDown==true && top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1] != "/[NEW]") {
+			if (top.ICEcoder.stickyTabMaybe) {
+				top.ICEcoder.stickyTabWindow = window.open(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1],"stickyTab");
+				top.ICEcoder.stickyTab = true;
+			} else {
+				window.open(top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1]);
+			}
+			top.ICEcoder.ctrlKeyDown = false;
+	        	return false;
+
+		// 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;
+        	}
+	},
+
+	// Reset the state of keys back to the normal state
+	resetKeys: function(evt) {
+		var key;
+
+		key = evt.keyCode ? evt.keyCode : evt.which ? evt.which : evt.charCode;
+
+		if (key==17) {top.ICEcoder.ctrlKeyDown = false; top.ICEcoder.stickyTabMaybe = false}
+		if (key==16) {top.ICEcoder.shiftKeyDown = false}
+		if (key==46) {top.ICEcoder.delKeyDown = false}
 	}
 };
\ No newline at end of file