Merge pull request #19 from Suitcaser/master

input and output fixes

Author: nikitaeverywhere

csp/webTerminal/js/parser.js.xml

@@ -27,7 +27,7 @@ var parser = new function() {
      * @returns {string}
      */
     this.clearHTML = function(string) {
-        return string.replace("&","&amp;").replace("<","&lt;").replace("<","&gt;")
+        return string.replace("&","&amp;").replace("<","&lt;").replace(">","&gt;")
     };
 
     /**

csp/webTerminal/js/terminal.js.xml

@@ -958,11 +958,12 @@ var terminal = new function() {
          * [ @param processEscape {boolean} ]
          */
         this.write = function(text, processEscape) {
+	        
             escapeCharactersProcessing = (processEscape)?true:false;
             if (target == dom.objects.output) {
                 this.forceWrite(text);
             } else {
-                stack += text;
+                stack += text.replace('[0J','');
             }
         };
 
@@ -1001,7 +1002,7 @@ var terminal = new function() {
          */
         this.forceWrite = function(text,marking) {
 
-            if (typeof marking == "undefined") marking = false;
+			if (typeof marking == "undefined") marking = false;
             escapeCharactersProcessing = false;
 
             var div = document.createElement("div");
@@ -1018,7 +1019,7 @@ var terminal = new function() {
             var body = document.createElement("div");
             body.className = "terminal-message-body terminal-output-body";
             body.innerHTML = text;
-
+ 			
             div.appendChild(head);
             div.appendChild(body);
             target.appendChild(div);