Minor fix to start session from beginnig of file

Was causing problems when opening a file, not able to set as session not started
Ruby language support & visible tabs
2026-03-16 21:37:06 +01:00 · 2012-04-14 18:26:44 +01:00 · 2012-04-14 18:10:00 +01:00 · 2012-04-14 18:08:03 +01:00 · 2012-04-14 17:54:52 +01:00 · 2012-04-14 17:53:11 +01:00
8 changed files with 512 additions and 26 deletions
--- a/CodeMirror-2.23/mode/ruby/LICENSE
+++ b/CodeMirror-2.23/mode/ruby/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2011, Ubalo, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Ubalo, Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL UBALO, INC BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/CodeMirror-2.23/mode/ruby/index.html
+++ b/CodeMirror-2.23/mode/ruby/index.html
@@ -0,0 +1,171 @@
+<!doctype html>
+<html>
+  <head>
+    <title>CodeMirror: Ruby mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="ruby.js"></script>
+    <style>
+      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+      .cm-s-default span.cm-arrow { color: red; }
+    </style>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror: Ruby mode</h1>
+    <form><textarea id="code" name="code">
+# Code from http://sandbox.mc.edu/~bennet/ruby/code/poly_rb.html
+#
+# This program evaluates polynomials.  It first asks for the coefficients
+# of a polynomial, which must be entered on one line, highest-order first.
+# It then requests values of x and will compute the value of the poly for
+# each x.  It will repeatly ask for x values, unless you the user enters
+# a blank line.  It that case, it will ask for another polynomial.  If the
+# user types quit for either input, the program immediately exits.
+#
+
+#
+# Function to evaluate a polynomial at x.  The polynomial is given
+# as a list of coefficients, from the greatest to the least.
+def polyval(x, coef)
+    sum = 0
+    coef = coef.clone           # Don't want to destroy the original
+    while true
+        sum += coef.shift       # Add and remove the next coef
+        break if coef.empty?    # If no more, done entirely.
+        sum *= x                # This happens the right number of times.
+    end
+    return sum
+end
+
+#
+# Function to read a line containing a list of integers and return
+# them as an array of integers.  If the string conversion fails, it
+# throws TypeError.  If the input line is the word 'quit', then it
+# converts it to an end-of-file exception
+def readints(prompt)
+    # Read a line
+    print prompt
+    line = readline.chomp
+    raise EOFError.new if line == 'quit' # You can also use a real EOF.
+            
+    # Go through each item on the line, converting each one and adding it
+    # to retval.
+    retval = [ ]
+    for str in line.split(/\s+/)
+        if str =~ /^\-?\d+$/
+            retval.push(str.to_i)
+        else
+            raise TypeError.new
+        end
+    end
+
+    return retval
+end
+
+#
+# Take a coeff and an exponent and return the string representation, ignoring
+# the sign of the coefficient.
+def term_to_str(coef, exp)
+    ret = ""
+
+    # Show coeff, unless it's 1 or at the right
+    coef = coef.abs
+    ret = coef.to_s     unless coef == 1 && exp > 0
+    ret += "x" if exp > 0                               # x if exponent not 0
+    ret += "^" + exp.to_s if exp > 1                    # ^exponent, if > 1.
+
+    return ret
+end
+
+#
+# Create a string of the polynomial in sort-of-readable form.
+def polystr(p)
+    # Get the exponent of first coefficient, plus 1.
+    exp = p.length
+
+    # Assign exponents to each term, making pairs of coeff and exponent,
+    # Then get rid of the zero terms.
+    p = (p.map { |c| exp -= 1; [ c, exp ] }).select { |p| p[0] != 0 }
+
+    # If there's nothing left, it's a zero
+    return "0" if p.empty?
+
+    # *** Now p is a non-empty list of [ coef, exponent ] pairs. ***
+
+    # Convert the first term, preceded by a "-" if it's negative.
+    result = (if p[0][0] < 0 then "-" else "" end) + term_to_str(*p[0])
+
+    # Convert the rest of the terms, in each case adding the appropriate
+    # + or - separating them.  
+    for term in p[1...p.length]
+        # Add the separator then the rep. of the term.
+        result += (if term[0] < 0 then " - " else " + " end) + 
+                term_to_str(*term)
+    end
+
+    return result
+end
+        
+#
+# Run until some kind of endfile.
+begin
+    # Repeat until an exception or quit gets us out.
+    while true
+        # Read a poly until it works.  An EOF will except out of the
+        # program.
+        print "\n"
+        begin
+            poly = readints("Enter a polynomial coefficients: ")
+        rescue TypeError
+            print "Try again.\n"
+            retry
+        end
+        break if poly.empty?
+
+        # Read and evaluate x values until the user types a blank line.
+        # Again, an EOF will except out of the pgm.
+        while true
+            # Request an integer.
+            print "Enter x value or blank line: "
+            x = readline.chomp
+            break if x == ''
+            raise EOFError.new if x == 'quit'
+
+            # If it looks bad, let's try again.
+            if x !~ /^\-?\d+$/
+                print "That doesn't look like an integer.  Please try again.\n"
+                next
+            end
+
+            # Convert to an integer and print the result.
+            x = x.to_i
+            print "p(x) = ", polystr(poly), "\n"
+            print "p(", x, ") = ", polyval(x, poly), "\n"
+        end
+    end
+rescue EOFError
+    print "\n=== EOF ===\n"
+rescue Interrupt, SignalException
+    print "\n=== Interrupted ===\n"
+else
+    print "--- Bye ---\n"
+end
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: "text/x-ruby",
+        tabMode: "indent",
+        matchBrackets: true,
+        indentUnit: 4
+      });
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-ruby</code>.</p>
+
+    <p>Development of the CodeMirror Ruby mode was kindly sponsored
+    by <a href="http://ubalo.com/">Ubalo</a>, who hold
+    the <a href="LICENSE">license</a>.</p>
+
+  </body>
+</html>
--- a/CodeMirror-2.23/mode/ruby/ruby.js
+++ b/CodeMirror-2.23/mode/ruby/ruby.js
@@ -0,0 +1,200 @@
+CodeMirror.defineMode("ruby", function(config, parserConfig) {
+  function wordObj(words) {
+    var o = {};
+    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
+    return o;
+  }
+  var keywords = wordObj([
+    "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else",
+    "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or",
+    "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
+    "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
+    "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
+    "require_relative", "extend", "autoload"
+  ]);
+  var indentWords = wordObj(["def", "class", "case", "for", "while", "do", "module", "then",
+                             "catch", "loop", "proc", "begin"]);
+  var dedentWords = wordObj(["end", "until"]);
+  var matching = {"[": "]", "{": "}", "(": ")"};
+  var curPunc;
+
+  function chain(newtok, stream, state) {
+    state.tokenize.push(newtok);
+    return newtok(stream, state);
+  }
+
+  function tokenBase(stream, state) {
+    curPunc = null;
+    if (stream.sol() && stream.match("=begin") && stream.eol()) {
+      state.tokenize.push(readBlockComment);
+      return "comment";
+    }
+    if (stream.eatSpace()) return null;
+    var ch = stream.next();
+    if (ch == "`" || ch == "'" || ch == '"' ||
+        (ch == "/" && !stream.eol() && stream.peek() != " ")) {
+      return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
+    } else if (ch == "%") {
+      var style, embed = false;
+      if (stream.eat("s")) style = "atom";
+      else if (stream.eat(/[WQ]/)) { style = "string"; embed = true; }
+      else if (stream.eat(/[wxqr]/)) style = "string";
+      var delim = stream.eat(/[^\w\s]/);
+      if (!delim) return "operator";
+      if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
+      return chain(readQuoted(delim, style, embed, true), stream, state);
+    } else if (ch == "#") {
+      stream.skipToEnd();
+      return "comment";
+    } else if (ch == "<" && stream.eat("<")) {
+      stream.eat("-");
+      stream.eat(/[\'\"\`]/);
+      var match = stream.match(/^\w+/);
+      stream.eat(/[\'\"\`]/);
+      if (match) return chain(readHereDoc(match[0]), stream, state);
+      return null;
+    } else if (ch == "0") {
+      if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
+      else if (stream.eat("b")) stream.eatWhile(/[01]/);
+      else stream.eatWhile(/[0-7]/);
+      return "number";
+    } else if (/\d/.test(ch)) {
+      stream.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+\-]?[\d_]+)?/);
+      return "number";
+    } else if (ch == "?") {
+      while (stream.match(/^\\[CM]-/)) {}
+      if (stream.eat("\\")) stream.eatWhile(/\w/);
+      else stream.next();
+      return "string";
+    } else if (ch == ":") {
+      if (stream.eat("'")) return chain(readQuoted("'", "atom", false), stream, state);
+      if (stream.eat('"')) return chain(readQuoted('"', "atom", true), stream, state);
+      stream.eatWhile(/[\w\?]/);
+      return "atom";
+    } else if (ch == "@") {
+      stream.eat("@");
+      stream.eatWhile(/[\w\?]/);
+      return "variable-2";
+    } else if (ch == "$") {
+      stream.next();
+      stream.eatWhile(/[\w\?]/);
+      return "variable-3";
+    } else if (/\w/.test(ch)) {
+      stream.eatWhile(/[\w\?]/);
+      if (stream.eat(":")) return "atom";
+      return "ident";
+    } else if (ch == "|" && (state.varList || state.lastTok == "{" || state.lastTok == "do")) {
+      curPunc = "|";
+      return null;
+    } else if (/[\(\)\[\]{}\\;]/.test(ch)) {
+      curPunc = ch;
+      return null;
+    } else if (ch == "-" && stream.eat(">")) {
+      return "arrow";
+    } else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) {
+      stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
+      return "operator";
+    } else {
+      return null;
+    }
+  }
+
+  function tokenBaseUntilBrace() {
+    var depth = 1;
+    return function(stream, state) {
+      if (stream.peek() == "}") {
+        depth--;
+        if (depth == 0) {
+          state.tokenize.pop();
+          return state.tokenize[state.tokenize.length-1](stream, state);
+        }
+      } else if (stream.peek() == "{") {
+        depth++;
+      }
+      return tokenBase(stream, state);
+    };
+  }
+  function readQuoted(quote, style, embed, unescaped) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && (unescaped || !escaped)) {
+          state.tokenize.pop();
+          break;
+        }
+        if (embed && ch == "#" && !escaped && stream.eat("{")) {
+          state.tokenize.push(tokenBaseUntilBrace(arguments.callee));
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      return style;
+    };
+  }
+  function readHereDoc(phrase) {
+    return function(stream, state) {
+      if (stream.match(phrase)) state.tokenize.pop();
+      else stream.skipToEnd();
+      return "string";
+    };
+  }
+  function readBlockComment(stream, state) {
+    if (stream.sol() && stream.match("=end") && stream.eol())
+      state.tokenize.pop();
+    stream.skipToEnd();
+    return "comment";
+  }
+
+  return {
+    startState: function() {
+      return {tokenize: [tokenBase],
+              indented: 0,
+              context: {type: "top", indented: -config.indentUnit},
+              continuedLine: false,
+              lastTok: null,
+              varList: false};
+    },
+
+    token: function(stream, state) {
+      if (stream.sol()) state.indented = stream.indentation();
+      var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
+      if (style == "ident") {
+        var word = stream.current();
+        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
+          : /^[A-Z]/.test(word) ? "tag"
+          : (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def"
+          : "variable";
+        if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
+        else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
+        else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
+          kwtype = "indent";
+      }
+      if (curPunc || (style && style != "comment")) state.lastTok = word || curPunc || style;
+      if (curPunc == "|") state.varList = !state.varList;
+
+      if (kwtype == "indent" || /[\(\[\{]/.test(curPunc))
+        state.context = {prev: state.context, type: curPunc || style, indented: state.indented};
+      else if ((kwtype == "dedent" || /[\)\]\}]/.test(curPunc)) && state.context.prev)
+        state.context = state.context.prev;
+
+      if (stream.eol())
+        state.continuedLine = (curPunc == "\\" || style == "operator");
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
+      var firstChar = textAfter && textAfter.charAt(0);
+      var ct = state.context;
+      var closing = ct.type == matching[firstChar] ||
+        ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
+      return ct.indented + (closing ? 0 : config.indentUnit) +
+        (state.continuedLine ? config.indentUnit : 0);
+    },
+     electricChars: "}de" // enD and rescuE
+
+  };
+});
+
+CodeMirror.defineMIME("text/x-ruby", "ruby");
+
--- a/editor.php
+++ b/editor.php
@@ -11,6 +11,7 @@
 <script src="<?php echo $codeMirrorDir; ?>/mode/css/css.js"></script>
 <script src="<?php echo $codeMirrorDir; ?>/mode/clike/clike.js"></script>
 <script src="<?php echo $codeMirrorDir; ?>/mode/php/php.js"></script>
