0.9.3

Author: codepad

.npmignore

@@ -0,0 +1,5 @@
+.gitignore
+.ep_initialized
+highlight.js
+themes-disabled
+publish.sh

README.md

@@ -1,12 +1,12 @@
 Turn etherpad into codepad - a collaborative open development enviroment. 
 
-Status: Beta - ~bugfixes only until 1.0.0
+Status: Beta - ~bugfixes mostly until 1.0.0 - bug reports welcome.
 
 This etherpad-lite plugin merges functionality of a few simple plugins, and adds tons of functionality on its own.
 
 - File Tree view, open files into pads and save them back.
-- Syntaxhighlighting for 27 popular lanuges - based on alexgorbatchev/syntaxhighlighter
-- Adds tons of themes, properly implemented with css, and a theme generator
+- Syntaxhighlighting for 92 popular languages - based on highlight.js
+- Adds themes, properly implemented with css, and a theme generator
 - beutify html/css/javascript code with jsBeutify 
 - Syntax-check javascipt with jsHint, and display results
 - save/commit/push (F2) and play
@@ -56,13 +56,9 @@ Codepad is designed to work together with fedora "srvctl", an LXC container and
 https://githubub.com/LaKing/Fedora-scripts
 
 Known issues:
-- multiline comments in pads don't get highlighted, codepad processes everything line-by-line
-- ejs stops etherpad sometimes with an error complaining about missing toolbar
+- while editing, multiline comments in pads don't get highlighted as expected
 - log-view can crash after a while
 
-Syntaxhighlighter bugs:
-- <t> and <l> tags with the XML brush break the pad
-- view does not always work as it should be
 
 Please feel free to send comments, bug-reports, ...
 .. and/or in case of professional, or commercial use please donate to support open source software developers.

ep.json

@@ -40,11 +40,6 @@
         "hooks": {
             "padCreate": "ep_codepad:padCreate"
         }
-    }, {
-        "name": "ep_codepad_editorfixes",
-        "client_hooks": {
-            "aceEditorCSS": "ep_codepad/static/js/ace:aceEditorCSS"
-        }
     }, {
         "name": "ep_codepad_defaults",
         "client_hooks": {
@@ -89,11 +84,12 @@
             "clientVars": "ep_codepad/themes_index:clientVars"
         },
         "client_hooks": {
+            "aceEditEvent": "ep_codepad/static/js/syntax:aceEditEvent",
             "aceKeyEvent": "ep_codepad/static/js/syntax:aceKeyEvent",
             "aceEditorCSS": "ep_codepad/static/js/aceTheme.js",
             "acePostWriteDomLineHTML": "ep_codepad/static/js/syntax:acePostWriteDomLineHTML",
             "aceInitInnerdocbodyHead": "ep_codepad/static/js/syntax:aceInitInnerdocbodyHead",
             "disableAuthorColorsForThisLine": "ep_codepad/static/js/syntax:disableAuthorColorsForThisLine"
         }
     }]
-}
+}

extensions.js

@@ -53,7 +53,7 @@ var findExtension = function(ext) {
     // Ruby
     if (['ruby', 'rails', 'ror', 'rb'].indexOf(ext) > -1) return 'ruby';
     // Xml
-    if (['xml', 'xhtml', 'xslt', 'html', 'htm', 'plist', 'ejs'].indexOf(ext) > -1) return 'xml';
+    if (['xml', 'xhtml', 'xslt', 'html', 'htm', 'plist', 'ejs', 'rss', 'atom', 'xsl'].indexOf(ext) > -1) return 'xml';
 
     // plain text
     if (['txt', 'text', 'md', 'htaccess', 'log', 'err', 'nfo', 'bak', "coffee", "npmignore", "gitignore", "yml"].indexOf(ext) > -1) return 'plain';
@@ -76,4 +76,4 @@ exports.getBrush = function(filename) {
     var i = filename.lastIndexOf('.');
     var ext = (i < 0) ? 'plain' : filename.substr(i + 1).toLowerCase();
     return findExtension(ext);
-};
+};

handleButtonMessage.js

@@ -2,13 +2,11 @@ var crypto = require('crypto');
 var padManager = require("ep_etherpad-lite/node/db/PadManager");
 var fs = require('fs');
 
-
-
-// read base project folder from settings.json
 var settings = require('ep_etherpad-lite/node/utils/Settings');
 var authorManager = require('ep_etherpad-lite/node/db/AuthorManager');
 var sessionManager = require('ep_etherpad-lite/node/db/SessionManager');
 
