v0.9.0 alpha

Code condensing
pB var setup to avoid repeating long DOM elem refs again Removed end point from substr, not necessary Put 3 x themes into an array and test using indexOf instead Syntax spacing in a couple of areas
2026-03-16 13:27:05 +01:00 · 2012-10-08 07:49:43 +01:00 · 2012-10-08 07:37:08 +01:00 · 2012-10-06 18:06:01 +01:00 · 2012-10-06 15:43:23 +01:00 · 2012-10-05 15:41:58 +01:00
31 changed files with 535 additions and 645 deletions
--- a/CodeMirror-2.33/lib/codemirror-compressed.js
+++ b/CodeMirror-2.33/lib/codemirror-compressed.js
--- a/CodeMirror-2.34/LICENSE
+++ b/CodeMirror-2.34/LICENSE
--- a/CodeMirror-2.34/lib/codemirror-compressed.js
+++ b/CodeMirror-2.34/lib/codemirror-compressed.js
--- a/CodeMirror-2.34/lib/codemirror.css
+++ b/CodeMirror-2.34/lib/codemirror.css
@@ -145,7 +145,7 @@ div.CodeMirror-selected { background: #d9d9d9; }
 .cm-s-default span.cm-error {color: #f00;}
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30a;}
-.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-bracket {color: #997;}
 .cm-s-default span.cm-tag {color: #170;}
 .cm-s-default span.cm-attribute {color: #00c;}
 .cm-s-default span.cm-header {color: blue;}
@@ -170,4 +170,4 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
    visibility: hidden;
  }

-}
+}
--- a/CodeMirror-2.34/theme/blackboard.css
+++ b/CodeMirror-2.34/theme/blackboard.css
--- a/CodeMirror-2.34/theme/cobalt.css
+++ b/CodeMirror-2.34/theme/cobalt.css
--- a/CodeMirror-2.34/theme/eclipse.css
+++ b/CodeMirror-2.34/theme/eclipse.css
--- a/CodeMirror-2.34/theme/elegant.css
+++ b/CodeMirror-2.34/theme/elegant.css
--- a/CodeMirror-2.34/theme/erlang-dark.css
+++ b/CodeMirror-2.34/theme/erlang-dark.css
--- a/CodeMirror-2.34/theme/lesser-dark.css
+++ b/CodeMirror-2.34/theme/lesser-dark.css
--- a/CodeMirror-2.34/theme/monokai.css
+++ b/CodeMirror-2.34/theme/monokai.css
--- a/CodeMirror-2.34/theme/neat.css
+++ b/CodeMirror-2.34/theme/neat.css
--- a/CodeMirror-2.34/theme/night.css
+++ b/CodeMirror-2.34/theme/night.css
--- a/CodeMirror-2.34/theme/rubyblue.css
+++ b/CodeMirror-2.34/theme/rubyblue.css
--- a/CodeMirror-2.34/theme/vibrant-ink.css
+++ b/CodeMirror-2.34/theme/vibrant-ink.css
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#ICEcoder
+#ICEcoder v0.9.0 alpha
 ##Web based IDE for smart web development

 Early version of the web based IDE which allows for creation of websites in the web browser. Uses the brilliant CodeMirror for code highlighting & editing, with a slick IDE wrapped around it to make the whole thing work.
@@ -32,9 +32,10 @@ Early version of the web based IDE which allows for creation of websites in the
 * CTRL+S+Enter opens a sticky tab to show live edits
 * ESC = Comment/Uncomment line, incl partial lines
 * Image viewer
-* Colour preview block on CSS colours, ie red, #ff0000 or  RGBA(255,0,0,0.5)
+* Colour preview block on CSS colours, ie red, #f00 or  RGBA(255,0,0,0.5)
 * MySQL Database management via Adminer plugin
 * Backs up files every 10 mins or on click of backup plugin icon
+* Github repo syncing with ICErepo plugin

 ###Installation

--- a/editor.php
+++ b/editor.php
@@ -3,17 +3,14 @@

 <html style="margin: 0" onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'editor');top.ICEcoder.canResizeFilesW()}">
 <head>
-<title>ICEcoder editor</title>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> alpha editor</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
 <!--
 codemirror-compressed.js
-includes:
-codemirror.js
-modes:
-clike, coffeescript, css, javascript, less, php, ruby & xml
-utils:
-foldcode, searchcursor, match-highlighter
+incls:	codemirror.js
+modes:	clike, coffeescript, css, javascript, less, php, ruby & xml
+utils:	foldcode, searchcursor, match-highlighter
 //-->
 <script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
 <link rel="stylesheet" href="<?php
@@ -35,155 +32,154 @@ span.CodeMirror-matchhighlight {background: #555}
 <body onLoad="top.ICEcoder.updateFileFolderCount()" style="color: #fff; margin: 0" onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);">

 <div style="margin: 32px 43px; font-family: arial; font-size: 10px; color: #ddd">
-<?php
-echo '<div style="float: left; margin-right: 50px">'.PHP_EOL;
-echo '<h2 style="color: rgba(0,198,255,0.7)">server</h2>'.PHP_EOL;
-echo '<span style="color:#888">Server name, OS & IP:</span><br>'.PHP_EOL;
-echo $_SERVER['SERVER_NAME'].' &nbsp;&nbsp; '.$_SERVER['SERVER_SOFTWARE'].' &nbsp;&nbsp; '.$_SERVER['SERVER_ADDR'].'<br><br>'.PHP_EOL;
-echo '<span style="color:#888">Root:</span><br>'.PHP_EOL;
-echo $docRoot.'<br><br>'.PHP_EOL;
-echo '<span style="color:#888">ICEcoder root:</span><br>'.PHP_EOL;
-echo $docRoot.$ICEcoder['root'].'<br><br>'.PHP_EOL;
-echo '<span style="color:#888">PHP version:</span><br>'.PHP_EOL;
-echo phpversion().'<br><br>'.PHP_EOL;
-echo '<span style="color:#888">Date & time:</span><br>'.PHP_EOL;
-echo '<span id="serverDT"></span><br><br><br>'.PHP_EOL;
-echo '</div>'.PHP_EOL;
+	<div style="float: left; margin-right: 50px">
+		<h2 style="color: rgba(0,198,255,0.7)">server</h2>
+		<span style="color:#888">Server name, OS & IP:</span><br>
+		<?php echo $_SERVER['SERVER_NAME']." &nbsp;&nbsp ".$_SERVER['SERVER_SOFTWARE']." &nbsp;&nbsp ".$_SERVER['SERVER_ADDR'];?><br><br>
+		<span style="color:#888">Root:</span><br>
+		<?php echo $docRoot;?><br><br>
+		<span style="color:#888">ICEcoder root:</span><br>
+		<?php echo $docRoot.$ICEcoder['root'];?><br><br>
+		<span style="color:#888">PHP version:</span><br>
+		<?php echo phpversion();?><br><br>
+		<span style="color:#888">Date & time:</span><br>
+		<span id="serverDT"></span><br><br><br>
+	</div>

-echo '<div style="float: left">'.PHP_EOL;
-echo '<h2 style="color: rgba(0,198,255,0.7)">files</h2>'.PHP_EOL;
-echo '<span style="color:#888">Last 10 files opened:</span><br>'.PHP_EOL;
-$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
-for ($i=0;$i<count($last10FilesArray);$i++) {
-	if ($ICEcoder["last10Files"]=="") {
-		echo '[none]<br><br>';
-	} else {
-		echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
-		echo str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i]));
-		echo '</a><br>'.PHP_EOL;
-		if ($i==count($last10FilesArray)-1) {echo '<br>'.PHP_EOL;};
-	}
-}
-echo '<span style="color:#888">File & folder count:</span><br>'.PHP_EOL;
-echo '<div id="fileFolderCounts"></div><br><br><br>'.PHP_EOL;
-echo '</div>'.PHP_EOL;
+	<div style="float: left">
+		<h2 style="color: rgba(0,198,255,0.7)">files</h2>
+		<span style="color:#888">Last 10 files opened:</span><br>
+		<?php
+			$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
+			for ($i=0;$i<count($last10FilesArray);$i++) {
+				if ($ICEcoder["last10Files"]=="") {
+					echo '[none]<br><br>';
+				} else {
+					echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
+					echo str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i]));
+					echo '</a><br>'.PHP_EOL;
+					if ($i==count($last10FilesArray)-1) {echo '<br>'.PHP_EOL;};
+				}
+			}
+		;?>
+		<span style="color:#888">File & folder count:</span><br>
+		<div id="fileFolderCounts"></div><br><br><br>
+	</div>