+<script src="<?php echo $codeMirrorDir; ?>/mode/ruby/ruby.js"></script>
 <script src="<?php echo $codeMirrorDir; ?>/lib/util/searchcursor.js"></script>
 <script src="<?php echo $codeMirrorDir; ?>/lib/util/match-highlighter.js"></script>
 <script src="<?php echo $codeMirrorDir; ?>/lib/util/foldcode.js"></script>
@@ -21,6 +22,9 @@
 .cm-s-visible {display: block; top: 0px}
 .cm-s-hidden {display: none; top: 4000px}
 .cm-s-activeLine {background: #002 !important;}
+<?php if ($visibleTabs) {?>
+.cm-tab:after {position: relative; display: inline-block; width: 0px; left: -1.4em; overflow: visible; color: #aaa; content: "\21e5";}
+<?;};?>
 </style>
 </head>

@@ -29,8 +33,8 @@
 <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: #bb0000; color: #ffffff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
-	var codeFold_JS_PHP = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #bb0000; color: #ffffff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
+	var codeFold 		 = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #bb0000; color: #ffffff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
+	var codeFold_JS_PHP_Ruby = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #bb0000; color: #ffffff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');

 	window['cM'+num] = CodeMirror(document.body, {
        mode: "application/x-httpd-php",
@@ -112,7 +116,7 @@ function createNewCMInstance(num) {
 		};
 		lastKeyCode = e.keyCode;
 	},
-	onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".php") == -1) ? codeFold : codeFold_JS_PHP,
+	onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".php") && fileName.indexOf(".rb") == -1) ? codeFold : codeFold_JS_PHP_Ruby,
 	extraKeys: {"Tab": "indentMore", "Shift-Tab": "indentLess"}
 	});

