Editor now loads on top of files app.

apps/files_texteditor/ajax/savefile.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * ownCloud - Editor
+ *
+ * @author Tom Needham
+ * @copyright 2011 Tom Needham contact@tomneedham.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+
+// Check if we are a user
+OC_JSON::checkLoggedIn();
+
+// Save the file data
+$filecontents = htmlspecialchars_decode($_POST['filecontents']);
+$file = $_POST['file'];
+$dir = $_POST['dir'];
+$path = $dir.'/'.$file;
+//$force = isset($_POST['force']) ? $_POST['force'] : false;
+//$sessionname = md5('oc_file_hash_'.$path);
+
+function do_save($path,$filecontents){
+	//$sessionname = md5('oc_file_hash_'.$path);
+	//OC_Filesystem::update_session_file_hash($sessionname,md5(htmlspecialchars($filecontents)));
+	OC_Filesystem::file_put_contents($path, $filecontents);
+}
+/*
+// Check if file modified whilst editing?
+if(isset($_SESSION[$sessionname])){
+    if(!empty($_SESSION[$sessionname])){
+        // Compare to current hash of file.
+        $savedfilecontents = htmlspecialchars(OC_Filesystem::file_get_contents($path));
+        $hash = md5($savedfilecontents);
+        $originalhash = $_SESSION[$sessionname];
+        // Compare with hash taken when file was opened
+        if($hash != $originalhash){
+            // Someone has played with the file while you were editing
+            // Force save?
+            if($force){
+            	do_save($path, $filecontents);
+            	OC_JSON::success();
+            } else {	
+            	// No force
+            	OC_JSON::error(array('data' => array( 'message' => $l10n->t('The file has been edited since you opened it. Overwrite the file?'))));
+            }
+        } else  {
+            // No body has edited it whilst you were, so save the file
+            // Update the session hash.
+            do_save($path,$filecontents);
+            OC_JSON::success();
+        }
+        
+        
+}
+} else {
+    // No session value set for soem reason, just save the file.
+	do_save($path,$filecontents);
+	OC_JSON::success();
+}
+*/
+do_save($path,$filecontents);
+OC_JSON::success();

apps/files_texteditor/appinfo/app.php

@@ -0,0 +1,4 @@
+<?php
+//load the required js file
+OC_UTIL::addScript('files_texteditor','editor');
+?>

apps/files_texteditor/appinfo/info.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0"?> 
+<info>
+	<id>files_textviewer</id>
+	<name>Text viewer</name>
+	<version>0.3</version>
+	<licence>AGPL</licence>
+	<author>Robin Appelman</author>
+	<require>2</require>
+	<default_enable/>
+</info>

apps/files_texteditor/css/style.css

@@ -0,0 +1,16 @@
+#editor{
+	position: absoloute;
+	height: 0;
+	width: 0;
+	top: 41px;
+	left: 160px;
+	z-index: -1;
+}
+#editorwrapper{
+	position: absoloute;
+	height: 0;
+	width: 0;
+	top: 41px;
+	left: 160px;
+	display: none;
+}

apps/files_texteditor/js/aceeditor/keybinding-emacs.js

@@ -0,0 +1 @@
+define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b==0||c!=""&&c!=String.fromCharCode(0)){var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})

apps/files_texteditor/js/aceeditor/keybinding-vim.js