-echo '<div style="clear: both">'.PHP_EOL;
-echo '<h2 style="color: rgba(0,198,255,0.7)">your device</h2>'.PHP_EOL;
-echo '<span style="color:#888">Browser:</span><br>'.PHP_EOL;
-echo $_SERVER['HTTP_USER_AGENT'].'<br><br>'.PHP_EOL;
-echo '<span style="color:#888">Your IP:</span><br>'.PHP_EOL;
-echo $_SERVER['REMOTE_ADDR'].PHP_EOL;
-echo '</div>'.PHP_EOL;
-?>
-<script>
-var nDT=<?php echo time()*1000;?>;
-setInterval(function(){
-	var s=(new Date(nDT+=1e3)+'').split(' '),
-	d=s[2]*1,
-	t=s[4].split(':'),
-	p=t[0]>11?'pm':'am',
-	e=d%20==1|d>30?'st':d%20==2?'nd':d%20==3?'rd':'th';
-	t[0]=--t[0]%12+1;
-	if (document.getElementById('serverDT')) {
-		document.getElementById('serverDT').innerHTML=[s[0],d+e,s[1],s[3],t.join(':')+p].join(' ');
-	}
-},1000);
-</script>
+	<div style="clear: both">
+		<h2 style="color: rgba(0,198,255,0.7)">your device</h2>
+		<span style="color:#888">Browser:</span><br>
+		<?php echo $_SERVER['HTTP_USER_AGENT'];?><br><br>
+		<span style="color:#888">Your IP:</span><br>
+		<?php echo $_SERVER['REMOTE_ADDR'];?>
+	</div>
+	<script>
+	var nDT=<?php echo time()*1000;?>;
+	setInterval(function(){
+		var s=(new Date(nDT+=1e3)+'').split(' '),
+		d=s[2]*1,
+		t=s[4].split(':'),
+		p=t[0]>11?'pm':'am',
+		e=d%20==1|d>30?'st':d%20==2?'nd':d%20==3?'rd':'th';
+		t[0]=--t[0]%12+1;
+		if (document.getElementById('serverDT')) {
+			document.getElementById('serverDT').innerHTML=[s[0],d+e,s[1],s[3],t.join(':')+p].join(' ');
+		}
+	},1000);
+	</script>
 </div>

 <script>
 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: #b00; color: #fff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
-	var codeFold_JS_Coffee_PHP_Ruby = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #b00; color: #fff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
+	top.foldStyle = '<span style="position: absolute; display: inline-block; width: 13px; height: 13px; left: 0; background-color: #b00; color: #fff; text-align: center; cursor: pointer"><span style="position: relative; left: -1px">+</span></span> %N%';
+	var codeFoldTag = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder,top.foldStyle);
+	var codeFoldBrace = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,top.foldStyle);

 	window['cM'+num] = CodeMirror(document.body, {
-        mode: "application/x-httpd-php",
-        lineNumbers: true,
-	lineWrapping: true,
-	indentUnit: top.tabWidth,
-	tabSize: top.tabWidth,
-        indentWithTabs: true,
-	electricChars: false,
-	onCursorActivity: function() {
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.updateCharDisplay();
-		window['cM'+num].setLineClass(top.ICEcoder['cMActiveLine'+num], null);
-		if(!window['cM'+num].somethingSelected()) {
-			top.ICEcoder['cMActiveLine'+num] = window['cM'+num].setLineClass(window['cM'+num].getCursor().line, "cm-s-activeLine");
-		}
-		window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].matchHighlight("CodeMirror-matchhighlight");
-		top.ICEcoder.cssColorPreview();
-	},
-	onChange: function() {
-		// If we're not loading the file, it's a change, so update tab
-		if (!top.ICEcoder.loadingFile) {
-			top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 1;
-			top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
-		}
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.dontUpdateNest = false;
-		top.ICEcoder.updateCharDisplay();
-		top.ICEcoder.updateNestingIndicator();
-		if (top.ICEcoder.findMode) {
-			top.ICEcoder.results.splice(top.ICEcoder.findResult,1);
-			top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " results";
-			top.ICEcoder.findMode = false;
-		}
-	},
-	onKeyEvent: function(instance, e) {
-		top.ICEcoder.redoChangedContent(e);
-		top.ICEcoder.findReplace('find',true,false);
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.updateCharDisplay();
-		tok = window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getTokenAt(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor());
-		if (tok.string!=">") {lastString=tok.string};
-		if (e.type=="keyup"&&e.keyCode=="16"&&lastKeyCode=="190") {
-			canDoEndTag=true;
-			for (i=0;i<top.ICEcoder.tagNestExceptions.length;i++) {
-				if(top.ICEcoder.tagString!="script" && top.ICEcoder.tagString==top.ICEcoder.tagNestExceptions[i]) {
-				canDoEndTag=false;
-				}
+		mode: "application/x-httpd-php",
+		lineNumbers: true,
+		lineWrapping: true,
+		indentUnit: top.tabWidth,
+		tabSize: top.tabWidth,
+		indentWithTabs: true,
+		electricChars: false,
+		onCursorActivity: function(thisCM) {
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.updateCharDisplay();
+			window['cM'+num].setLineClass(top.ICEcoder['cMActiveLine'+num], null);
+			if(!window['cM'+num].somethingSelected()) {
+				top.ICEcoder['cMActiveLine'+num] = window['cM'+num].setLineClass(window['cM'+num].getCursor().line, "cm-s-activeLine");
 			}
-			if	(
-				top.ICEcoder.tagString.slice(0,1)=="/"||
-				top.ICEcoder.tagString.slice(0,1)=="?"||
-				!top.ICEcoder.codeAssist||
-				fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)
-				) {canDoEndTag=false}
+			thisCM.matchHighlight("CodeMirror-matchhighlight");
+			top.ICEcoder.cssColorPreview();
+		},
+		onChange: function() {
+			// If we're not loading the file, it's a change, so update tab
+			if (!top.ICEcoder.loadingFile) {
+				top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 1;
+				top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
+			}
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.dontUpdateNest = false;
+			top.ICEcoder.updateCharDisplay();
+			top.ICEcoder.updateNestingIndicator();
+			if (top.ICEcoder.findMode) {
+				top.ICEcoder.results.splice(top.ICEcoder.findResult,1);
+				top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " results";
+				top.ICEcoder.findMode = false;
+			}
+		},
+		onKeyEvent: function(thisCM, e) {
+			top.ICEcoder.redoChangedContent(e);
+			top.ICEcoder.findReplace('find',true,false);
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.updateCharDisplay();
+			tok = thisCM.getTokenAt(thisCM.getCursor());
+			if (tok.string!=">") {lastString=tok.string};
+			if (e.type=="keyup"&&e.keyCode=="16"&&lastKeyCode=="190") {
+				canDoEndTag=true;
+				if (top.ICEcoder.tagString!="script" && top.ICEcoder.tagNestExceptions.indexOf(top.ICEcoder.tagString)>-1) {
+					canDoEndTag=false;
+				}
+				if	(
+					top.ICEcoder.tagString.slice(0,1)=="/"||
+					top.ICEcoder.tagString.slice(0,1)=="?"||
+					!top.ICEcoder.codeAssist||
+					fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)
+					) {canDoEndTag=false}

-			contentType = top.ICEcoder.caretLocType;
-			if (canDoEndTag && (contentType!="JavaScript"||(contentType=="JavaScript"&&top.ICEcoder.tagString=="script"))) {
-				numTabs = top.ICEcoder.htmlTagArray.length;
-				if (top.ICEcoder.htmlTagArray[0]=="html") {numTabs--};
-				tabs = "";
-				for (i=0;i<numTabs-1;i++) {
-					tabs += "\t";
+				contentType = top.ICEcoder.caretLocType;
+				if (canDoEndTag && (contentType!="JavaScript"||(contentType=="JavaScript"&&top.ICEcoder.tagString=="script"))) {
+					numTabs = top.ICEcoder.htmlTagArray.length;
+					if (top.ICEcoder.htmlTagArray[0]=="html") {numTabs--};
+					tabs = "";
+					for (i=0;i<numTabs-1;i++) {
+						tabs += "\t";
+					}
+					endTag = "</" + top.ICEcoder.tagString + ">";
+					if (top.ICEcoder.tagString=="script") {endTag="</"+"script>"};
+					if(top.ICEcoder.tagString=="title"||top.ICEcoder.tagString=="a"||top.ICEcoder.tagString=="li"||top.ICEcoder.tagString=="span"||(top.ICEcoder.tagString.slice(0,1)=="h"&&parseInt(top.ICEcoder.tagString.slice(1,2),10)>=1&&parseInt(top.ICEcoder.tagString.slice(1,2),10)<=7)) {
+						thisCM.replaceSelection(endTag);
+						thisCM.setCursor(thisCM.getCursor().line,thisCM.getCursor().ch-top.ICEcoder.tagString.length-3);
+					} else if(top.ICEcoder.tagString=="html"||top.ICEcoder.tagString=="head") {
+						thisCM.replaceSelection("\n\n"+endTag);
+						thisCM.setCursor(thisCM.getCursor().line-1,numTabs);
+					} else {
+						thisCM.replaceSelection("\n"+tabs+"\t\n"+tabs+endTag);
+						thisCM.setCursor(thisCM.getCursor().line-1,numTabs);
+					}
 				}
-				endTag = "</" + top.ICEcoder.tagString + ">";
-				if (top.ICEcoder.tagString=="script") {endTag="</"+"script>"};
-				if(top.ICEcoder.tagString=="title"||top.ICEcoder.tagString=="a"||top.ICEcoder.tagString=="li"||top.ICEcoder.tagString=="span"||(top.ICEcoder.tagString.slice(0,1)=="h"&&parseInt(top.ICEcoder.tagString.slice(1,2),10)>=1&&parseInt(top.ICEcoder.tagString.slice(1,2),10)<=7)) {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection(endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line,window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().ch-top.ICEcoder.tagString.length-3);
-				} else if(top.ICEcoder.tagString=="html"||top.ICEcoder.tagString=="head") {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection("\n\n"+endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line-1,numTabs);
-				} else {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection("\n"+tabs+"\t\n"+tabs+endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line-1,numTabs);
-				}
-			}
-		};
-		lastKeyCode = e.keyCode;
-	},
-	onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".coffee") == -1 && fileName.indexOf(".php") && fileName.indexOf(".rb") == -1) ? codeFold : codeFold_JS_Coffee_PHP_Ruby,
-	extraKeys: {
-		"Tab": function(cm) {CodeMirror.commands[top.tabsIndent ? "defaultTab" : "insertTab"](cm);},
-		"Shift-Tab": "indentLess",
-		"Ctrl-Up": function() {},
-		"Ctrl-Down": function() {}
-	}
+			};
+			lastKeyCode = e.keyCode;
+		},
+		onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".coffee") == -1 && fileName.indexOf(".php") && fileName.indexOf(".rb") == -1) ? codeFoldTag : codeFoldBrace,
+		extraKeys: {
+			"Tab": function(cm) {CodeMirror.commands[top.tabsIndent ? "defaultTab" : "insertTab"](cm);},
+			"Shift-Tab": "indentLess",
+			"Ctrl-Up": function() {},
+			"Ctrl-Down": function() {}
+		}
 	});

 	// Now create the active line for this CodeMirror object
