Skip to content

Commit 7cbf4dd

Browse files
some huge data output fix (f.e. p), internal in-string execution fix
1 parent f2e7dd9 commit 7cbf4dd

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

%WebTerminal/Engine.cls.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,7 @@ Starts clear I/O mode</Description>
656656
<Description>
657657
Ends clear I/O mode</Description>
658658
<Implementation><![CDATA[
659+
write *-3
659660
do ##class(%Device).ReDirectIO($$$NO)
660661
do ..SendData("exit",..ConstClientExitClearIO)
661662
]]></Implementation>

csp/webTerminal/js/application.js.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
var application = new function() {
88
9-
var version = "0.9.6.9 beta";
9+
var version = "0.9.7 beta";
1010
this.debug = false; // remove for release
1111
1212
this.browser = "gc";

csp/webTerminal/js/terminal.js.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var terminal = new function() {
7171
READ_STRING: String.fromCharCode(6), // reads string - removes namespace like in common terminal
7272
READ_CHARACTER: String.fromCharCode(7), // reads character - removes namespace like in common terminal
7373
AUTHORIZATION_STATUS: String.fromCharCode(8), // alerts client about authorization success. Holds 1/0
74-
WATCH: String.fromCharCode(9)
74+
WATCH: String.fromCharCode(9) // start watching
7575
};
7676
7777
/**
@@ -400,7 +400,7 @@ var terminal = new function() {
400400
"about": function() {
401401
server.submit(terminal.serverActions.EXECUTE, 'for i=0:0.2:$zpi*2 { for u=1:1:($zsin(i)*15 + 15) { w ' +
402402
'" " } w "# " if (i=1.4) { w "CacheWebTerminal v' + application.version() + '" } elseif (i=1.6) {' +
403-
' w "for InterSystems Cache" } elseif (i=1.8) { w "by ZitRo" } elseif (i=4.4) { w "In developing ' +
403+
' w "for InterSystems Cache" } elseif (i=1.8) { w "by ZitRo" } elseif (i=4.4) { w "In development ' +
404404
'since Summer, 2013" } elseif (i=4.6) { w "Project page: http://intersystems-ru.github.io/webterm' +
405405
'inal" } elseif (i=4.8) { w "Use at your own risk!" } elseif (i=5) { w "But believe me, all right' +
406406
' :)" } w ! h 0.04}');
@@ -1195,7 +1195,7 @@ var terminal = new function() {
11951195
var arr = query.match(/("[^"]*")|[^\s"]+/g);
11961196
if (!arr) return false;
11971197
for (var i = 0; i < arr.length; i++) {
1198-
if (arr[i].match(/\/[a-z]+/)) {
1198+
if (/^\/[a-z]+$/.test(arr[i])) {
11991199
var command = arr[i].substr(1);
12001200
arr.splice(0, i + 1);
12011201
var fish = query.substring(0,query.indexOf("/" + command) - 1); // mm, fish

0 commit comments

Comments
 (0)