--- a/index.php
+++ b/index.php
@@ -32,6 +32,23 @@ $docRoot = str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']);
 if (strrpos($docRoot,"/")==strlen($docRoot)-1) {$docRoot = substr($docRoot,0,strlen($docRoot)-1);};
 echo 'fullPath = "'.$docRoot.'";'.PHP_EOL;
 ?>
+window.onbeforeunload = function() {
+	for (var i=0; i<=top.ICEcoder.changedContent.length; i++) {
+		if (top.ICEcoder.changedContent[i]==1) {
+			return "You have some unsaved changes.";
+		}
+	}
+}
+
+lastOpenFiles = [<?php
+	if ($lastOpenedFiles!="") {
+		$openFilesArray = explode(",",$lastOpenedFiles);
+		for ($i=0;$i<count($openFilesArray);$i++) {
+			echo "'".$openFilesArray[$i]."'";
+			if ($i<count($openFilesArray)-1) {echo ",";};
+		}
+	}
+?>];
 </script>
 <script language="JavaScript" src="lib/coder.js"></script>
 </head><?php
@@ -41,6 +58,9 @@ echo 'fullPath = "'.$docRoot.'";'.PHP_EOL;
 			$onLoadExtras .= ";ICEcoder.startPluginIntervals('".$plugins[$i][3]."','".$plugins[$i][4]."','".$plugins[$i][5]."')";
 		};
 	};