--- a/files.php
+++ b/files.php
@@ -3,18 +3,16 @@

 <html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files');top.ICEcoder.canResizeFilesW()}" onContextMenu="top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink; return top.ICEcoder.showMenu()" onClick="top.ICEcoder.selectFileFolder()">
 <head>
-<title>ICEcoder file manager</title>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> alpha 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()" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);">
+
 <div title="Refresh" onClick="top.ICEcoder.refreshFileManager()" class="refresh"></div>

 <?php
-$ICEcoder["restrictedFiles"] = $_SESSION['restrictedFiles'];
-$ICEcoder["bannedFiles"] = $_SESSION['bannedFiles'];
-
 // Function to sort given values alphabetically
 function alphasort($a, $b) {
 	return strcasecmp($a->getPathname(), $b->getPathname());
@@ -43,11 +41,13 @@ $finalArray = $tempArray =  array();
 foreach ($objectList as $objectRef) {
 	$fileFolderName = substr($objectRef->getPathname(), strlen($docRoot.$iceRoot));
 	$canAdd = true;
-	for ($i=0;$i<count($ICEcoder["bannedFiles"]);$i++) {
-		if(strpos($fileFolderName,$ICEcoder["bannedFiles"][$i])!==false) {$canAdd = false;}
+	for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
+		if(strpos($fileFolderName,$_SESSION['bannedFiles'][$i])!==false) {$canAdd = false;}
 	}
 	if ($objectRef->getFilename()!="." && $objectRef->getFilename()!=".." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
-		$fileFolderName!="/" && is_dir($docRoot.$iceRoot.$fileFolderName) ? array_push($finalArray,$fileFolderName) : array_push($tempArray,$fileFolderName);
+		$fileFolderName!="/" && is_dir($docRoot.$iceRoot.$fileFolderName)
+		? array_push($finalArray,$fileFolderName)
+		: array_push($tempArray,$fileFolderName);
 	}
 }

@@ -79,16 +79,18 @@ if ($serverType=="Linux") {
 	$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot)), -3);
 	$fileAtts = '<span style="color: #888; font-size: 8px" id="|_perms">'.$chmodInfo.'</span>';
 }
-echo "<ul class=\"fileManager\">\n";
-echo "<li class=\"pft-directory\">";
-echo "<a nohref title=\"/\" onMouseOver=\"top.ICEcoder.overFileFolder('folder','/')\" onMouseOut=\"top.ICEcoder.overFileFolder('folder','')\" style=\"position: relative; left:-22px\">";
-echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ";
-echo "<span id=\"|\">/ ";
-echo $iceRoot == "" ? "[ROOT]" : trim($iceRoot,"/");
-echo "</span> ";
-echo $fileAtts;
-echo "</a>";
-echo "</li>\n";
+?>
+<ul class="fileManager">
+<li class="pft-directory">
+<a nohref title="/" onMouseOver="top.ICEcoder.overFileFolder('folder','/')" onMouseOut="top.ICEcoder.overFileFolder('folder','')" style="position: relative; left:-22px">
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+<span id="|">/ 
+<?php echo $iceRoot == "" ? "[ROOT]" : trim($iceRoot,"/");?>
+</span> 
+<?php echo $fileAtts;?>
+</a>
+</li>
+<?php
 $lastPath="";
 $fileCount=0;
 $fileBytes=0;
@@ -110,12 +112,6 @@ for ($i=0;$i<count($finalArray);$i++) {
 			echo "</ul>\n";
 		}
 	}
-	$restrictedFile=false;
-	for ($j=0;$j<count($ICEcoder["restrictedFiles"]);$j++) {
-		if (strpos($fileFolderName,$ICEcoder["restrictedFiles"][$j])!="") {
-			$restrictedFile=true;
-		}
-	}
 	if ($serverType=="Linux") {
 		$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot.$fileFolderName)), -3);
 		$fileAtts = '<span style="color: #888; font-size: 8px" id="'.str_replace($docRoot,"",str_replace("/","|",$fileFolderName)).'_perms">'.$chmodInfo.'</span>';
@@ -127,15 +123,14 @@ for ($i=0;$i<count($finalArray);$i++) {
 }
 echo "</ul>\n</ul>\n";

-	echo "<script>\n";
-	$varOutput = "top.ICEcoder.dirCount=";
-	$varOutput .= $dirCount ? $dirCount : "0";
-	$varOutput .= ";\ntop.ICEcoder.fileCount=";
-	$varOutput .= $fileCount ? $fileCount : "0";
-	$varOutput .= ";\ntop.ICEcoder.fileBytes=";
-	$varOutput .= $fileBytes ? $fileBytes : "0";
 	// Output the JS vars
-	echo $varOutput;
+	echo "<script>\n";
+	echo "top.ICEcoder.dirCount=";
+	echo $dirCount ? $dirCount : "0";
+	echo ";\ntop.ICEcoder.fileCount=";
+	echo $fileCount ? $fileCount : "0";
+	echo ";\ntop.ICEcoder.fileBytes=";
+	echo $fileBytes ? $fileBytes : "0";
 	echo ";\n</script>";
 ?>

--- a/index.php
+++ b/index.php
@@ -25,7 +25,7 @@ if ($ICEcoder["checkUpdates"]) {

 <html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top');top.ICEcoder.canResizeFilesW()}">
 <head>
-<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?></title>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> alpha</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="robots" content="noindex, nofollow">
 <link rel="stylesheet" type="text/css" href="lib/coder.css">
@@ -57,13 +57,13 @@ showFileMenu = function() {

 <body onLoad="ICEcoder.init()<?php echo $updateMsg.$onLoadExtras;?>" onResize="ICEcoder.setLayout()" onKeyDown="return ICEcoder.interceptKeys('coder',event);" onKeyUp="parent.ICEcoder.resetKeys(event);">

-<div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)">
+<div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)" onContextMenu="return false">
 	<div class="popupVCenter">
 		<div class="popup" id="mediaContainer"></div>
 	</div>
 </div>

