Changeset 17884 for misc/runpugs

Timestamp:

09/17/07 17:44:19 (14 months ago)

Author:

azawawi

Message:

[runpugs] fixed html escaping problem (my @a = <foo 1 2 3>)
[runpugs] fixed prompt not being taken from server
[runpugs] fixed duplicate prompt
[runpugs] updated html/css for cross-browser compatibility

Location:

misc/runpugs/htdocs

Files:

• runpugs.css (modified) (4 diffs)
• runpugs/index.html (modified) (3 diffs)
• runpugs/runpugs.js (modified) (2 diffs)

misc/runpugs/htdocs/runpugs.css

@@ -1 +1 @@
 body {
-        font:14px arial,helvetica,clean,sans-serif;
+        font:13px arial,helvetica,clean,sans-serif;
         width:100%;
         margin-left:10%;margin-right:10%; margin-top: 0px; 
@@ -104 +104 @@
 .cc {
         font-family: 'Courier New', Monaco, Courier, monospace;
-        font-size: 14px;
+        font-size: 13px;
         color: white;
         background-color: black;
-        padding: 5px;
-        width:100%;
+        padding: 0px;
+        margin: 0px;
+        width: 100%;
         line-height:normal;
         height:24em;
         overflow: auto;
-        border: 1px solid white;
+        /*border: 1px solid white;*/
 }
 pre {
@@ -154 +155 @@
 span.cursorOn {
         font-family: 'Courier New', Monaco, Courier, monospace;
-        font-size: 14px;
+        font-size: 13px;
         display:inline;
         background: white;
@@ -170 +171 @@
 span.cursorOff {
         font-family: 'Courier New', Monaco, Courier, monospace;
-        font-size: 14px;
+        font-size: 13px;
         display:inline;
         background: black;

misc/runpugs/htdocs/runpugs/index.html

@@ -39 +39 @@
                 </div>
                 <div id='status'></div>
-                <div class='note' style='padding: 5px'>
-                    <p>This live web terminal runs the <a href="http://www.pugscode.org/">Pugs</a>
+                <div class='note' style='padding: 5px;'>
+                    This live web terminal runs the <a href="http://www.pugscode.org/">Pugs</a>
                     interpreter for <a href="http://dev.perl.org/perl6/">Perl&nbsp;6</a>.
                     This is the development version, featuring asynchronous jQuery AJAX,
-                    mod_perl and preloaded pugs sessions.</p>
+                    mod_perl and preloaded pugs sessions.
                     <h2>Instructions</h2>
-                    <p><code>runpugs</code> presents the pugs interactive shell. <code>runpugs</code>-specific commands:</p>
+                    <code>runpugs</code> presents the pugs interactive shell. <code>runpugs</code>-specific commands:
                     <dl>
                     <dt><code>help</code></dt><dd> displays the Pugs shell help (same as
@@ -58 +58 @@
                     </p>
                     <h2>Restrictions</h2>
-                    <p>Because this is a web terminal, a number of restrictions apply. 
-                    Please <a href="http://feather.perl6.nl/%7Eandara/runpugs/">read the documentation</a> for more information.</p>
-                    <p class="copyright">
-                    &copy; Copyright 2006 by Wim.Vanderbauwhede. Contact me @ gmail.com<br/>
-                    Enhanced web terminal by Ahmad.Zawawi. Contact me @ gmail.com
-                    </p>
+                    Because this is a web terminal, a number of restrictions apply. 
+                    Please <a href="http://feather.perl6.nl/%7Eandara/runpugs/">read the documentation</a> for more information.
+                    <br/>
                 </div>
             </form>
         </div>
-        <iframe src="/perl/runpugs.pl" id="scratch" name="scratch" style="visibility:hidden" 
-        width="700px" height="1px" onLoad="getreply()"></iframe>
+        <span class="copyright">&copy; Copyright 2006 by Wim.Vanderbauwhede. Contact me @ gmail.com<br/>
+            Enhanced web terminal by Ahmad.Zawawi. Contact me @ gmail.com
+        </span>
         <hr/>
         <a href="http://validator.w3.org/check?uri=referer">
@@ -74 +72 @@
                 alt="Valid XHTML 1.0!" height="31" width="88" border="0" />
         </a>        
+        <iframe src="/perl/runpugs.pl" id="scratch" name="scratch" style="visibility:hidden" 
+        width="700px" height="1px" onLoad="getreply()"></iframe>
     </body>
 </html>

misc/runpugs/htdocs/runpugs/runpugs.js

@@ -122 +122 @@
     if(keyCode == 13) {
         //enter
-        var sessCmds=document.terminal.cmd.value + "\n" + prompt + cmd;
-        var tmpCmds=sessCmds.split('pugs> ');
+        var sessCmds=document.terminal.cmd.value + cmd;
+        var tmpCmds=sessCmds.split(prompt);
         var tmpCmd=tmpCmds[tmpCmds.length-1];
         if($.trim(tmpCmd) != "") {
@@ -247 +247 @@
     sessionid=scratchpad.terminal.sessionid.value;
     document.terminal.cmd.value=reply;
-
-        cmds = reply.replace(/ /g,' ').split(/\r\n|\n|\r/g);
+    
+    if(scratchpad.terminal.prompt) {
+        //safely assign prompt...
+        var val = scratchpad.terminal.prompt.value;
+        if(val && val.length == 'pugs> '.length) {
+            prompt = val;
+        }
+    }
+    
+    //escape html from whitespace and html entities
+    //and then split lines
+        cmds = 
+        reply.replace(/&/g,'&')
+        .replace(/ /g,' ')
+        .replace(/</g,'&lt;')
+        .replace(/>/g,'&gt;')
+        .replace(/"/g,'&quot;')
+        .split(/\r\n|\n|\r/g);
     updateConsole();
     cmd = "";
     curpos=0;
-    moveCursor();
+    //moveCursor();
     showCmd();
 }