+// this should be overridden in codepad conf
 var project_path = '/tmp/';
 
 if (!settings.ep_codepad) {
@@ -35,16 +33,29 @@ var getBrush = require('./extensions.js').getBrush;
 
 // code syntax checker
 var jshint = require('jshint').JSHINT;
-
+        var cb = function() {};
 var padMessageHandler = require("ep_etherpad-lite/node/handler/PadMessageHandler");
 
+                var send_ok = function(padid)
+                {
+                        var ok_msg = {
+                            type: 'COLLABROOM',
+                            data: {
+                                type: "CUSTOM",
+                                payload: {
+                                    padId: padid,
+                                    from: "codepad",
+                                    errors: null
+                                }
+                            }
+                        };
+                        padMessageHandler.handleCustomObjectMessage(ok_msg, undefined, cb);       
+                };
 
 exports.handleMessage = function(hook_name, context, callback) {
 
     if (context.message && context.message.data) {
 
-        var cb = function() {};
-
         var msg = context.message.data.type;
         console.log("MSG: " + msg);
 
@@ -58,13 +69,28 @@ exports.handleMessage = function(hook_name, context, callback) {
 
                 fs.readFile(path, function(err, data) {
                     if (err) {
+                        // notify user about the read error
                         console.log("codepad-read-error " + path);
-                    }
-
-                    var adat = data.toString();
-                    if (adat !== text) {
-                        value.setText(adat);
-                        padMessageHandler.updatePadClients(value, cb);
+                        var err_msg = {
+                            type: 'COLLABROOM',
+                            data: {
+                                type: "CUSTOM",
+                                payload: {
+                                    padId: padid,
+                                    from: "fs",
+                                    errors: err
+                                }
+                            }
+                        };
+                        padMessageHandler.handleCustomObjectMessage(err_msg, undefined, cb);
+                        callback(null);
+                    } else {
+                        var adat = data.toString();
+                        if (adat !== text) {
+                            value.setText(adat);
+                            padMessageHandler.updatePadClients(value, cb);
+                        }
+                        send_ok(padid);
                     }
                 });
             });
@@ -79,7 +105,7 @@ exports.handleMessage = function(hook_name, context, callback) {
                 var folder = '';
 
                 // since EEXISTS is an error, we skip that error
-                // TODO, use mkdirP ?
+                // there will be a message if the write failes anyway
                 mkdir_err = function(err) {};
 
                 // create subfolders
@@ -94,25 +120,21 @@ exports.handleMessage = function(hook_name, context, callback) {
                 // get the file extension/brush
                 var ext = getBrush(padid);
 
-                // the beutified text of the pad
+                // if all ok, send only one OK message.
+                var all_is_ok = true;
 
+                // the beutified or the raw text of the pad
                 // remove newline character from the end of the string.
-                var beat = value.atext.text.slice(0, -1);
-
-
+                var text = value.atext.text.slice(0, -1);
+                var beat = text;
+                    
                 // if .js file beautify
                 if (ext == 'js') {
-                    if (msg == msg_push) beat = beautify(beat, {
-                        indent_size: 4
-                    });
-
-
-                    //padMessageHandler.updatePadClients(value, cb);
-
-                    if (!jshint(beat)) {
+                    //check for missing semiciolons forst
+                    if (msg == msg_push && !jshint(text)) {
 
                         // determine if semicolons should be added at the end of line
-                        check = function(errors, line, length) {
+                        var check = function(errors, line, length) {
                             var count = 0;
                             var chpos = 0;
                             errors.forEach(function(err) {
@@ -121,18 +143,18 @@ exports.handleMessage = function(hook_name, context, callback) {
                                     if (err.line == line + 1) {
                                         count++;
                                         if (err.code == 'W033') chpos = err.character;
+                                        // TODO ... maybe it should abort the whole process if there was another error
                                     }
                                 }
                             });
 
-
-                            if (count == 1 && chpos !== 0 && length < chpos) return true;
+                            if (count === 1 && chpos !== 0 && length < chpos) return true;
                             else return false;
                         };
 
 
                         // Add the semicolons
-                        var lines = beat.split('\n');
+                        var lines = text.split('\n');
                         beat = '';
 
                         for (var i = 0; i < lines.length; i++) {
@@ -142,9 +164,16 @@ exports.handleMessage = function(hook_name, context, callback) {
                             else beat += lines[i] + '\n';
                         }
                     }
+                                        
+                    // if push and jshint said ok, then beautify text for real
+                    if (msg == msg_push && jshint(text)) beat = beautify(text, {
+                        indent_size: 4
+                    });
+                    
                     // re-check the new beautified code
                     if (!jshint(beat)) {
 
+                        // still has errors, we put them to the console log on the server
                         jshint.errors.forEach(function(err) {
                             if (err) {
                                 console.info(" ! " + padid + ":" + err.line + ":" + err.character + " " + err.reason + "|" + err.evidence);
@@ -153,6 +182,7 @@ exports.handleMessage = function(hook_name, context, callback) {
                             }
                         });
 
+                        all_is_ok = false;
                         var err_msg = {
                             type: 'COLLABROOM',
                             data: {
@@ -166,46 +196,33 @@ exports.handleMessage = function(hook_name, context, callback) {
                         };
                         padMessageHandler.handleCustomObjectMessage(err_msg, undefined, cb);
 
-                    } else {
-                        var ok_msg = {
-                            type: 'COLLABROOM',
-                            data: {
-                                type: "CUSTOM",
-                                payload: {
-                                    padId: padid,
-                                    from: "jshint",
-                                    errors: null
-                                }
-                            }
-                        };
-                        padMessageHandler.handleCustomObjectMessage(ok_msg, undefined, cb);
-                    }
-
-                    if (msg == msg_push) value.setText(beat);
-                    padMessageHandler.updatePadClients(value, cb);
+                    } 
                 }
 
                 // if .css file beautify
                 if (ext == 'css' && msg == msg_push) {
-                    beat = beautify_css(beat, {
+                    beat = beautify_css(text, {
                         indent_size: 4
                     });
-                    value.setText(beat);
-                    padMessageHandler.updatePadClients(value, cb);
                 }
 
                 // if .html file beautify
                 if (ext == 'xml' && msg == msg_push) {
-                    beat = beautify_html(beat, {
+                    beat = beautify_html(text, {
                         indent_size: 4
                     });
+                }
+                
+                // text and beat may be different, depending on jsHint and the beutifier
+                if (text !== beat) {
                     value.setText(beat);
                     padMessageHandler.updatePadClients(value, cb);
                 }
 
                 // WRITE to the FILE
                 fs.writeFile(path, beat, function(err) {
                     if (err) {
+                        all_is_ok = false;
                         console.log("Failed to write text to " + path);
                         var err_msg = {
                             type: 'COLLABROOM',
@@ -221,42 +238,31 @@ exports.handleMessage = function(hook_name, context, callback) {
                         padMessageHandler.handleCustomObjectMessage(err_msg, undefined, cb);
                     } else {
                         console.log("Wrote pad contents to " + path);
-                        var ok_msg = {
-                            type: 'COLLABROOM',
-                            data: {
-                                type: "CUSTOM",
-                                payload: {
-                                    padId: padid,
-                                    from: "fs",
-                                    errors: null
-                                }
-                            }
-                        };
-                        padMessageHandler.handleCustomObjectMessage(ok_msg, undefined, cb);
+                        
                         // if push_action is defined in settings.json, it will run here, use it for git/svn/hg ... or whatever.
                         if (settings.ep_codepad && msg == msg_push) {
                             if (settings.ep_codepad.push_action) {
                                 exec(settings.ep_codepad.push_action, function(exec_err, stdout, stderr) {
+                                    if (stdout) console.log("[codepad] push_action stdout: " + stdout);
+                                    if (stderr) console.log("[codepad] push_action stderr: " + stderr);
                                     if (exec_err) {
-                                        console.log('codepad-push-error: ', exec_err);
+                                        console.log('[codepad] push_action !error: ', exec_err);
                                         var err_msg = {
                                             type: 'COLLABROOM',
                                             data: {
                                                 type: "CUSTOM",
                                                 payload: {
                                                     padId: padid,
-                                                    from: "fs",
+                                                    from: "exec",
                                                     errors: exec_err
                                                 }
                                             }
                                         };
                                         padMessageHandler.handleCustomObjectMessage(err_msg, undefined, cb);
-                                    }
-                                    if (stdout) console.log("codepad-push-stdout: " + stdout);
-                                    if (stderr) console.log("codepad-push-stderr: " + stderr);
+                                    } else if (all_is_ok) send_ok(padid);
                                 });
-                            }
-                        }
+                            } else if (all_is_ok) send_ok(padid);
+                        } else if (all_is_ok) send_ok(padid);
                     }
                 });
             });
@@ -278,4 +284,5 @@ exports.handleMessage = function(hook_name, context, callback) {
                     "scope": "(main)",
                     "reason": "Missing semicolon."
 
-           *****/
+           *****/
+

highlight.js

@@ -0,0 +1 @@
+Subproject commit 5b6f61ac8f05003663fc96675adfd6cd86b906c7