-<div id="loadingMask" class="blackMask" style="visibility: visible">
+<div id="loadingMask" class="blackMask" style="visibility: visible" onContextMenu="return false">
 	<span class="progressBar" id="progressBar" style="-webkit-animation:fullexpand 10s ease-out; -moz-animation:fullexpand 10s ease-out"></span>
 	<div class="popupVCenter">
 		<div class="popup">
@@ -74,7 +74,7 @@ showFileMenu = function() {
 	</div>
 </div>

-<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');this.style.display='none'">
+<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');this.style.display='none'" onContextMenu="return false">
 	<span id="folderMenuItems">
 		<a href="javascript:top.ICEcoder.newFile()" onMouseOver="showFileMenu()">New File</a>
 		<a href="javascript:top.ICEcoder.newFolder()" onMouseOver="showFileMenu()">New Folder</a>
@@ -92,7 +92,7 @@ showFileMenu = function() {
 	<div class="plugins" id="pluginsContainer">
 	<?php echo $pluginsDisplay; ?>
 	</div>
-	<div class="version">v <?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
+	<div class="version">v <?php echo $ICEcoder["versionNo"];?> alpha</div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
 	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
 </div>

@@ -156,8 +156,7 @@ showFileMenu = function() {
 		<div class="goLine">Go to Line<input type="text" name="goToLine" value="" id="goToLineNo" class="textbox goToLine">
 		</form>
 	</div>
-	<iframe name="contentFrame" id="content" src="editor.php" class="code">
-	</iframe>
+	<iframe name="contentFrame" id="content" src="editor.php" class="code"></iframe>
 </div>

 <div class="footer" id="footer" onContextMenu="return false">
--- a/lib/coder.css
+++ b/lib/coder.css
@@ -39,30 +39,30 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 	width:30px; height:30px; margin:0 auto; position:relative; top:-50px; -moz-animation:spinoff .5s infinite linear; -webkit-animation:spinoff .5s infinite linear;
 }
@-moz-keyframes spin {
-	0% { -moz-transform:rotate(0deg);}
-	100% { -moz-transform:rotate(360deg);}
+	0% {-moz-transform:rotate(0deg)}
+	100% {-moz-transform:rotate(360deg)}
 }
@-moz-keyframes spinoff {
-	0% { -moz-transform:rotate(0deg);}
-	100% { -moz-transform:rotate(-360deg);}
+	0% {-moz-transform:rotate(0deg)}
+	100% {-moz-transform:rotate(-360deg)}
 }
@-webkit-keyframes spin {
-	0% { -webkit-transform:rotate(0deg);}
-	100% { -webkit-transform:rotate(360deg);}
+	0% {-webkit-transform:rotate(0deg)}
+	100% {-webkit-transform:rotate(360deg)}
 }
@-webkit-keyframes spinoff {
-	0% { -webkit-transform:rotate(0deg); }
-	100% { -webkit-transform:rotate(-360deg);}
+	0% {-webkit-transform:rotate(0deg)}
+	100% {-webkit-transform:rotate(-360deg)}
 }

-.progressBar {top: 0; left: 0; width:100%; height:1px; margin:2px 0; background:#2187e7; position:absolute; box-shadow:0 0 10px 1px rgba(0,198,255,0.7)}
+.progressBar {position:absolute; top: 0; left: 0; width:100%; height:1px; margin:2px 0; background:#2187e7; box-shadow:0 0 10px 1px rgba(0,198,255,0.7)}
@-moz-keyframes fullexpand {
-	0%  { width:0;}
-	100%{ width:100%;}	
+	0%  {width:0}
+	100%{width:100%}	
 }
@-webkit-keyframes fullexpand {
-	0%  { width:0;}
-	100%{ width:100%;}	
+	0%  {width:0}
+	100%{width:100%}	
 }

 .header {position: absolute; display: inline-block; top: 0; left: 0; width: 100%; height: 40px; background-color: #fff; text-align: right; z-index: 2}
@@ -86,7 +86,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .files .accountOptions .rename {width: 16px; height: 16px; background-position: -116px 0; margin: 8px 0 0 5px; opacity: 0.3}
 .files .accountOptions .view {width: 16px; height: 16px; background-position: -132px 0; margin: 8px 0 0 5px; opacity: 0.3}
 .files .accountOptions .lock {position: relative; margin-left: 208px; margin-top: -27px; width: 12px; height: 16px; background-position: -64px -16px; z-index: 1}
-.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,0.7)}
+.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,1)}
 .files .button {position: absolute; border: 0; background: #444; color: #eee; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
 .files .button:hover {background-color: #222; color: #eee}
 .files .frame {display: inline-block; width: 250px}
@@ -105,7 +105,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 	transition: all 0.15s;
 }
 .tabsBar .tab .closeTab {margin: 1px 0 0 5px; border-radius: 6px}
-.tabsBar .newTab {display: inline-block; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 6px 5px 1px 5px; border-left: solid 1px #fff; border-right: solid 1px #777; cursor: pointer;}
+.tabsBar .newTab {display: inline-block; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 6px 5px 5px 5px; border-left: solid 1px #fff; border-right: solid 1px #777; cursor: pointer;}
 .editor .findBar {display: inline-block; height: 28px; width: 2400px; color: #fff; background-color: #141414}
 .findBar .findReplace {position: absolute; z-index: 1}
 .findReplace select {position: relative; font-size: 10px; margin: 8px 2px 0 2px; top: -2px;}
@@ -121,6 +121,7 @@ h2 {font-size: 18px; font-weight: normal; color: #fff}
 .findBar .codeAssist input {margin-top: -1px}
 .findBar .goLine {position: fixed; display: inline-block; width: 100px; right: -10px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
 .goLine .goToLine {width: 25px; height: 16px; border: 0; font-size: 10px; margin: -3px 0 0 3px}
+.goLine .goToLine:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,1)}
 .editor .code {position: relative; display: inline-block; top: 28px; width: 600px; height: 600px; visibility: hidden}

 .footer {position: fixed; display: inline-block; width: 100%; height: 30px; bottom: 0; background-color: rgba(0,0,0,0.7); left: 0; z-index: 2}
--- a/lib/coder.js
+++ b/lib/coder.js
--- a/lib/config.php
+++ b/lib/config.php
@@ -4,12 +4,11 @@ $ICEcoder = array(
 "tabsIndent"		=> true,
 "checkUpdates"		=> true,
 "openLastFiles"		=> true,
-"findFilesExclude"	=> array("_coder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
+"findFilesExclude"	=> array("_coder","ICEcoder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
 "codeAssist"		=> true,
 "visibleTabs"		=> false,
 "lockedNav"		=> true,
 "accountPassword"	=> "",
-"restrictedFiles"	=> array("wp-",".php",".rb",".sql",".zip"),
 "bannedFiles"		=> array("_coder","ICEcoder"),
 "allowedIPs"		=> array("*"),
 "plugins"		=> array(
--- a/lib/editor.css
+++ b/lib/editor.css
@@ -1,40 +1,40 @@
 /* ICE coder default theme: Based VERY loosely on Monokai */

-.cm-s-icecoder {color: #666; background: #1c1c19;}
+.cm-s-icecoder {color: #666; background: #1c1c19}

-.cm-s-icecoder span.cm-keyword {color: #f8f8f8; font-weight:bold;}
-.cm-s-icecoder span.cm-atom {color: #ae81ff;}
-.cm-s-icecoder span.cm-number {color: #0a0;}
-.cm-s-icecoder span.cm-def {color: #fd971f;}
+.cm-s-icecoder span.cm-keyword {color: #f8f8f8; font-weight:bold}
+.cm-s-icecoder span.cm-atom {color: #ae81ff}
+.cm-s-icecoder span.cm-number {color: #0a0}
+.cm-s-icecoder span.cm-def {color: #fd971f}

-.cm-s-icecoder span.cm-variable {color: #a6e22e;}
-.cm-s-icecoder span.cm-variable-2 {color: #f92672;}			
-.cm-s-icecoder span.cm-variable-3 {color: #0a0;}
+.cm-s-icecoder span.cm-variable {color: #a6e22e}
+.cm-s-icecoder span.cm-variable-2 {color: #f92672}			
+.cm-s-icecoder span.cm-variable-3 {color: #0a0}

-.cm-s-icecoder span.cm-property {color: #a6e22e;}
-.cm-s-icecoder span.cm-operator {color: #0a0;}
-.cm-s-icecoder span.cm-comment {color: #444;}
+.cm-s-icecoder span.cm-property {color: #a6e22e}
+.cm-s-icecoder span.cm-operator {color: #0a0}
+.cm-s-icecoder span.cm-comment {color: #444}

-.cm-s-icecoder span.cm-string {color: #fd0;}
-.cm-s-icecoder span.cm-string-2 {color: #f80;}
+.cm-s-icecoder span.cm-string {color: #fd0}
+.cm-s-icecoder span.cm-string-2 {color: #f80}

-.cm-s-icecoder span.cm-meta {color: #555;}
-.cm-s-icecoder span.cm-error {color: #f00;}
+.cm-s-icecoder span.cm-meta {color: #555}
+.cm-s-icecoder span.cm-error {color: #f00}

-.cm-s-icecoder span.cm-qualifier {color: #555;}
-.cm-s-icecoder span.cm-builtin {color: #06c;}
-.cm-s-icecoder span.cm-bracket {color: #cc7;}
+.cm-s-icecoder span.cm-qualifier {color: #555}
+.cm-s-icecoder span.cm-builtin {color: #06c}
+.cm-s-icecoder span.cm-bracket {color: #cc7}

-.cm-s-icecoder span.cm-tag {color: #e8e8e8;}
-.cm-s-icecoder span.cm-attribute {color: #00b8bb;}
+.cm-s-icecoder span.cm-tag {color: #e8e8e8}
+.cm-s-icecoder span.cm-attribute {color: #00b8bb}

-.cm-s-icecoder span.cm-header {color: #a0a;}
-.cm-s-icecoder span.cm-quote {color: #090;}
-.cm-s-icecoder span.cm-hr {color: #999;}
-.cm-s-icecoder span.cm-link {color: #ff0;}
+.cm-s-icecoder span.cm-header {color: #a0a}
+.cm-s-icecoder span.cm-quote {color: #090}
+.cm-s-icecoder span.cm-hr {color: #999}
+.cm-s-icecoder span.cm-link {color: #ff0}

-.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important;}
-.cm-s-icecoder .CodeMirror-selected {background: #037 !important;}
+.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important}
+.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; cursor: default}
-.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important;}
+.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -25,12 +25,6 @@ if ($_GET['action']=="load") {
 	if (strpos($fileName,".jpg")>0||strpos($fileName,".jpeg")>0||strpos($fileName,".gif")>0||strpos($fileName,".png")>0) {$fileType="image";};

 	if ($fileType=="text") {
-		$bannedFile=false;
-		for ($i=0;$i<count($ICEcoder["restrictedFiles"]);$i++) {
-			if (strpos($fileName,$ICEcoder["restrictedFiles"][$i])!="") {
-				$bannedFile=true;
-			}
-		}
 		if (file_exists($file)) {
 			echo '<script>fileType="text";';
 			echo 'top.ICEcoder.shortURL = top.ICEcoder.rightClickedFile = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";';
@@ -38,8 +32,7 @@ if ($_GET['action']=="load") {
 			$loadedFile = file_get_contents($file);
 			echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
 		} else {
-			echo '<script>fileType="nothing";</script>';
-			echo '<script>top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
+			echo '<script>fileType="nothing"; top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
 		}
 	};

@@ -55,7 +48,7 @@ if ($_GET['action']=="newFolder") {
 		// Reload file manager
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');action="newFolder";</script>';
 	} else {
-		echo "<script>top.ICEcoder.message('Sorry, cannot create folder at\\n".$fileLoc."');action='nothing';</script>";
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot create folder at\\n".$fileLoc."')</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }
@@ -68,8 +61,7 @@ if ($_GET['action']=="rename") {
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\');';
 		echo 'action="rename";</script>';
 	} else {
-		echo "<script>top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
-		echo '<script>action="nothing";</script>';
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }
@@ -85,8 +77,7 @@ if ($_GET['action']=="replaceText") {
 		fclose($fh);
 		echo '<script>action="replaceText";</script>';
 	} else {
-		echo "<script>top.ICEcoder.message('Sorry, cannot replace text in\\n".strClean($_GET['fileRef'])."');</script>";
-		echo '<script>action="nothing";</script>';
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot replace text in\\n".strClean($_GET['fileRef'])."');</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }
@@ -99,8 +90,7 @@ if ($_GET['action']=="perms") {
 		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'chmod\',\''.$fileLoc.'\',\''.$fileName.'\',\''.numClean($_GET['perms']).'\');';
 		echo 'action="perms";</script>';
 	} else {
-		echo "<script>top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</script>";
-		echo '<script>action="nothing";</script>';
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</script>";
 	}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }
@@ -110,11 +100,9 @@ if ($_GET['action']=="delete") {
 	$filesArray = split(";",$file); // May contain more than one file here
 	for ($i=0;$i<=count($filesArray)-1;$i++) {
 		if (is_writable($iceRoot.$filesArray[$i])) {
-			if (is_dir($iceRoot.$filesArray[$i])) { 
-				rrmdir($iceRoot.$filesArray[$i]);
-			} else {
-				unlink($iceRoot.$filesArray[$i]);
-			}
+			is_dir($iceRoot.$filesArray[$i])
+				? rrmdir($iceRoot.$filesArray[$i])
+				: unlink($iceRoot.$filesArray[$i]);
 			// Reload file manager
 			echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
 			echo 'action="delete";</script>';
@@ -132,7 +120,9 @@ function rrmdir($dir) {
 		$objects = scandir($dir); 
 		foreach ($objects as $object) { 
 			if ($object != "." && $object != "..") { 
-				if (filetype($dir."/".$object) == "dir") rrmdir($dir."/".$object); else unlink($dir."/".$object); 
+				filetype($dir."/".$object) == "dir" 
+					? rrmdir($dir."/".$object)
+					: unlink($dir."/".$object); 
 			} 
 		} 
 		reset($objects); 
@@ -153,8 +143,8 @@ if ($_GET['action']=="save") {
 				echo '<script>top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.filemtime($file).'";</script>';
 				// Reload file manager & rename tab if it was a new file
 				if (isset($_POST['newFileName']) && $_POST['newFileName']!="") {
-					echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');</script>';
-					echo '<script>top.ICEcoder.renameTab(top.ICEcoder.selectedTab,\''.$fileLoc."/".$fileName.'\');</script>';
+					echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');';
+					echo 'top.ICEcoder.renameTab(top.ICEcoder.selectedTab,\''.$fileLoc."/".$fileName.'\');</script>';
 				}
 				// Reload stickytab window
 				echo '<script>if (top.ICEcoder.stickyTabWindow.location) {top.ICEcoder.stickyTabWindow.location.reload()};action="doneSave";</script>';
@@ -182,12 +172,12 @@ if ($_GET['action']=="save") {
 					// Finally, switch back to original tab
 					top.ICEcoder.switchTab(thisTab);
 				}
+				action='nothing';
 				</script>
 				<?php
-				echo "<script>action='nothing';</script>";
 			}
        	} else {
-			echo "<script>top.ICEcoder.message('Sorry, cannot write\\n".$file."');action='nothing';</script>";
+			echo "<script>action='nothing';top.ICEcoder.message('Sorry, cannot write\\n".$file."')</script>";
 		}
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 	}
@@ -240,8 +230,8 @@ if (action=="load") {
 </script>

 <form name="saveFile" action="file-control.php?action=save&file=<?php if (isset($file)) {echo $file;}; if (isset($_GET['fileMDT']) && $_GET['fileMDT']!="undefined") {echo "&fileMDT=".numClean($_GET['fileMDT']);};?>" method="POST">
-<textarea name="contents"></textarea>
-<input type="hidden" name="newFileName" value="">
+	<textarea name="contents"></textarea>
+	<input type="hidden" name="newFileName" value="">
 </form>

 <script>
--- a/lib/file-folder-properties.php
+++ b/lib/file-folder-properties.php
@@ -3,7 +3,7 @@

 <html onContextMenu="return false">
 <head>
-<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: File/Folder Properties</title>
+<title>ICE Coder <?php echo $ICEcoder["versionNo"];?> alpha file/folder properties</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="file-folder-properties.css">
 </head>
@@ -38,20 +38,18 @@ echo number_format($outputSize, 2, '.', '').$outputUnit." (".number_format($byte
 <span class="column">Last access: <?php echo date( "D d M Y g:i:sa", fileatime($fileName)); ?></span>
 <br><br>
 <span class="column" style="width: 180px">Type: <?php echo is_dir($fileName) ? "Folder" : "File"; ?></span>
-<span class="column" style="margin: 0 10px">Readable / Writeable: <?php
-echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";
-?></span>
+<span class="column" style="margin: 0 10px">Readable / Writeable: 
+<?php echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";?>
+</span>
 <span class="column">Relative path: <?php echo str_replace($docRoot,"",$fileName);?></span>
 <span style="font-size:10px">
 <br><br>
-Absolute path:<br><?php
-echo $fileName;
-?>
+Absolute path:<br><?php echo $fileName;?>
 <br><br>
 </span>
 <span class="column" style="width: 180px">
 Permissions:
-<?
+<?php
 $chmodInfo = substr(sprintf('%o', fileperms($fileName)), -4);
 echo $chmodInfo;
 ?>
--- a/lib/files.css
+++ b/lib/files.css
@@ -51,21 +51,12 @@ body {margin: 0; overflow: auto}
 .fileManager LI.ext-coffee:before {background-position: -48px 0}
 .fileManager LI.ext-css:before {background-position: -64px 0}
 .fileManager LI.ext-gif:before {background-position: -80px 0}
-.fileManager LI.ext-htm:before {background-position: -96px 0}
-.fileManager LI.ext-html:before {background-position: -96px 0}
-.fileManager LI.ext-jpg:before {background-position: -112px 0}
-.fileManager LI.ext-jpeg:before {background-position: -112px 0}
+.fileManager LI.ext-htm:before, .fileManager LI.ext-html:before {background-position: -96px 0}
+.fileManager LI.ext-jpg:before, .fileManager LI.ext-jpeg:before {background-position: -112px 0}
 .fileManager LI.ext-js:before {background-position: -128px 0}
-/*.fileManager LI.ext-pdf:before {background-position: -???px 0} */
 .fileManager LI.ext-less:before {background-position: -144px 0}
 .fileManager LI.ext-php:before {background-position: -160px 0}
 .fileManager LI.ext-png:before {background-position: -176px 0}
-.fileManager LI.ext-rb:before {background-position: -192px 0}
-.fileManager LI.ext-rbx:before {background-position: -192px 0}
-.fileManager LI.ext-rhtml:before {background-position: -192px 0}
-.fileManager LI.ext-ruby:before {background-position: -192px 0}
-/*.fileManager LI.ext-sql:before {background-position: -???px 0} */
-/*.fileManager LI.ext-swf:before {background-position: -???px 0} */
+.fileManager LI.ext-rb:before, .fileManager LI.ext-ruby:before {background-position: -192px 0}
 .fileManager LI.ext-txt:before {background-position: -208px 0}
-/*.fileManager LI.ext-xml:before {background-position: -???px 0} */
 .fileManager LI.ext-zip:before {background-position: -224px 0}
--- a/lib/help.php
+++ b/lib/help.php
@@ -3,7 +3,7 @@

 <html>
 <head>
-<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: Help & Shortcuts</title>
+<title>ICE Coder <?php echo $ICEcoder["versionNo"];?> alpha help</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="help.css">
 </head>
--- a/lib/multiple-results.php
+++ b/lib/multiple-results.php
@@ -3,12 +3,12 @@

 <html>
 <head>
-<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> multiple results screen</title>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> alpha multiple results screen</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="multiple-results.css">
 </head>

-<body class="results">
+<body class="results" onLoad="top.document.getElementById('loadingMask').style.visibility = 'hidden'">

 <h1 id="title"></h1>
 <div class="resultsPane" id="resultsPane">
@@ -42,7 +42,7 @@ if (!isset($_GET['target'])) {
 $targetName = "document";
 ?>
 var startTab = top.ICEcoder.selectedTab;
-var rExp = new RegExp(decodeURIComponent(findText),"g");
+var rExp = new RegExp(findText,"g");
 for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
 	top.ICEcoder.switchTab(i);
 	var cM = top.ICEcoder.getcMInstance();
@@ -101,15 +101,11 @@ if (startTab!=top.ICEcoder.selectedTab) {
 			if(is_dir($fullPath)) {
 				$ret .= phpGrep($q, $fullPath, $base);
 			} else if(stristr(file_get_contents($fullPath), $q)) {
-				$rFile = false;
 				$bFile = false;
-				for ($i=0;$i<count($ICEcoder["restrictedFiles"]);$i++) {
-					if (strpos($f,$ICEcoder['restrictedFiles'][$i])>0) {$rFile = true;};
-				}
 				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
 					if (strpos($f,$ICEcoder['bannedFiles'][$i])>0) {$bFile = true;};
 				}
-				if (!$rFile && !$bFile) {
+				if (!$bFile) {
 					$ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))\\\">";
 					$ret .= str_replace($base,"",$fullPath)."</a><div id=\\\"foundCount".$r."\\\">Found ".substr_count(strtolower(file_get_contents($fullPath)),$q)." times</div>";
 					if (isset($_GET['replace'])) {
@@ -131,15 +127,15 @@ if (startTab!=top.ICEcoder.selectedTab) {
 	}
 }
 ?>
-foundArray.length==0 ? showHide = "hide" : showHide = "show";
+showHide = foundArray.length==0 ? "hide" : "show";
 top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
 if (foundArray.length==0) {top.ICEcoder.message('No matches found')};
 <?php if (isset($_GET['replace'])) { ?>
 if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
 <?php ;}; ?>
-foundArray.length >= 2 ? plural = "s" : plural = "";
+plural = foundArray.length >= 2 ? "s" : "";
 targetName = "<?php echo $targetName;?>";
-foundInSelected ? selectedText = "selected " : selectedText = "";
+selectedText = foundInSelected ? "selected " : "";
 document.getElementById('title').innerHTML = findText.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;").replace(/'/g,"&apos;")+" found in "+foundArray.length+" "+selectedText+targetName+plural;
 document.getElementById('results').innerHTML = resultsDisplay;

--- a/lib/settings-screen.php
+++ b/lib/settings-screen.php
@@ -3,7 +3,7 @@

 <html>
 <head>
-<title>ICEcoder settings screen</title>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> alpha settings screen</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css" href="settings-screen.css">
 <link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
@@ -36,7 +36,7 @@ for ($i=0;$i<count($themeArray);$i++) {

 <div class="infoPane">
 	<img src="../images/ice-coder.png" class="logo">
-	<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
+	<div class="version">v <?php echo $ICEcoder["versionNo"];?> alpha</div>

 	<p>
 	git:<br>
@@ -98,8 +98,6 @@ new password <span style="font-size: 10px; color: #888">8 chars</span><br>
 confirm password<br>
 <input type="password" name="confirmPassword" onkeydown="showButton()"><br>
 <br>
-restricted files/folders<br>
-<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="restrictedFiles" value="<?php for($i=0;$i<=count($ICEcoder["restrictedFiles"])-1;$i++) {echo $ICEcoder["restrictedFiles"][$i]; if ($i<count($ICEcoder["restrictedFiles"])-1) {echo ', ';};}; ?>"><br>
 banned files/folders<br>
 <input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedFiles" value="<?php for($i=0;$i<=count($ICEcoder["bannedFiles"])-1;$i++) {echo $ICEcoder["bannedFiles"][$i]; if ($i<count($ICEcoder["bannedFiles"])-1) {echo ', ';};}; ?>"><br>
 <input type="hidden" name="changedFileSettings" value="false">
@@ -113,17 +111,9 @@ ip addresses<br>
 plugins array <span style="font-size: 10px; color: #888">name, img src, style, url, target, setInterval (mins)</span><br>
 <textarea name="plugins" class="plugins" onkeydown="showButton()"><?php
 for($i=0;$i<count($ICEcoder["plugins"]);$i++) {
-	for($j=0;$j<count($ICEcoder["plugins"][$i]);$j++) {
-		echo '"'.$ICEcoder["plugins"][$i][$j].'"';
-		if ($j<count($ICEcoder["plugins"][$i])-1) {
-			echo ',';
-		};
-		if (!($i==count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
-			echo PHP_EOL;
-		}
-		if (($i<count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
-			echo "====================".PHP_EOL;
-		}
+	echo '"'.implode('",'.PHP_EOL.'"', $ICEcoder["plugins"][$i]).'"';
+	if ($i<count($ICEcoder["plugins"])-1) {
+		echo PHP_EOL."====================".PHP_EOL;
 	}
 }
 ?></textarea>
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -29,9 +29,9 @@ include($settingsFile);

 // Add ICEcoder settings to beginning of $ICEcoder array
 $ICEcoder = array(
-	"versionNo"		=> "0.8.5",
-	"codeMirrorDir"		=> "CodeMirror-2.33",
-	"cMThisVer"		=> 2.33
+	"versionNo"		=> "0.9.0",
+	"codeMirrorDir"		=> "CodeMirror-2.34",
+	"cMThisVer"		=> 2.34
 )+$ICEcoder;

 // Update this config file?
@@ -51,14 +51,13 @@ if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 	$ICEcoder["visibleTabs"]		= $_POST['visibleTabs'] ? "true" : "false";
 	$ICEcoder["lockedNav"]			= $_POST['lockedNav'] ? "true" : "false";
 	if ($_POST['accountPassword']!="")	{$ICEcoder["accountPassword"] = generateHash(strClean($_POST['accountPassword']));};
-	$ICEcoder["restrictedFiles"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['restrictedFiles']))).'")';
 	$ICEcoder["bannedFiles"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedFiles']))).'")';
 	$ICEcoder["allowedIPs"]			= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['allowedIPs']))).'")';
 	$ICEcoder["plugins"]			= 'array('.PHP_EOL.'	array('.PHP_EOL.'	'.str_replace('====================','),'.PHP_EOL.'	array(',$_POST['plugins']).'))';
 	$ICEcoder["theme"]			= strClean($_POST['theme']);
 	$ICEcoder["tabWidth"]			= numClean($_POST['tabWidth']);

-	$settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","restrictedFiles","bannedFiles","allowedIPs","plugins","theme","tabWidth");
+	$settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","bannedFiles","allowedIPs","plugins","theme","tabWidth");
 	$settingsNew = "";
 	for ($i=0;$i<count($settingsArray);$i++) {
 		$settingsNew .= '"'.$settingsArray[$i].'"'.PHP_EOL.'	=> ';
@@ -74,7 +73,7 @@ if ($_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 	fclose($fh);

 	// OK, now the config file has been updated, update our current session with new arrays
-	$settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs");
+	$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
 	for ($i=0;$i<count($settingsArray);$i++) {
 		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(",",str_replace(" ","",strClean($_POST[$settingsArray[$i]])));
 	}
@@ -100,7 +99,7 @@ if ($_SESSION['loggedIn']) {
 }

 // Setup our file security vars
-$settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs");
+$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
 for ($i=0;$i<count($settingsArray);$i++) {
 	if (!isset($_SESSION[$settingsArray[$i]])) {$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]];}
 }
@@ -135,7 +134,7 @@ if ($_SESSION['loggedIn'] && isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 		$saveFiles = rtrim($saveFiles,",");
 		$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
 		// Now update the config file
-		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
+		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile." and press refresh");
 		fwrite($fh, $settingsContents);

 		// Update our last10Files var?
@@ -149,7 +148,7 @@ if ($_SESSION['loggedIn'] && isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 				if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));};
 				$settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
 				// Now update the config file
-				$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
+				$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile." and press refresh");
 				fwrite($fh, $settingsContents);
 			}
 		}
@@ -177,7 +176,7 @@ if ($_SESSION['loggedIn']) {
 	};

 	// If we're updating, replace the plugin display with our newly established one
-	echo "<script>top.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."';</script>";
+	echo "<script>if(top.document.getElementById('pluginsContainer')) {top.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."'};</script>";

 	// Work out what plugins we'll need to set on a setInterval
 	$onLoadExtras = "";
@@ -214,7 +213,7 @@ if (!$_SESSION['loggedIn']) {
 		// Replace our empty password with the one submitted by user
 		$settingsContents = str_replace('"accountPassword"	=> "",','"accountPassword"	=> "'.$password.'",',$settingsContents);
 		// Now update the config file
-		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile);
+		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile." and press refresh");
 		fwrite($fh, $settingsContents);
 		fclose($fh);
 		// Set the session user level
@@ -223,32 +222,35 @@ if (!$_SESSION['loggedIn']) {
 		header('Location: ../');
 	}
 ?>
-	<!DOCTYPE html>
+<!DOCTYPE html>

-	<html>
-	<head>
-	<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> setup</title>
-	<link rel="stylesheet" type="text/css" href="coder.css">
-	</head>
+<html>
+<head>
+<title>ICEcoder <?php
+echo $ICEcoder["versionNo"]." alpha : ";
+echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login";
+?></title>
+<link rel="stylesheet" type="text/css" href="coder.css">
+</head>

-	<body onLoad="document.settingsUpdate.<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password.focus()">
+<body onLoad="document.settingsUpdate.<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password.focus()">
 	
-	<div class="screenContainer" style="background-color: #141414">
-		<div class="screenVCenter">
-			<div class="screenCenter">
-			<img src="../images/ice-coder.png">
-			<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
-			<form name="settingsUpdate" action="settings.php" method="POST">
-			<input type="password" name="<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password" class="accountPassword">
-			<input type="submit" name="submit" value="<?php echo $ICEcoder["accountPassword"] == "" ? "Set Password" : "Login"; ?>" class="button">
-			</form>
-			</div>
+<div class="screenContainer" style="background-color: #141414">
+	<div class="screenVCenter">
+		<div class="screenCenter">
+		<img src="../images/ice-coder.png">
+		<div class="version">v <?php echo $ICEcoder["versionNo"];?> alpha</div>
+		<form name="settingsUpdate" action="settings.php" method="POST">
+		<input type="password" name="<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password" class="accountPassword">
+		<input type="submit" name="submit" value="<?php echo $ICEcoder["accountPassword"] == "" ? "Set Password" : "Login"; ?>" class="button">
+		</form>
 		</div>
 	</div>
+</div>

-	</body>
+</body>

-	</html>
+</html>
 <?php
 }

--- a/plugins/ice-repo/icon.png
+++ b/plugins/ice-repo/icon.png
Author	SHA1	Message	Date
Matt Pass	c11500b791	v0.9.0 alpha	2012-10-08 07:49:43 +01:00
Matt Pass	ee0303dc06	Code condensing pB var setup to avoid repeating long DOM elem refs again Removed end point from substr, not necessary Put 3 x themes into an array and test using indexOf instead Syntax spacing in a couple of areas	2012-10-08 07:37:08 +01:00
Matt Pass	0d55f3bd81	use showHide, fix availability bug & use regex use showHide function where possible Check file and fileName are available before using them Shorten code by setting in vars and reusing Syntax & comment simplification Use regex to work out previousFiles (also fixed comma prefix on string) Slight adjustment to for loop using less chars	2012-10-06 18:06:01 +01:00
Matt Pass	0e377c1aff	New regex for efficiency More specific regex used to ensure efficiency & speed are optimal Syntax spacing adjusts on couple of other lines	2012-10-06 15:43:23 +01:00
Matt Pass	388bd7cefa	Improved regex on CSS values Looks for hex, rgb/hsl-a or colour name values in their correct format Need match ? match[0] : '' to handle no match scenarios	2012-10-05 15:41:58 +01:00
Matt Pass	8234b3b063	newTab now innerLI & better cssColorPreview code newTab isn't a tab at all, it's inner contents of an LI, so now called innerLI 2nd insertBefore should be inserting newText not newLI again New code to get CSS values via regex Now only showing the preview if the caretLocType is CSS	2012-10-04 18:10:18 +01:00
Matt Pass	573a07026d	Simplifying and condensing code No need to return cM in getcMInstance, just return the ternary value Shortened a few comments for clarity & byte saving No need to add length as 2nd param on substrs in a couple of places newTab setup as string to be used in a couple of places Ternary shortening on elemType Converted ternary statement back to if else to byte save on 2 ternaries Reversing bool on codeAssist var by using ! instead break is shorter & better too, than increasing i's value to escape	2012-10-03 21:13:35 +01:00
Matt Pass	880e04d760	Anon objects & CM's searchCursor used, fixed nest Now just usage anonymous objects inline instead of creating for single use (saves adding extra vars and is less code) Removed findLen and replaceLen as only findLen was being used twice Replaced how we find & replace by using CM's searchcursor Fix to the selection on hover over nest items, doesn't need -1 (This is because I fixed CM's tagRangeFinder to include last line)	2012-10-03 19:39:11 +01:00
Matt Pass	683752762d	Fix to 1st line charCount & simplifying endPos.ch If our result is within the first line, add 1 to it to fix offset No need to have ternary case for replace all, this is now done with a regex	2012-10-03 08:03:51 +01:00
Matt Pass	79a78e0a58	Condensing and simplification Reducing code in many areas by condensing and simplifying	2012-10-02 07:56:05 +01:00
Matt Pass	c33bea997a	Lots of ternary & array check shortening Shorting to ternary statements instead of if else statements in many places Checking indexOf on arrays to condense code here too	2012-09-30 17:33:34 +01:00
Matt Pass	a2f8d9bc43	Combo moveLine function & code condensing moveLine(dir) func added as combo of moveLineUp and moveLineDown funcs Move initialising vars to start of func Used indexOf to check array for shortURL instead of for loop in 2 places Improving/removing a few comments Condensed code to now check if selectedFiles is empty or contains right clicked file and also condensed code to use indexOf on array instead of for loop Don't need foundFile because of this condensing Using ICEcoder ref for filesFrame and also showing dropdown higher up (next to mouse pointer/inline with file/folder name)	2012-09-30 16:24:03 +01:00
Matt Pass	80d717b4dc	Condensing code & new deselectAllFiles func Syntax format improvements on fileManager function selectFileFolder improvements: - Removed a load of vars we no longer need & new tgtFile var added - 2 x areas where we deselect files/folders now done via new function - tgtFile now avail to avoid duplicate setup - Other much more efficient and clearer processes setup to achieve same result New function added to deselect all files Ternary shortening on colouring of selected/deselected files & folders Swapped var order around	2012-09-30 14:55:59 +01:00
Matt Pass	e14a8df6a0	Check typeof parent and swap vars around Checking state.curState.context can cause issues is state.curState doesn't exist so just check state.curState instead Swapped a couple of vars round to match order of usage in func	2012-09-29 17:15:09 +01:00
Matt Pass	4be0067852	htmlTagArray defined in top settings now updateNestingIndicator now setup on a setInterval every 30 ms (This is due to timing issues and solves this without being noticable) Only if we have a context for the given tag build up the array If so, reset htmlTagArray and build up the array again This means we stick with the old array if we're in a script or style block (for example) Set the tagString to be the last item in the array If caretLocType is JS, set the tagString to script (This is because CodeMirror doesn't recognise this as a tag) updateNestingIndicator now works by: - checking if we have a cM instance and not in JS, Coffee etc filetypes - gets token information for the very end of the document - detects if it's className is an error or not to determin if the nesting is broken Fix to detecting the code type we're in as without -1, JavaScript is ignored as it's array item 0	2012-09-29 17:02:30 +01:00
Matt Pass	30a97ed4db	Using indexOf to check nestTagExceptions No need to use for loop here, instead use indexOf to check tagString is an array item within nestTagExceptions	2012-09-29 16:47:30 +01:00
Matt Pass	1257ed0174	New ICErepo logo Lost the standard Octocat logo in favour of this one	2012-09-29 11:43:19 +01:00
Matt Pass	c717dd7bba	Revised version to establish htmlTagArray Uses a method from Marijn Haverbeke to establish an array of nested tokens This means chars in the document don't need to be scanned and the array worked out in a more complex way It means quite a few lines can be condensed down to just 3 Also means it's far less expensive on the CPU, meaning there is no sluggishness onCursorActivity on large documents (ie typing etc)	2012-09-28 17:35:42 +01:00
Matt Pass	e0a7893578	Highlight line on moving up/down No longer setting the cursor ch position on moving line up/down Instead now highlighting the line that has been moved This is done via the new function highlightLine	2012-09-28 07:52:33 +01:00
Matt Pass	6df5adf0f1	Deselect file we're closing in the file manager	2012-09-27 18:07:11 +01:00
Matt Pass	7e773e5d0a	Go back to hiding code editor till loaded Shows as a white block until loaded, so go back to having it's visibility hidden until we're loaded and then show	2012-09-21 14:23:29 +01:00
Matt Pass	c3dbc4187f	Remove iceRoot from location & perms file path Clear iceRoot from the beginning of location (needed for when you set your own ICEroot), so it doesn't cause DOM ID issues/mismatches Also remove it from the file path passed through to file-control when changing perms when you have your own ICEroot and don't show in server message either	2012-09-21 14:22:14 +01:00
Matt Pass	6c004c3010	Remove ICEroot from path This is applied in file control and by not removing it we have 2 x dirs	2012-09-21 09:25:58 +01:00
Matt Pass	96054295a0	Condensing code in a few areas Reworked detecting if it's a JS, CoffeeScript, Ruby, CSS or LESS file by switching the indexOf around Also performed indexOf on an array rather than looking at each array item in a for loop Ternary shortening of code in a few areas	2012-09-20 18:15:20 +01:00
Matt Pass	640c0e9c4a	Input field glow updates Blue glow on input fields now set to 100% opacity, instead of 70%, was a bit weak before Also now showing on go to line input field	2012-09-20 09:41:21 +01:00
Matt Pass	ce04ef36da	setLayout on creating new tab Won't have height set on the editor instance otherwise	2012-09-20 09:29:16 +01:00
Matt Pass	677e90ed6b	Condensing PHP code into 1 echo	2012-09-20 09:25:16 +01:00
Matt Pass	c2fcdd6b9f	Version 0.8.6	2012-09-20 00:13:48 +01:00
Matt Pass	d89cd59c8b	Title tag alts, code condensing & tweaks Version number now in title tag text Tidied up some comment text re whats included in codemirror-compressed.js No longer relying on PHP to echo HTML as much Code folding vars renamed to codeFoldTag and codeFoldBrace A new var also set up to define the style of the + that appears in the gutter Also some fixes to the + symbol which was overlapping numbers & wrapping badly This var is used by both codeFoldTag and codeFoldBrace to set + styling Formatting of code in creating CM instances Pulling thisCM through on onCursorActivity and onKeyEvent This is so we have an object which we can use instead of much more code, doing it the easier way	2012-09-20 00:13:08 +01:00
Matt Pass	ae0d933588	Title tag changed & simpler code Title tag text changed to match other files Decided to drop setting bannedFiles in the ICEcoder array to match session based version Checking against the session based version now Ternary formatting just for ease of reading Root list item now created mostly without PHP echos Just echoing now rather than building up a var to echo	2012-09-19 23:56:49 +01:00
Matt Pass	15a092ce87	Title tag text alt & better textarea text buildup Tweaked title tag text to match other files Outputting plugin text using implode, which makes for much less code	2012-09-19 23:51:51 +01:00
Matt Pass	e23fc7d15a	Removed trailing spaces & semicolons Also moved position to front of progressBar	2012-09-19 23:48:11 +01:00
Matt Pass	0c07937d45	ICEcoder added as folder to exclude	2012-09-19 23:46:29 +01:00
Matt Pass	2694a06876	onLoad clear load screen, ternary shortening Now clears load screen when this is loaded Ternary statements shortened even further in 3 areas	2012-09-19 23:45:51 +01:00
Matt Pass	66ca709da9	title tag text tweak only	2012-09-19 23:44:35 +01:00
Matt Pass	a01d770044	Condensing JS and PHP syntax format tweaks Multiple JS lines condensed into fewer, action also placed before message Couple of PHP if else statements changed to ternary	2012-09-19 23:44:04 +01:00
Matt Pass	bdfa5b6141	Removed unused classes, condensed others Removed PDF, SQL, SWF and XML, not supporting these in v1 HTML, Jpeg & Ruby condensed, plus dropped RBX and RHTML	2012-09-19 23:40:53 +01:00
Matt Pass	0d9116b9dc	Syntax, format & wording tweaks only	2012-09-19 23:39:15 +01:00
Matt Pass	5c8f11bfe3	Remove trailing semicolons	2012-09-19 23:37:31 +01:00
Matt Pass	a32f04a4e3	Show load screen while waiting for multi results Set visibility to visible until multiple-results.php has loaded	2012-09-19 23:36:46 +01:00
Matt Pass	133317efdb	return false onContextMenu on DOM elems	2012-09-19 23:35:14 +01:00
Matt Pass	58f8834041	Hex code shortening	2012-09-19 23:33:58 +01:00
Matt Pass	71ff5d3058	Refresh message & no need to change visibility Ended config.php write problem messages with 'and press refresh' No need to set visibility on load anymore as we can only see if logged in, so should be visible anyway Removed tabs from login & set password screen (gives clue it's in an if condition)	2012-09-19 20:45:22 +01:00
Matt Pass	fb82fcdb20	Not hidden by default Can always be show as we can only see if logged in	2012-09-19 20:42:37 +01:00
Matt Pass	3837e18af2	No need to decode as it's not URI encoded	2012-09-19 20:41:59 +01:00
Matt Pass	c4a431bd2f	Upgrade to CodeMirror 2.34	2012-09-19 17:59:29 +01:00
Matt Pass	9ff868a2d4	Upgrade to CodeMirror 2.34	2012-09-19 17:57:38 +01:00
Matt Pass	7a44e5db9a	Removed CodeMirror 2.33 Upgrade to 2.34	2012-09-19 17:57:11 +01:00
Matt Pass	9ec77d62cc	newTab needs 5px padding at bottom not 1px	2012-09-19 17:38:11 +01:00
Matt Pass	fd974c7bb7	Removed restrictedFile, DOM ready update & tweak You cannot get access to ICEcoder unless you have logged in, so restrictedFiles is not needed anymore Removed it and all instances of it's usage Only updating pluginsContainer if it's a DOM elem Change title tag of login/set password screen conditionally	2012-09-19 17:29:10 +01:00