/version command add, test on Win7/Win8/UNIX (2014.1/2014.2)

intersystems-community · May 1, 2014 · ada7343 · ada7343
1 parent 0bbea67
commit ada7343
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/csp/webTerminal/js/application.js.xml b/csp/webTerminal/js/application.js.xml
@@ -6,15 +6,15 @@
  */
 var application = new function() {
 
-    var version = "0.9.9.9 beta"; // @link copy to language.js
+    var version = "1.0 beta"; // @link copy to language.js
     this.debug = false; // remove for release
-    this.debugUrlPart = "172.27.25.133:57772"; // in-debug mode
+    this.debugUrlPart = "127.0.0.1:57772"; // ip address to forward connection to
 
     this.browser = "gc";
     this.authorizationKey = "";
 
     /**
-     * How to make your own theme for this terminal application? Easier then ever!
+     * How to make your own theme for this terminal application? Just follow the next:
      *
      * 1. Add theme name to the list below;
      * 2. Make CSS theme file like theme-default.css;
@@ -31,7 +31,7 @@ var application = new function() {
         "monokai": 0
     };
 
-    this.version = function() { return version };
+    this.version = function() { return "Caché WEB Terminal v" + version };
 
     this.HELPBOX = lang.get(49);
 

diff --git a/csp/webTerminal/js/language.js.xml b/csp/webTerminal/js/language.js.xml
@@ -29,7 +29,7 @@ var lang = new function() {
             0: parser.highlightHTML("/help"),
             1: parser.highlightHTML("/tip"),
             2: parser.highlightHTML("/connect"),
-            3: "0.9.9.9 beta",
+            3: "1.0 beta", // @link copy to application.js
             4: 1,
             5: parser.highlightHTML("set test = 12"),
             6: parser.highlightHTML("write test"),

diff --git a/csp/webTerminal/js/terminal.js.xml b/csp/webTerminal/js/terminal.js.xml
@@ -367,6 +367,10 @@ var terminal = new function() {
                     false
                 );
             },
+            
+            version: function() {
+	            terminal.output.write(application.version());
+            },
 
             clear: function() {
                 dom.clearLogs();
@@ -410,10 +414,10 @@ var terminal = new function() {
 
             about: function() {
                 server.submit(terminal.serverActions.EXECUTE, 'for i=0:0.2:$zpi*2 { for u=1:1:($zsin(i)*15 + 15) { w ' +
-                    '" " } w "# " if (i=1.4) { w "CacheWebTerminal v' + application.version() + '" } elseif (i=1.6) {' +
+                    '" " } w "# " if (i=1.4) { w "' + application.version() + '" } elseif (i=1.6) {' +
                     ' w "'+lang.get(18)+' InterSystems Cache" } elseif (i=1.8) { w "by ZitRo" } elseif (i=4.4) { w "' +
                     lang.get(19) + '" } elseif (i=4.6) { w "'+lang.get(20)+': http://intersystems-ru.github.io/webterm' +
-                    'inal" } elseif (i=4.8) { w "'+lang.get(21)+'" } elseif (i=5) { w "'+lang.get(22)+'..." } w ! h 0.04}');
+                    'inal" } elseif (i=4.8) { w "'+lang.get(21)+'" } w ! h 0.04}');
             },
 
             siege: function(iterations,serverDelay) {
@@ -1676,6 +1680,7 @@ var terminal = new function() {
                 "/reset": 0,
                 "/reconnect": 0,
                 "/autocomplete": 0,
+                "/version": 0,
                 "/save": 0,
                 "/load": 0,
                 "/settings": 0,
@@ -1685,7 +1690,8 @@ var terminal = new function() {
                 "/favorite": 0,
                 "/watch": 0,
                 "/tip": 1,
-                "/echo": 0
+                "/echo": 0,
+                "/about": 0
             },
             "commands": {
                 "!autocomplete": {

diff --git a/csp/webTerminal/js/unit.js.xml b/csp/webTerminal/js/unit.js.xml
@@ -3,6 +3,8 @@
 <CSP name="WebTerminal/js/unit.js" application="/csp/sys/" default="1"><![CDATA[
 /**
  * Provides unit tests for terminal application. Use unit.run() to run unit tests.
+ *
+ * Coverage: 1%
  */
 var unit = new function() {