+	if ($openLastFiles) {
+		$onLoadExtras .= ";ICEcoder.autoOpenFiles()";
+	}
 ?>
 <body onLoad="ICEcoder.init()<?php echo $onLoadExtras;?>" onResize="ICEcoder.setLayout()" onMouseMove="top.ICEcoder.getMouseXY(event);top.ICEcoder.canResizeFilesW()" onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onKeyDown="return ICEcoder.interceptKeys('coder', event);" onKeyUp="parent.ICEcoder.resetKeys(event);">

@@ -62,7 +82,7 @@ echo 'fullPath = "'.$docRoot.'";'.PHP_EOL;
 	</div>
 </div>

-<div id="fileMenu" class="fileMenu" onMouseOut="this.style.display='none'" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract')">
+<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract')">
 	<span id="folderMenuItems">
 		<a href="javascript:top.ICEcoder.newFile()" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">New File</a>
 		<a href="javascript:top.ICEcoder.newFolder()" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">New Folder</a>
--- a/lib/coder.js
+++ b/lib/coder.js
@@ -26,8 +26,8 @@ var ICEcoder = {
 	draggingFilesW: false,		// If we're dragging the file manager width or not
 	serverQueueItems: [],		// Array of URLs to call in order

-	// Don't consider these tags as part of nesting as they're singles, JS or PHP code blocks
-	tagNestExceptions: ["!DOCTYPE","meta","link","img","br","hr","input","script","?php","?"],
+	// Don't consider these tags as part of nesting as they're singles, JS, PHP or Ruby code blocks
+	tagNestExceptions: ["!DOCTYPE","meta","link","img","br","hr","input","script","?php","?","%"],

 	// On load, set aliases, set the layout and get the nest location
 	init: function() {
@@ -79,9 +79,9 @@ var ICEcoder = {
 	contentCleanUp: function() {
 		var fileName, cM, content;

-		// If it's not a JS or CSS file, replace & and our temp </textarea> value
+		// If it's not a JS, Ruby or CSS file, replace & and our temp </textarea> value
 		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
-		if (fileName.indexOf(".js")<0&&fileName.indexOf(".css")<0) {
+		if (fileName.indexOf(".js")<0&&fileName.indexOf(".rb")&&fileName.indexOf(".css")<0) {
 			cM = ICEcoder.getcMInstance();
 			content = cM.getValue();
 			if (top.ICEcoder.codeAssist) {content = content.replace(/ & /g,' &amp; ');};
@@ -113,7 +113,7 @@ var ICEcoder = {

 				// Get the tag name and if it's the start of a code block, set the var for that
 				tagStart=nestCheck.substr(startPos,nestCheck.length).split(" ")[0].split(">")[0].split("\n")[0];
-				if (tagStart=="script"||tagStart=="?php"||tagStart=="?") {ICEcoder.codeBlock=true}
+				if (tagStart=="script"||tagStart=="?php"||tagStart=="?"||tagStart=="%") {ICEcoder.codeBlock=true}
 				if (tagStart!="") {ICEcoder.tagStart = tagStart}
 			};

@@ -156,7 +156,8 @@ var ICEcoder = {
 						}
 					} else if (
 						((ICEcoder.tagStart=="script"||ICEcoder.tagStart=="/script")&&tagEndJS=="</script")||
-						((ICEcoder.tagStart=="?php"||ICEcoder.tagStart=="?")&&tagEnd=="?")) {
+						((ICEcoder.tagStart=="?php"||ICEcoder.tagStart=="?")&&tagEnd=="?")||
+						(ICEcoder.tagStart=="%"&&tagEnd=="%")) {
 						ICEcoder.codeBlock=false;
 					}
 				}
@@ -173,7 +174,7 @@ var ICEcoder = {
 			ICEcoder.nestDisplay.innerHTML = "";
 			if ("undefined" != typeof ICEcoder.openFiles[ICEcoder.selectedTab-1]) {
 				fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
-				if (fileName.indexOf(".js")<0&&fileName.indexOf(".css")<0) {
+				if (fileName.indexOf(".js")<0&&fileName.indexOf(".rb")<0&&fileName.indexOf(".css")<0) {

 					// Then for all the array items, output as the nest display
 					for (var i=0;i<ICEcoder.htmlTagArray.length;i++) {
@@ -395,6 +396,8 @@ var ICEcoder = {

 		// Add a new value ready to indicate if this content has been changed
 		top.ICEcoder.changedContent.push(0);
+
+		top.ICEcoder.setLastOpenedFiles();
 	},

 	// Create a new tab for a file
@@ -417,8 +420,8 @@ var ICEcoder = {
 		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
 		ICEcoder.caretPos=cM.getValue().length;
 		ICEcoder.getNestLocation();
-		// Nesting is OK if at the end of the file we have no nests left, or it's a JS or CSS file
-		if (ICEcoder.htmlTagArray.length==0||fileName.indexOf(".js")>0||fileName.indexOf(".css")>0) {
+		// Nesting is OK if at the end of the file we have no nests left, or it's a JS, Ruby or CSS file
+		if (ICEcoder.htmlTagArray.length==0||fileName.indexOf(".js")>0||fileName.indexOf(".rb")>0||fileName.indexOf(".css")>0) {
 			ICEcoder.nestValid.style.backgroundColor="#00bb00";
 			ICEcoder.nestValid.innerHTML = "Nesting OK";
 		} else {
@@ -462,17 +465,19 @@ var ICEcoder = {
 		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(".rb")>0) {caretLocType="Ruby"};
 		if (fileName.indexOf(".css")>0) {caretLocType="CSS"};

 		ICEcoder.caretLocType = caretLocType;

-		// If we're in a JS or PHP code block, add that to the nest display
-		if (caretLocType=="JavaScript"||caretLocType=="PHP") {
+		// If we're in a JS, PHP or Ruby code block, add that to the nest display
+		if (caretLocType=="JavaScript"||caretLocType=="PHP"||caretLocType=="Ruby") {
 			ICEcoder.nestDisplay.innerHTML += " &gt; " + caretLocType;
 		}
 	},
@@ -536,6 +541,8 @@ var ICEcoder = {
 			// 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);
+
+			top.ICEcoder.setLastOpenedFiles();
 		}
 		// Lastly, stop it from trying to also switch tab
 		top.ICEcoder.canSwitchTabs=false;
@@ -755,6 +762,8 @@ var ICEcoder = {
 			}
 		top.ICEcoder.serverQueue("add","lib/file-control.php?action=rename&file="+renamedFile+"&oldFileName="+top.ICEcoder.rightClickedFile.replace(/\|/g,"/"));
 		top.ICEcoder.serverMessage('<b>Renaming to</b><br>'+renamedFile);
+
+		top.ICEcoder.setLastOpenedFiles();
 		}
 	},

@@ -910,6 +919,8 @@ var ICEcoder = {
 		fileName = ICEcoder.openFiles[ICEcoder.selectedTab-1];
 		if (fileName.indexOf('.js')>0) {
 			cM.setOption("mode","javascript");
+		} else if (fileName.indexOf('.rb')>0) {
+			cM.setOption("mode","ruby");
 		} else if (fileName.indexOf('.css')>0) {
 			cM.setOption("mode","css");
 		} else {
@@ -956,7 +967,7 @@ var ICEcoder = {

 	// Comment or uncomment line on keypress
 	lineCommentToggle: function() {
-		var cM, cursorPos, linePos, lineContent, lCLen, adjustCursor;
+		var cM, cursorPos, linePos, lineContent, lCLen, adjustCursor, startLine, endLine;

 		cM = ICEcoder.getcMInstance();
 		cursorPos = cM.getCursor().ch;
@@ -965,17 +976,28 @@ var ICEcoder = {
 		lCLen = lineContent.length;
 		adjustCursor = 3;

-		if (ICEcoder.caretLocType=="JavaScript"||ICEcoder.caretLocType=="PHP"||ICEcoder.caretLocType=="CSS") {
+		if (ICEcoder.caretLocType=="JavaScript"||ICEcoder.caretLocType=="PHP"||ICEcoder.caretLocType=="Ruby"||ICEcoder.caretLocType=="CSS") {
 			if (cM.somethingSelected()) {
-				if (cM.getSelection().slice(0,2)!="/*") { 
-					cM.replaceSelection("/*" + cM.getSelection() + "*/");
+				if (ICEcoder.caretLocType=="Ruby") {
+					startLine = cM.getCursor(true).line;
+					endLine = cM.getCursor().line;
+					for (var i = startLine; i<=endLine; i++) {
+						cM.getLine(i).slice(0,2)!="# " ? cM.setLine(i, "# " + cM.getLine(i)) : cM.setLine(i, cM.getLine(i).slice(2,cM.getLine(i).length));
+					}
 				} else {
-					cM.replaceSelection(cM.getSelection().slice(2,cM.getSelection().length-2));
+					if (cM.getSelection().slice(0,2)!="/*") { 
+						cM.replaceSelection("/*" + cM.getSelection() + "*/");
+					} else {
+						cM.replaceSelection(cM.getSelection().slice(2,cM.getSelection().length-2));
+					}
 				}
 			} else {
 				if (ICEcoder.caretLocType=="CSS") {
 					lineContent.slice(0,3)!="/* " ? cM.setLine(linePos, "/* " + lineContent + " */") : cM.setLine(linePos, lineContent.slice(3,lCLen).slice(0,lCLen-5));
 					if (lineContent.slice(0,3)=="/* ") {adjustCursor = -adjustCursor};
+				} else if (ICEcoder.caretLocType=="Ruby") {
+					lineContent.slice(0,2)!="# " ? cM.setLine(linePos, "# " + lineContent) : cM.setLine(linePos, lineContent.slice(2,lCLen));
+					if (lineContent.slice(0,2)=="# ") {adjustCursor = -adjustCursor};
 				} else {
 					lineContent.slice(0,3)!="// " ? cM.setLine(linePos, "// " + lineContent) : cM.setLine(linePos, lineContent.slice(3,lCLen));
 					if (lineContent.slice(0,3)=="// ") {adjustCursor = -adjustCursor};
@@ -1242,7 +1264,7 @@ var ICEcoder = {

 	// Highlight or hide block upon roll over/out of nest positions
 	highlightBlock: function(nestPos,hide) {
-		var cM;
+		var cM, searchPos, cursor, startPos, endPos;

 		cM = ICEcoder.getcMInstance();
 		// Hiding the block
@@ -1285,7 +1307,7 @@ var ICEcoder = {

 	// Set our cursor position upon mouse click of the nest position
 	setPosition: function(nestPos,line,tag) {
-		var cM;
+		var cM, char, charPos;

 		cM = ICEcoder.getcMInstance();
 		// Set out char position just after the tag, and refocus on the editor
@@ -1294,11 +1316,36 @@ var ICEcoder = {
 		cM.focus();
 		// Now update the nest display up to this nest depth & without any HTML tags to kill further interactivity
 		charPos = 0;
-		for (i=0;i<=nestPos;i++) {
+		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 lastOpenedFiles in the settings file
+	setLastOpenedFiles: function() {
+		var lastOpenedFiles;
+
+		lastOpenedFiles = "";
+		// Generate a comma seperated list
+		for (var i=0;i<top.ICEcoder.openFiles.length;i++) {
+			if (top.ICEcoder.openFiles[i]!="/[NEW]") {
+				lastOpenedFiles += top.ICEcoder.openFiles[i].replace(/\//g,"|");
+				if (i<top.ICEcoder.openFiles.length-1) {lastOpenedFiles += ","};
+			}
+		}
+		// Then send through to the settings page to update setting
+		top.ICEcoder.serverQueue("add","lib/settings.php?saveFiles="+lastOpenedFiles);
+	},
+
+	// Opens the last files we had open
+	autoOpenFiles: function() {
+		for (var i=0;i<=top.lastOpenFiles.length-1;i++) {
+			top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=top.fullPath+top.lastOpenFiles[i].replace('|','/');
+			top.ICEcoder.thisFileFolderType='file';
+			top.ICEcoder.openFile();
+		}
 	}
 };
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -28,7 +28,9 @@ if ($_GET['action']=="load") {
 			}
 		}
 		if ($_SESSION['userLevel'] == 10 || ($_SESSION['userLevel'] < 10 && $bannedFile==false)) {
-			echo '<script>fileType="text";</script>';
+			echo '<script>fileType="text";top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink=\''.$file.'\';';
+			echo 'shortURL = top.ICEcoder.thisFileFolderLink.replace(/\|/g,"/");';
+			echo 'top.ICEcoder.shortURL = shortURL.substr((shortURL.indexOf(top.shortURLStarts)+top.shortURLStarts.length),shortURL.length);</script>';
 			$loadedFile = file_get_contents($file);
 			echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",$loadedFile).'</textarea>';
 		} else {
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -1,8 +1,11 @@
 <?php
-$versionNo		= "v 0.6.2";
+session_start();
+
+$versionNo		= "v 0.6.3";
 $codeMirrorDir		= "CodeMirror-2.23";
 $cMThisVer		= 2.23;
 $testcMVersion		= false; // test if we're using the latest CodeMirror version
+$visibleTabs		= true;
 $restrictedFiles	= array("wp-",".php",".asp",".aspx");
 $bannedFiles		= array("_coder","wp-",".exe");
 $allowedIPs		= array("*"); // allowed IPs, * for any
@@ -13,6 +16,22 @@ $plugins		= array(
 			array("Clipboard","images/clipboard.png","","javascript:alert('Doesn\'t do anything yet but will be a clipboard for copied text items, up to 100 levels')","_self","")
 			);
 $accountPassword	= "";
+$lastOpenedFiles	= "";
+$openLastFiles		= true;
+
+if ($_GET['saveFiles'] && $_SESSION['userLevel'] == 10) {
+	$settingsFile = 'settings.php';
+	$settingsContents = file_get_contents($settingsFile);
+	// Replace our lastOpenedFiles var with the the current
+	$repPosStart = strpos($settingsContents,'lastOpenedFiles	= "')+19;
+	$repPosEnd = strpos($settingsContents,'";',$repPosStart)-$repPosStart;
+	$settingsContents = substr($settingsContents,0,$repPosStart).$_GET['saveFiles'].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+	// Now update this file
+	$fh = fopen($settingsFile, 'w') or die("can't update settings file");
+	fwrite($fh, $settingsContents);
+	fclose($fh);
+	echo '<script>top.ICEcoder.serverQueue("del",0);</script>';
+}

 // ---------------
 // End of settings
@@ -29,7 +48,6 @@ function generateHash($plainText,$salt=null) {
 	return $salt.sha1($salt.$plainText);
 }

-session_start();
 // Establish our user level
 if (!isset($_SESSION['userLevel'])) {$_SESSION['userLevel'] = 0;};
 if(isset($_POST['loginPassword']) && generateHash($_POST['loginPassword'],$accountPassword)==$accountPassword) {$_SESSION['userLevel'] = 10;};
Author	SHA1	Message	Date
Matt Pass	222f651d68	Minor fix to start session from beginnig of file Was causing problems when opening a file, not able to set as session not started	2012-04-14 18:26:44 +01:00
Matt Pass	b70ee4553a	Ruby language support & visible tabs CodeMirror mode now loaded for Ruby code highlighting CSS for visible tabs if setting turned on	2012-04-14 18:10:00 +01:00
Matt Pass	493037a01b	Ruby language support & auto loading of last opened files Ruby now supported as a language in .rb files or within % blocks List of last opened files updates on opening, closing and renaming tabs Comment toggle function now handles Ruby commenting via # hashes (Decided not to go for =begin and =end as this requires extra lines) New function to handle opening of previously opened files A few global vars that have been added recently now closed	2012-04-14 18:08:03 +01:00
Matt Pass	8233763511	Extra code to allow for auto opening of files On opening and files being auto loaded, we need to establish the shortURL This is so tabs can have the correct name on auto loading files	2012-04-14 17:54:52 +01:00
Matt Pass	2c01eeba17	Visible tabs and auto opening last opened files Option to show tabs as arrows or blanks Option to open last opened files on next session or not Accompanying coding to update list of last opened files on demand Version no update to v0.6.3	2012-04-14 17:53:11 +01:00
Matt Pass	82fd2a5b5d	Handling of unsaved changes & loading of previous files Closing or reloading the window now checks for unsaved files and alerts user Filenames opened in previous session loaded into array on start If we have the setting on to open these files, they are opened sequentially on load	2012-04-14 17:44:02 +01:00
Matt Pass	e297fd049f	Ruby code highlighting mode added Mode added from CodeMirror modes lib to handle highlighting of Ruby coding	2012-04-14 17:36:44 +01:00