@@ -0,0 +1 @@
+define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},{regex:["([0-9]*)","(k|up)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(j|down|enter)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(l|right)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(h|left)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{key:"shift-g",exec:"gotoend"},{key:"b",exec:"gotowordleft"},{key:"e",exec:"gotowordright"},{key:"x",exec:"del"},{key:"shift-x",exec:"backspace"},{key:"shift-d",exec:"removetolineend"},{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b==0||c!=""&&c!=String.fromCharCode(0)){var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})

apps/files_texteditor/js/aceeditor/mode-python.js

@@ -0,0 +1 @@
+define("ace/mode/python",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/python_highlight_rules").PythonHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/python_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen",regex:"[\\[\\(\\{]"},{token:"rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})

apps/files_texteditor/js/aceeditor/mode-textile.js

@@ -0,0 +1 @@
+define("ace/mode/textile",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/textile_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/textile_highlight_rules").TextileHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return a=="intag"?c:""},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/textile_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"keyword",regex:"h1|h2|h3|h4|h5|h6|bq|p|bc|pre",next:"blocktag"},{token:"keyword",regex:"[\\*]+|[#]+"},{token:"text",regex:".+"}],blocktag:[{token:"keyword",regex:"\\. ",next:"start"},{token:"keyword",regex:"\\(",next:"blocktagproperties"}],blocktagproperties:[{token:"keyword",regex:"\\)",next:"blocktag"},{token:"string",regex:"[a-zA-Z0-9\\-_]+"},{token:"keyword",regex:"#"}]}};d.inherits(f,e),b.TextileHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})

apps/files_texteditor/js/aceeditor/theme-clouds.js

@@ -0,0 +1 @@
+define("ace/theme/clouds",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-clouds .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-clouds .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-clouds .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-clouds .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-clouds .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-clouds .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-clouds .ace_scroller {\n  background-color: #FFFFFF;\n}\n\n.ace-clouds .ace_text-layer {\n  cursor: text;\n  color: #000000;\n}\n\n.ace-clouds .ace_cursor {\n  border-left: 2px solid #000000;\n}\n\n.ace-clouds .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid #000000;\n}\n \n.ace-clouds .ace_marker-layer .ace_selection {\n  background: #BDD5FC;\n}\n\n.ace-clouds .ace_marker-layer .ace_step {\n  background: rgb(198, 219, 174);\n}\n\n.ace-clouds .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid #BFBFBF;\n}\n\n.ace-clouds .ace_marker-layer .ace_active_line {\n  background: #FFFBD1;\n}\n\n       \n.ace-clouds .ace_invisible {\n  color: #BFBFBF;\n}\n\n.ace-clouds .ace_keyword {\n  color:#AF956F;\n}\n\n.ace-clouds .ace_keyword.ace_operator {\n  color:#484848;\n}\n\n.ace-clouds .ace_constant {\n  \n}\n\n.ace-clouds .ace_constant.ace_language {\n  color:#39946A;\n}\n\n.ace-clouds .ace_constant.ace_library {\n  \n}\n\n.ace-clouds .ace_constant.ace_numeric {\n  color:#46A609;\n}\n\n.ace-clouds .ace_invalid {\n  background-color:#FF002A;\n}\n\n.ace-clouds .ace_invalid.ace_illegal {\n  \n}\n\n.ace-clouds .ace_invalid.ace_deprecated {\n  \n}\n\n.ace-clouds .ace_support {\n  \n}\n\n.ace-clouds .ace_support.ace_function {\n  color:#C52727;\n}\n\n.ace-clouds .ace_function.ace_buildin {\n  \n}\n\n.ace-clouds .ace_string {\n  color:#5D90CD;\n}\n\n.ace-clouds .ace_string.ace_regexp {\n  \n}\n\n.ace-clouds .ace_comment {\n  color:#BCC8BA;\n}\n\n.ace-clouds .ace_comment.ace_doc {\n  \n}\n\n.ace-clouds .ace_comment.ace_doc.ace_tag {\n  \n}\n\n.ace-clouds .ace_variable {\n  \n}\n\n.ace-clouds .ace_variable.ace_language {\n  \n}\n\n.ace-clouds .ace_xml_pe {\n  \n}";d.importCssString(e),b.cssClass="ace-clouds"})

apps/files_texteditor/js/editor.js

@@ -0,0 +1,130 @@
+function setEditorSize(){
+	// Sets the size of the text editor window.
+	$('#editor').css('height', $(window).height()-90);
+	$('#editor').css('width', $(window).width()-180);
+	$('#editor').css('padding-top', '40px');		
+}
+
+function getFileExtension(file){
+	var parts=file.split('.');
+	return parts[parts.length-1];
+}
+
+function setSyntaxMode(ext){
+	// Loads the syntax mode files and tells the editor
+	var filetype = new Array()
+	// Todo finish these
+	filetype["php"] = "php";
+	filetype["html"] = "html";
+	filetype["rb"] = "ruby";
+	filetype["css"] = "css";
+	filetype["pl"] = "perl";
+	filetype["py"] = "python";
+	filetype["xml"] = "xml";
+	filetype["js"] = "javascript";
+
+	if(filetype[ext]!=null){
+		// Then it must be in the array, so load the custom syntax mode
+		// Set the syntax mode
+		OC.addScript('files_texteditor','aceeditor/mode-'+filetype[ext], function(){
+			var SyntaxMode = require("ace/mode/"+filetype[ext]).Mode;
+			window.aceEditor.getSession().setMode(new SyntaxMode());
+		});
+	}	
+}
+
+function showControlBar(){
+	// Loads the control bar at the top.
+	$('.actions,#file_action_panel').fadeOut('slow', function(){
+		// Load the new toolbar.
+		var html = '<div id="editorbar"><input type="button" id="editor_save" value="'+t('files_texteditor','Save')+'"><input type="button" id="editor_close" value="Close"></div>';
+		if($('#editorbar').length==0){
+			$('#controls').append(html).fadeIn('slow');	
+		}
+		bindControlEvents();
+	});
+}
+
+function bindControlEvents(){
+	$('#editor_save').bind('click', function() {
+		$(this).val('Saving...');
+		var filecontents = window.aceEditor.getSession().getValue();
+		var dir =  $('#editor').attr('data-dir');
+		var file =  $('#editor').attr('data-file');
+		$.post('http://cloud.tomneedham.com/apps/files_texteditor/ajax/savefile.php', { filecontents: filecontents, file: file, dir: dir },function(jsondata){
+			if(jsondata.status == 'failure'){
+				var answer = confirm(jsondata.data.message);
+				if(answer){
+					$.post(OC.filePath('apps','files_texteditor','ajax','savefile.php'),{ filecontents: filecontents, file: file, dir: dir, force: 'true' },function(jsondata){
+						if(jsondata.status =='success'){
+							$('#editor_save').val('Save');
+							$('#editor_save').effect("highlight", {color:'#4BFF8D'}, 3000);
+						} 
+						else {
+							// Save error
+							alert(jsondata.data.message);	
+						}
+					}, 'json');
+				} 
+		   		else {
+					// Don't save!
+					$('#editor_save').effect("highlight", {color:'#FF5757'}, 3000);
+					$('#editor_save').val('Save');	
+		   		}
+			} 
+			else if(jsondata.status == 'success'){
+				// Success
+				$('#editor_save').val('Save');
+				$('#editor_save').effect("highlight", {color:'#4BFF8D'}, 3000);
+			}
+		}, 'json');
+	// TODO give focus back to the editor
+	// window.aceEditor.focus();
+	});	
+	
+	$('#editor_close').bind('click', function() {
+		hideFileEditor();	
+	});
+}
+
+function showFileEditor(dir,filename){
+	// Loads the file editor and display it.
+	var data = $.ajax({
+			url: OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent(dir),
+			complete: function(data){
+				var data = data.responseText;
+				// Initialise the editor
+				showControlBar();
+				$('table').fadeOut('slow', function() {
+					$('#editor').html(data);
+					// encodeURIComponenet?
+					$('#editor').attr('data-dir', dir);
+					$('#editor').attr('data-filename', filename);
+					window.aceEditor = ace.edit("editor");  
+					aceEditor.setShowPrintMargin(false);
+					setSyntaxMode(getFileExtension(filename));
+					OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){
+						window.aceEditor.setTheme("ace/theme/clouds");
+					});
+					showControlBar();
+				});
+			// End success
+			}
+			// End ajax
+			});
+	setEditorSize();
+}
+
+function hideFileEditor(){
+	$('#editorbar').fadeOut('slow');
+	$('#editor').fadeOut('slow', function(){
+		$('#editorbar').html('');
+		$('#editor').html('');
+		$('.actions,#file_access_panel').fadeIn('slow');
+		$('table').fadeIn('slow');	
+	});
+}
+
+$(window).resize(function() {
+  setEditorSize();
+});

files/appinfo/app.php

@@ -1,5 +1,6 @@
 <?php
 
+
 $l=new OC_L10N('files');
 
 OC_App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));

files/index.php

@@ -30,9 +30,12 @@ OC_Util::checkLoggedIn();
 
 // Load the files we need
 OC_Util::addStyle( "files", "files" );
+OC_Util::addStyle( 'files_texteditor', 'style' );
 OC_Util::addScript( "files", "files" );
 OC_Util::addScript( 'files', 'filelist' );
 OC_Util::addScript( 'files', 'fileactions' );
+OC_Util::addScript( 'files_texteditor', 'editor');
+OC_Util::addScript( 'files_texteditor', 'aceeditor/ace');
 if(!isset($_SESSION['timezone'])){
 	OC_Util::addScript( 'files', 'timezone' );
 }

files/js/fileactions.js

@@ -143,13 +143,13 @@ FileActions.register('dir','Open','',function(filename){
 FileActions.setDefault('dir','Open');  
 
 FileActions.register('text','Edit','',function(filename){
-	window.location=OC.linkTo('editor', 'index.php')+'?file='+filename+'&dir='+$('#dir').val();
+	showFileEditor($('#dir').val(),filename);
 });
 
 FileActions.setDefault('text','Edit');
 
 FileActions.register('application/xml','Edit','',function(filename){
-	window.location=OC.linkTo('editor', 'index.php')+'?file='+filename+'&dir='+$('#dir').val();
+	showFileEditor($('#dir').val(),filename);
 });
 
 FileActions.setDefault('application/xml','Edit');

files/templates/index.php

@@ -50,7 +50,7 @@ if (isset($_['files'])) {
 		<?php echo($_['fileList']); ?>
 	</tbody>
 </table>
-
+<div id="editor"></div>
 <div id="uploadsize-message" title="<?php echo $l->t('Upload too large')?>">
 	<p>
 		<?php echo $l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.');?>