Skip to content

P
proview
Commit 5d22cf54 authored by Christoffer Ackelman's avatar Christoffer Ackelman
Browse files
Options

Autoformat on JavaScript files.

parent a9d5535e
Show whitespace changes
Inline Side-by-side
Showing with 26606 additions and 27294 deletions
java/jsw/flow/src/flow.js
View file @ 5d22cf54
This source diff could not be displayed because it is too large. You can view the blob instead.
java/jsw/ge/src/ge.js
View file @ 5d22cf54
This source diff could not be displayed because it is too large. You can view the blob instead.
java/jsw/opwind/src/opwind.js
View file @ 5d22cf54
...@@ -372,15 +372,13 @@ function JopCrypt() { ...@@ -372,15 +372,13 @@ function JopCrypt() {
0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
]; ];
this.byteToUnsigned = function(b) this.byteToUnsigned = function (b) {
{
var value = Math.floor(b); var value = Math.floor(b);
return(value >= 0 ? value : value + 256); return (value >= 0 ? value : value + 256);
} }
this.fourBytesToInt = function(b, offset) this.fourBytesToInt = function (b, offset) {
{
var value; var value;
value = this.byteToUnsigned(b[offset++]); value = this.byteToUnsigned(b[offset++]);
...@@ -391,16 +389,14 @@ function JopCrypt() { ...@@ -391,16 +389,14 @@ function JopCrypt() {
return value; return value;
} }
this.intToFourBytes = function(iValue, b, offset) this.intToFourBytes = function (iValue, b, offset) {
{
b[offset++] = ((iValue) & 0xff); b[offset++] = ((iValue) & 0xff);
b[offset++] = ((iValue >>> 8 ) & 0xff); b[offset++] = ((iValue >>> 8) & 0xff);
b[offset++] = ((iValue >>> 16) & 0xff); b[offset++] = ((iValue >>> 16) & 0xff);
b[offset++] = ((iValue >>> 24) & 0xff); b[offset++] = ((iValue >>> 24) & 0xff);
} }
this.PERM_OP = function(a, b, n, m, results) this.PERM_OP = function (a, b, n, m, results) {
{
var t; var t;
t = ((a >>> n) ^ b) & m; t = ((a >>> n) ^ b) & m;
...@@ -411,17 +407,16 @@ function JopCrypt() { ...@@ -411,17 +407,16 @@ function JopCrypt() {
results[1] = b; results[1] = b;
} }
this.HPERM_OP = function(a, n, m) this.HPERM_OP = function (a, n, m) {
{
var t; var t;
t = ((a << (16 - n)) ^ a) & m; t = ((a << (16 - n)) ^ a) & m;
a = a ^ t ^ (t >>> (16 - n)); a = a ^ t ^ (t >>> (16 - n));
return(a); return (a);
} }
this.des_set_key = function(key) { this.des_set_key = function (key) {
var schedule = new Array(this.ITERATIONS * 2); var schedule = new Array(this.ITERATIONS * 2);
var c = this.fourBytesToInt(key, 0); var c = this.fourBytesToInt(key, 0);
...@@ -451,13 +446,11 @@ function JopCrypt() { ...@@ -451,13 +446,11 @@ function JopCrypt() {
var s, t; var s, t;
var j = 0; var j = 0;
for(var i = 0; i < this.ITERATIONS; i++) { for (var i = 0; i < this.ITERATIONS; i++) {
if(this.shifts2[i]) { if (this.shifts2[i]) {
c = (c >>> 2) | (c << 26); c = (c >>> 2) | (c << 26);
d = (d >>> 2) | (d << 26); d = (d >>> 2) | (d << 26);
} } else {
else
{
c = (c >>> 1) | (c << 27); c = (c >>> 1) | (c << 27);
d = (d >>> 1) | (d << 27); d = (d >>> 1) | (d << 27);
} }
...@@ -465,16 +458,16 @@ function JopCrypt() { ...@@ -465,16 +458,16 @@ function JopCrypt() {
c &= 0x0fffffff; c &= 0x0fffffff;
d &= 0x0fffffff; d &= 0x0fffffff;
s = this.skb[0][ (c ) & 0x3f ]| s = this.skb[0][(c) & 0x3f] |
this.skb[1][((c >>> 6) & 0x03) | ((c >>> 7) & 0x3c)]| this.skb[1][((c >>> 6) & 0x03) | ((c >>> 7) & 0x3c)] |
this.skb[2][((c >>> 13) & 0x0f) | ((c >>> 14) & 0x30)]| this.skb[2][((c >>> 13) & 0x0f) | ((c >>> 14) & 0x30)] |
this.skb[3][((c >>> 20) & 0x01) | ((c >>> 21) & 0x06) | this.skb[3][((c >>> 20) & 0x01) | ((c >>> 21) & 0x06) |
((c >>> 22) & 0x38)]; ((c >>> 22) & 0x38)];
t = this.skb[4][ (d ) & 0x3f ]| t = this.skb[4][(d) & 0x3f] |
this.skb[5][((d >>> 7) & 0x03) | ((d >>> 8) & 0x3c)]| this.skb[5][((d >>> 7) & 0x03) | ((d >>> 8) & 0x3c)] |
this.skb[6][ (d >>>15) & 0x3f ]| this.skb[6][(d >>> 15) & 0x3f] |
this.skb[7][((d >>>21) & 0x0f) | ((d >>> 22) & 0x30)]; this.skb[7][((d >>> 21) & 0x0f) | ((d >>> 22) & 0x30)];
schedule[j++] = ((t << 16) | (s & 0x0000ffff)) & 0xffffffff; schedule[j++] = ((t << 16) | (s & 0x0000ffff)) & 0xffffffff;
s = ((s >>> 16) | (t & 0xffff0000)); s = ((s >>> 16) | (t & 0xffff0000));
...@@ -485,7 +478,7 @@ function JopCrypt() { ...@@ -485,7 +478,7 @@ function JopCrypt() {
return schedule; return schedule;
} }
this.D_ENCRYPT = function( L, R, S, E0, E1, s) { this.D_ENCRYPT = function (L, R, S, E0, E1, s) {
var t, u, v; var t, u, v;
v = R ^ (R >>> 16); v = R ^ (R >>> 16);
...@@ -495,11 +488,11 @@ function JopCrypt() { ...@@ -495,11 +488,11 @@ function JopCrypt() {
t = (v ^ (v << 16)) ^ R ^ s[S + 1]; t = (v ^ (v << 16)) ^ R ^ s[S + 1];
t = (t >>> 4) | (t << 28); t = (t >>> 4) | (t << 28);
L ^= this.SPtrans[1][(t ) & 0x3f] | L ^= this.SPtrans[1][(t) & 0x3f] |
this.SPtrans[3][(t >>> 8) & 0x3f] | this.SPtrans[3][(t >>> 8) & 0x3f] |
this.SPtrans[5][(t >>> 16) & 0x3f] | this.SPtrans[5][(t >>> 16) & 0x3f] |
this.SPtrans[7][(t >>> 24) & 0x3f] | this.SPtrans[7][(t >>> 24) & 0x3f] |
this.SPtrans[0][(u ) & 0x3f] | this.SPtrans[0][(u) & 0x3f] |
this.SPtrans[2][(u >>> 8) & 0x3f] | this.SPtrans[2][(u >>> 8) & 0x3f] |
this.SPtrans[4][(u >>> 16) & 0x3f] | this.SPtrans[4][(u >>> 16) & 0x3f] |
this.SPtrans[6][(u >>> 24) & 0x3f]; this.SPtrans[6][(u >>> 24) & 0x3f];
...@@ -507,15 +500,13 @@ function JopCrypt() { ...@@ -507,15 +500,13 @@ function JopCrypt() {
return L; return L;
} }
this.body = function(schedule, Eswap0, Eswap1) { this.body = function (schedule, Eswap0, Eswap1) {
var left = 0; var left = 0;
var right = 0; var right = 0;
var t = 0; var t = 0;
for(var j = 0; j < 25; j ++) for (var j = 0; j < 25; j++) {
{ for (var i = 0; i < this.ITERATIONS * 2; i += 4) {
for(var i = 0; i < this.ITERATIONS * 2; i += 4)
{
left = this.D_ENCRYPT(left, right, i, Eswap0, Eswap1, schedule); left = this.D_ENCRYPT(left, right, i, Eswap0, Eswap1, schedule);
right = this.D_ENCRYPT(right, left, i + 2, Eswap0, Eswap1, schedule); right = this.D_ENCRYPT(right, left, i + 2, Eswap0, Eswap1, schedule);
} }
...@@ -553,30 +544,29 @@ function JopCrypt() { ...@@ -553,30 +544,29 @@ function JopCrypt() {
out[0] = left; out[1] = right; out[0] = left; out[1] = right;
return(out); return (out);
} }
this.crypt = function(salt, original) { this.crypt = function (salt, original) {
while(salt.length < 2) while (salt.length < 2)
salt += "A"; salt += "A";
var buffer; var buffer;
var charZero = salt.charAt(0)+''; var charZero = salt.charAt(0) + '';
var charOne = salt.charAt(1)+''; var charOne = salt.charAt(1) + '';
var ccZ = charZero.charCodeAt(0); var ccZ = charZero.charCodeAt(0);
var ccO = charOne.charCodeAt(0); var ccO = charOne.charCodeAt(0);
console.log( "charZero", charZero, "charOne", charOne); console.log("charZero", charZero, "charOne", charOne);
buffer = charZero + charOne + " "; buffer = charZero + charOne + " ";
console.log( "buffer \"" + buffer + "\""); console.log("buffer \"" + buffer + "\"");
var Eswap0 = this.con_salt[ccZ]; var Eswap0 = this.con_salt[ccZ];
var Eswap1 = this.con_salt[ccO] << 4; var Eswap1 = this.con_salt[ccO] << 4;
var key = new Array(0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0); var key = new Array(0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0);
for(var i = 0; i < key.length && i < original.length; i ++) for (var i = 0; i < key.length && i < original.length; i++) {
{
var iChar = original.charCodeAt(i); var iChar = original.charCodeAt(i);
key[i] = iChar << 1; key[i] = iChar << 1;
...@@ -591,24 +581,21 @@ function JopCrypt() { ...@@ -591,24 +581,21 @@ function JopCrypt() {
this.intToFourBytes(out[1], b, 4); this.intToFourBytes(out[1], b, 4);
b[8] = 0; b[8] = 0;
for(var i = 2, y = 0, u = 0x80; i < 13; i ++) for (var i = 2, y = 0, u = 0x80; i < 13; i++) {
{ for (var j = 0, c = 0; j < 6; j++) {
for(var j = 0, c = 0; j < 6; j ++)
{
c <<= 1; c <<= 1;
if((b[y] & u) != 0) if ((b[y] & u) != 0)
c |= 1; c |= 1;
u >>>= 1; u >>>= 1;
if(u == 0) if (u == 0) {
{
y++; y++;
u = 0x80; u = 0x80;
} }
buffer = buffer.substring(0,i) + String.fromCharCode(this.cov_2char[c]) + buffer = buffer.substring(0, i) + String.fromCharCode(this.cov_2char[c]) +
buffer.substring(i+1,buffer.length); buffer.substring(i + 1, buffer.length);
} }
} }
return buffer; return buffer;
...@@ -618,90 +605,89 @@ function JopCrypt() { ...@@ -618,90 +605,89 @@ function JopCrypt() {
/** Pwr start **/ /** Pwr start **/
function PwrtStatus( sts) function PwrtStatus(sts) {
{
this.sts = sts; this.sts = sts;
this.evenSts = function() { return (sts % 2 === 0);}; this.evenSts = function () { return (sts % 2 === 0); };
this.oddSts = function() { return (sts % 2 == 1);}; this.oddSts = function () { return (sts % 2 == 1); };
this.getSts = function() { return sts;}; this.getSts = function () { return sts; };
} }
var Pwr = { var Pwr = {
eType_Boolean : 98305, eType_Boolean: 98305,
eType_Float32 : 98306, eType_Float32: 98306,
eType_Float64 : 98307, eType_Float64: 98307,
eType_Char : 98308, eType_Char: 98308,
eType_Int8 : 98309, eType_Int8: 98309,
eType_Int16 : 98310, eType_Int16: 98310,
eType_Int32 : 98311, eType_Int32: 98311,
eType_UInt8 : 98312, eType_UInt8: 98312,
eType_UInt16 : 98313, eType_UInt16: 98313,
eType_UInt32 : 98314, eType_UInt32: 98314,
eType_Objid : 98315, eType_Objid: 98315,
eType_Buffer : 98316, eType_Buffer: 98316,
eType_String : 98317, eType_String: 98317,
eType_Enum : 98318, eType_Enum: 98318,
eType_Struct : 98319, eType_Struct: 98319,
eType_Mask : 98320, eType_Mask: 98320,
eType_Array : 98321, eType_Array: 98321,
eType_Time : 98322, eType_Time: 98322,
eType_Text : 98323, eType_Text: 98323,
eType_AttrRef : 98324, eType_AttrRef: 98324,
eType_UInt64 : 98325, eType_UInt64: 98325,
eType_Int64 : 98326, eType_Int64: 98326,
eType_ClassId : 98327, eType_ClassId: 98327,
eType_TypeId : 98328, eType_TypeId: 98328,
eType_VolumeId : 98329, eType_VolumeId: 98329,
eType_ObjectIx : 98330, eType_ObjectIx: 98330,
eType_RefId : 98331, eType_RefId: 98331,
eType_DeltaTime : 98332, eType_DeltaTime: 98332,
eType_Status : 98333, eType_Status: 98333,
eType_NetStatus : 98334, eType_NetStatus: 98334,
eType_CastId : 98335, eType_CastId: 98335,
eType_ProString : 98336, eType_ProString: 98336,
eType_DisableAttr : 98337, eType_DisableAttr: 98337,
eType_DataRef : 98338, eType_DataRef: 98338,
mPrv_RtRead : 1 << 0, mPrv_RtRead: 1 << 0,
mPrv_RtWrite : 1 << 1, mPrv_RtWrite: 1 << 1,
mPrv_System : 1 << 2, mPrv_System: 1 << 2,
mPrv_Maintenance : 1 << 3, mPrv_Maintenance: 1 << 3,
mPrv_Process : 1 << 4, mPrv_Process: 1 << 4,
mPrv_Instrument : 1 << 5, mPrv_Instrument: 1 << 5,
mPrv_Operator1 : 1 << 6, mPrv_Operator1: 1 << 6,
mPrv_Operator2 : 1 << 7, mPrv_Operator2: 1 << 7,
mPrv_Operator3 : 1 << 8, mPrv_Operator3: 1 << 8,
mPrv_Operator4 : 1 << 9, mPrv_Operator4: 1 << 9,
mPrv_Operator5 : 1 << 10, mPrv_Operator5: 1 << 10,
mPrv_Operator6 : 1 << 11, mPrv_Operator6: 1 << 11,
mPrv_Operator7 : 1 << 12, mPrv_Operator7: 1 << 12,
mPrv_Operator8 : 1 << 13, mPrv_Operator8: 1 << 13,
mPrv_Operator9 : 1 << 14, mPrv_Operator9: 1 << 14,
mPrv_Operator10 : 1 << 15, mPrv_Operator10: 1 << 15,
mPrv_RtEventsAck : 1 << 18, mPrv_RtEventsAck: 1 << 18,
mPrv_RtPlc : 1 << 19, mPrv_RtPlc: 1 << 19,
mPrv_RtNavigator : 1 << 20, mPrv_RtNavigator: 1 << 20,
mPrv_DevRead : 1 << 21, mPrv_DevRead: 1 << 21,
mPrv_DevPlc : 1 << 22, mPrv_DevPlc: 1 << 22,
mPrv_DevConfig : 1 << 23, mPrv_DevConfig: 1 << 23,
mPrv_DevClass : 1 << 24, mPrv_DevClass: 1 << 24,
mPrv_RtEventsBlock : 1 << 25, mPrv_RtEventsBlock: 1 << 25,
mPrv_Administrator : 1 << 26, mPrv_Administrator: 1 << 26,
mPrv_SevRead : 1 << 27, mPrv_SevRead: 1 << 27,
mPrv_SevAdmin : 1 << 28, mPrv_SevAdmin: 1 << 28,
mAccess_RtRead : 1 << 0, mAccess_RtRead: 1 << 0,
mAccess_RtWrite : 1 << 1, mAccess_RtWrite: 1 << 1,
mAccess_System : 1 << 2, mAccess_System: 1 << 2,
mAccess_Maintenance : 1 << 3, mAccess_Maintenance: 1 << 3,
mAccess_Process : 1 << 4, mAccess_Process: 1 << 4,
mAccess_Instrument : 1 << 5, mAccess_Instrument: 1 << 5,
mAccess_RtEventsBlock : 1 << 25, mAccess_RtEventsBlock: 1 << 25,
mAccess_RtEventsAck : 1 << 18, mAccess_RtEventsAck: 1 << 18,
mAccess_RtPlc : 1 << 19, mAccess_RtPlc: 1 << 19,
mAccess_RtNavigator : 1 << 20, mAccess_RtNavigator: 1 << 20,
mAccess_AllRt : 1 << 2 | mAccess_AllRt: 1 << 2 |
1 << 3 | 1 << 3 |
1 << 4 | 1 << 4 |
1 << 5 | 1 << 5 |
...@@ -721,7 +707,7 @@ var Pwr = { ...@@ -721,7 +707,7 @@ var Pwr = {
1 << 13 | 1 << 13 |
1 << 14 | 1 << 14 |
1 << 15, 1 << 15,
mAccess_AllOperators : 1 << 6 | mAccess_AllOperators: 1 << 6 |
1 << 7 | 1 << 7 |
1 << 8 | 1 << 8 |
1 << 9 | 1 << 9 |
...@@ -731,76 +717,74 @@ var Pwr = { ...@@ -731,76 +717,74 @@ var Pwr = {
1 << 13 | 1 << 13 |
1 << 14 | 1 << 14 |
1 << 15, 1 << 15,
mAccess_AllPwr : ~0, mAccess_AllPwr: ~0,
mAdef_pointer : 1, mAdef_pointer: 1,
mAdef_array : 2, mAdef_array: 2,
mAdef_backup : 4, mAdef_backup: 4,
mAdef_changelog : 8, mAdef_changelog: 8,
mAdef_state : 16, mAdef_state: 16,
mAdef_const : 32, mAdef_const: 32,
mAdef_rtvirtual : 64, mAdef_rtvirtual: 64,
mAdef_devbodyref : 128, mAdef_devbodyref: 128,
mAdef_dynamic : 256, mAdef_dynamic: 256,
mAdef_publicwrite : 512, mAdef_publicwrite: 512,
mAdef_noedit : 1024, mAdef_noedit: 1024,
mAdef_invisible : 2048, mAdef_invisible: 2048,
mAdef_refdirect : 4096, mAdef_refdirect: 4096,
mAdef_noinvert : 8192, mAdef_noinvert: 8192,
mAdef_noremove : 16384, mAdef_noremove: 16384,
mAdef_rtdbref : 32768, mAdef_rtdbref: 32768,
mAdef_private : 65536, mAdef_private: 65536,
mAdef_class : 131072, mAdef_class: 131072,
mAdef_superclass : 262144, mAdef_superclass: 262144,
mAdef_buffer : 524288, mAdef_buffer: 524288,
mAdef_nowbl : 1048576, mAdef_nowbl: 1048576,
mAdef_alwayswbl : 2097152, mAdef_alwayswbl: 2097152,
mAdef_disableattr : 4194304, mAdef_disableattr: 4194304,
mAdef_rthide : 8388608 mAdef_rthide: 8388608
}; };
var Pwrb = { var Pwrb = {
mXttMethodsFlagsMask_IsConfigured : 1, mXttMethodsFlagsMask_IsConfigured: 1,
mXttOpMethodsMask_OpenGraph : 1, mXttOpMethodsMask_OpenGraph: 1,
mXttOpMethodsMask_OpenObjectGraph : 2, mXttOpMethodsMask_OpenObjectGraph: 2,
mXttOpMethodsMask_OpenTrend : 4, mXttOpMethodsMask_OpenTrend: 4,
mXttOpMethodsMask_OpenHistory : 8, mXttOpMethodsMask_OpenHistory: 8,
mXttOpMethodsMask_OpenFast : 16, mXttOpMethodsMask_OpenFast: 16,
mXttOpMethodsMask_Camera : 32, mXttOpMethodsMask_Camera: 32,
mXttOpMethodsMask_HistEvent : 64, mXttOpMethodsMask_HistEvent: 64,
mXttOpMethodsMask_BlockEvents : 128, mXttOpMethodsMask_BlockEvents: 128,
mXttOpMethodsMask_Help : 256, mXttOpMethodsMask_Help: 256,
mXttOpMethodsMask_Photo : 512, mXttOpMethodsMask_Photo: 512,
mXttOpMethodsMask_Note : 1024, mXttOpMethodsMask_Note: 1024,
mXttOpMethodsMask_ParentObjectGraph : 2048, mXttOpMethodsMask_ParentObjectGraph: 2048,
mXttMntMethodsMask_OpenObject : 1, mXttMntMethodsMask_OpenObject: 1,
mXttMntMethodsMask_OpenTrace : 2, mXttMntMethodsMask_OpenTrace: 2,
mXttMntMethodsMask_RtNavigator : 4, mXttMntMethodsMask_RtNavigator: 4,
mXttMntMethodsMask_OpenCrossref : 8, mXttMntMethodsMask_OpenCrossref: 8,
mXttMntMethodsMask_HelpClass : 16, mXttMntMethodsMask_HelpClass: 16,
mXttMntMethodsMask_DataSheet : 32, mXttMntMethodsMask_DataSheet: 32,
mXttMntMethodsMask_CircuitDiagram : 64, mXttMntMethodsMask_CircuitDiagram: 64,
mXttMntMethodsMask_Simulate : 1 << 31 mXttMntMethodsMask_Simulate: 1 << 31
}; };
function PwrtObjid( vid, oix) { function PwrtObjid(vid, oix) {
this.oix = oix; this.oix = oix;
this.vid = vid; this.vid = vid;
} }
function CdhrNumber( value, sts) function CdhrNumber(value, sts) {
{
this.value = value; this.value = value;
this.sts = sts; this.sts = sts;
this.evenSts = function() { return (sts % 2 === 0);}; this.evenSts = function () { return (sts % 2 === 0); };
this.oddSts = function() { return (sts % 2 == 1);}; this.oddSts = function () { return (sts % 2 == 1); };
this.getSts = function() { return sts;}; this.getSts = function () { return sts; };
} }
/** Start Gdh **/ /** Start Gdh **/
function Sub() { function Sub() {
this.sts; this.sts;
...@@ -879,82 +863,82 @@ function GlowTableInfo() { ...@@ -879,82 +863,82 @@ function GlowTableInfo() {
this.column_size = new Array(Glow.TABLE_MAX_COL); this.column_size = new Array(Glow.TABLE_MAX_COL);
} }
function PendingData( func_cb, data) { function PendingData(func_cb, data) {
this.func_cb = func_cb; this.func_cb = func_cb;
this.data = data; this.data = data;
} }
var GdhOp = { var GdhOp = {
GET_OP_SELF : 1, GET_OP_SELF: 1,
GET_OP_METHOD_PLC : 2 GET_OP_METHOD_PLC: 2
}; };
function Gdh() { function Gdh() {
var Msg = { var Msg = {
SET_OBJECT_INFO_BOOLEAN : 1, SET_OBJECT_INFO_BOOLEAN: 1,
SET_OBJECT_INFO_FLOAT : 2, SET_OBJECT_INFO_FLOAT: 2,
SET_OBJECT_INFO_INT : 3, SET_OBJECT_INFO_INT: 3,
SET_OBJECT_INFO_STRING : 4, SET_OBJECT_INFO_STRING: 4,
GET_OBJECT_INFO_BOOLEAN : 5, GET_OBJECT_INFO_BOOLEAN: 5,
GET_OBJECT_INFO_FLOAT : 6, GET_OBJECT_INFO_FLOAT: 6,
GET_OBJECT_INFO_INT : 7, GET_OBJECT_INFO_INT: 7,
GET_OBJECT_INFO_STRING : 8, GET_OBJECT_INFO_STRING: 8,
TOGGLE_OBJECT_INFO : 9, TOGGLE_OBJECT_INFO: 9,
REF_OBJECT_INFO : 10, REF_OBJECT_INFO: 10,
GET_OBJECT_REF_INFO_BOOLEAN : 11, GET_OBJECT_REF_INFO_BOOLEAN: 11,
GET_OBJECT_REF_INFO_FLOAT : 12, GET_OBJECT_REF_INFO_FLOAT: 12,
GET_OBJECT_REF_INFO_INT : 13, GET_OBJECT_REF_INFO_INT: 13,
GET_OBJECT_REF_INFO_STRING : 14, GET_OBJECT_REF_INFO_STRING: 14,
UNREF_OBJECT_INFO : 15, UNREF_OBJECT_INFO: 15,
NAME_TO_OBJID : 16, NAME_TO_OBJID: 16,
OBJID_TO_NAME : 17, OBJID_TO_NAME: 17,
GET_ROOT_LIST : 18, GET_ROOT_LIST: 18,
GET_NEXT_OBJECT : 19, GET_NEXT_OBJECT: 19,
GET_CHILD : 20, GET_CHILD: 20,
GET_NEXT_SIBLING : 21, GET_NEXT_SIBLING: 21,
GET_OBJECT_CLASS : 22, GET_OBJECT_CLASS: 22,
GET_CLASS_LIST : 23, GET_CLASS_LIST: 23,
CLASS_ID_TO_OBJID : 24, CLASS_ID_TO_OBJID: 24,
GET_OBJECT_REF_INFO_ALL : 25, GET_OBJECT_REF_INFO_ALL: 25,
REF_OBJECT_INFO_LIST : 26, REF_OBJECT_INFO_LIST: 26,
POLL : 27, POLL: 27,
STATISTICS : 28, STATISTICS: 28,
CHECK_USER : 29, CHECK_USER: 29,
GET_NODE_OBJECT : 30, GET_NODE_OBJECT: 30,
LOG_STRING : 31, LOG_STRING: 31,
UNREF_OBJECT_INFO_ALL : 32, UNREF_OBJECT_INFO_ALL: 32,
CREATE_INSTANCE_FILE : 33, CREATE_INSTANCE_FILE: 33,
GET_ATTRIBUTE_CHAR : 34, GET_ATTRIBUTE_CHAR: 34,
GET_CLASS_ATTRIBUTE : 35, GET_CLASS_ATTRIBUTE: 35,
GET_ALL_CLASS_ATTRIBUTES : 36, GET_ALL_CLASS_ATTRIBUTES: 36,
GET_ALL_SIBLINGS : 37, GET_ALL_SIBLINGS: 37,
GET_ALL_XTT_SIBLINGS : 38, GET_ALL_XTT_SIBLINGS: 38,
GET_ALL_XTT_CHILDREN : 39, GET_ALL_XTT_CHILDREN: 39,
REF_OBJECT_INFO_VECTOR : 40, REF_OBJECT_INFO_VECTOR: 40,
GET_SUBSCRIPTIONS : 41, GET_SUBSCRIPTIONS: 41,
CRR_SIGNAL : 42, CRR_SIGNAL: 42,
CRR_OBJECT : 43, CRR_OBJECT: 43,
GET_PARENT : 44, GET_PARENT: 44,
GET_OBJECT_INFO_OBJID : 45, GET_OBJECT_INFO_OBJID: 45,
GET_OBJECT_REF_INFO_BOOLEAN_ARRAY : 46, GET_OBJECT_REF_INFO_BOOLEAN_ARRAY: 46,
GET_OBJECT_REF_INFO_FLOAT_ARRAY : 47, GET_OBJECT_REF_INFO_FLOAT_ARRAY: 47,
GET_OBJECT_REF_INFO_INT_ARRAY : 48, GET_OBJECT_REF_INFO_INT_ARRAY: 48,
GET_OBJECT_REF_INFO_STRING_ARRAY : 49, GET_OBJECT_REF_INFO_STRING_ARRAY: 49,
GET_MSG : 50, GET_MSG: 50,
GET_MSG_TEXT : 51, GET_MSG_TEXT: 51,
NAME_TO_ATTRREF : 52, NAME_TO_ATTRREF: 52,
ATTRREF_TO_NAME : 53, ATTRREF_TO_NAME: 53,
GET_ATTRREF_TID : 54, GET_ATTRREF_TID: 54,
GET_SUPER_CLASS : 55, GET_SUPER_CLASS: 55,
GET_ALL_CLASS_ATTRIBUTES_STRING : 56, GET_ALL_CLASS_ATTRIBUTES_STRING: 56,
GET_OBJECT_INFO_FLOAT_ARRAY : 57, GET_OBJECT_INFO_FLOAT_ARRAY: 57,
GET_OBJECT_INFO_INT_ARRAY : 58, GET_OBJECT_INFO_INT_ARRAY: 58,
GET_CIRCBUFF_INFO : 59, GET_CIRCBUFF_INFO: 59,
UPDATE_CIRCBUFF_INFO : 60, UPDATE_CIRCBUFF_INFO: 60,
GET_ATTRIBUTE_FLAGS : 61, GET_ATTRIBUTE_FLAGS: 61,
CLASSNAME_TO_ID : 62, CLASSNAME_TO_ID: 62,
GET_OBJECT : 63, GET_OBJECT: 63,
GET_OPWIND_MENU : 64 GET_OPWIND_MENU: 64
}; };
this.debug = false; this.debug = false;
...@@ -969,142 +953,140 @@ function Gdh() { ...@@ -969,142 +953,140 @@ function Gdh() {
this.subscriptionCount = 1; this.subscriptionCount = 1;
this.listSend = false; this.listSend = false;
this.init = function() { this.init = function () {
if ( window.location.hostname === "") if (window.location.hostname === "")
this.ws = new WebSocket( "ws:127.0.0.1:4448"); this.ws = new WebSocket("ws:127.0.0.1:4448");
else else
this.ws = new WebSocket( "ws://" + window.location.hostname + ":4448"); this.ws = new WebSocket("ws://" + window.location.hostname + ":4448");
this.ws.binaryType = "arraybuffer"; this.ws.binaryType = "arraybuffer";
this.ws.gdh = this; this.ws.gdh = this;
this.ws.onopen = function( e) { this.ws.onopen = function (e) {
if ( this.gdh.open_cb !== null) if (this.gdh.open_cb !== null)
this.gdh.open_cb(); this.gdh.open_cb();
}; };
this.ws.onclose = function() { this.ws.onclose = function () {
if ( this.debug) console.log( "Socket closed"); if (this.debug) console.log("Socket closed");
if ( this.gdh.close_cb !== null) if (this.gdh.close_cb !== null)
this.gdh.close_cb(); this.gdh.close_cb();
}; };
this.ws.onmessage = function(e) { this.ws.onmessage = function (e) {
if ( typeof e.data == "string") { if (typeof e.data == "string") {
console.log("String message received", e, e.data); console.log("String message received", e, e.data);
} } else {
else { if (e.data instanceof ArrayBuffer) {
if ( e.data instanceof ArrayBuffer) {
var dv = new DataView(e.data); var dv = new DataView(e.data);
var type = dv.getUint8(0); var type = dv.getUint8(0);
var id = dv.getUint32(1); var id = dv.getUint32(1);
var sts = dv.getUint32(5); var sts = dv.getUint32(5);
switch( type) { switch (type) {
case Msg.GET_OBJECT_INFO_BOOLEAN: { case Msg.GET_OBJECT_INFO_BOOLEAN: {
if ( this.gdh.debug) console.log("GetObjectInfoBoolean received"); if (this.gdh.debug) console.log("GetObjectInfoBoolean received");
var value = dv.getUint8(9); var value = dv.getUint8(9);
var func_cb = this.gdh.pending[id].func_cb; var func_cb = this.gdh.pending[id].func_cb;
func_cb( id, sts, value); func_cb(id, sts, value);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.GET_OBJECT_INFO_INT: { case Msg.GET_OBJECT_INFO_INT: {
if ( this.gdh.debug) console.log("GetObjectInfoInt received"); if (this.gdh.debug) console.log("GetObjectInfoInt received");
var value = dv.getUint32(9); var value = dv.getUint32(9);
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, value); pending_data.func_cb(id, pending_data.data, sts, value);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.GET_OBJECT_INFO_FLOAT: { case Msg.GET_OBJECT_INFO_FLOAT: {
if ( this.gdh.debug) console.log("GetObjectInfoFloat received"); if (this.gdh.debug) console.log("GetObjectInfoFloat received");
var value = dv.getFloat32(9); var value = dv.getFloat32(9);
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, value); pending_data.func_cb(id, pending_data.data, sts, value);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.GET_OBJECT_INFO_FLOAT_ARRAY: { case Msg.GET_OBJECT_INFO_FLOAT_ARRAY: {
if ( this.gdh.debug) console.log("GetObjectInfoFloatArray received"); if (this.gdh.debug) console.log("GetObjectInfoFloatArray received");
var asize = dv.getInt32(9); var asize = dv.getInt32(9);
var value = new Array(asize); var value = new Array(asize);
k = 13; k = 13;
for ( var i = 0; i < asize; i++) { for (var i = 0; i < asize; i++) {
value[i] = dv.getFloat32(k); value[i] = dv.getFloat32(k);
k += 4; k += 4;
} }
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, value); pending_data.func_cb(id, pending_data.data, sts, value);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.SET_OBJECT_INFO_BOOLEAN: { case Msg.SET_OBJECT_INFO_BOOLEAN: {
if ( this.gdh.debug) console.log("SetObjectInfoBoolean received", id, sts); if (this.gdh.debug) console.log("SetObjectInfoBoolean received", id, sts);
break; break;
} }
case Msg.SET_OBJECT_INFO_INT: { case Msg.SET_OBJECT_INFO_INT: {
if ( this.gdh.debug) console.log("SetObjectInfoInt received", id, sts); if (this.gdh.debug) console.log("SetObjectInfoInt received", id, sts);
break; break;
} }
case Msg.SET_OBJECT_INFO_FLOAT: { case Msg.SET_OBJECT_INFO_FLOAT: {
if ( this.gdh.debug) console.log("SetObjectInfoFloat received", id, sts); if (this.gdh.debug) console.log("SetObjectInfoFloat received", id, sts);
break; break;
} }
case Msg.SET_OBJECT_INFO_STRING: { case Msg.SET_OBJECT_INFO_STRING: {
if ( this.gdh.debug) console.log("SetObjectInfoString received", id, sts); if (this.gdh.debug) console.log("SetObjectInfoString received", id, sts);
break; break;
} }
case Msg.TOGGLE_OBJECT_INFO: { case Msg.TOGGLE_OBJECT_INFO: {
if ( this.gdh.debug) console.log("ToggleObjectInfo received", id, sts); if (this.gdh.debug) console.log("ToggleObjectInfo received", id, sts);
break; break;
} }
case Msg.REF_OBJECT_INFO: { case Msg.REF_OBJECT_INFO: {
if ( this.gdh.debug) console.log("RefObjectInfo received", id, sts); if (this.gdh.debug) console.log("RefObjectInfo received", id, sts);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.UNREF_OBJECT_INFO: { case Msg.UNREF_OBJECT_INFO: {
if ( this.gdh.debug) console.log("UnrefObjectInfo received", id, sts); if (this.gdh.debug) console.log("UnrefObjectInfo received", id, sts);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.REF_OBJECT_INFO_LIST: { case Msg.REF_OBJECT_INFO_LIST: {
if ( this.gdh.debug) console.log("RefObjectInfoList received", id, sts); if (this.gdh.debug) console.log("RefObjectInfoList received", id, sts);
var func_cb = this.gdh.pending[id].func_cb; var func_cb = this.gdh.pending[id].func_cb;
func_cb( id, sts); func_cb(id, sts);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.GET_OBJECT_REF_INFO_ALL: { case Msg.GET_OBJECT_REF_INFO_ALL: {
var j = 9; var j = 9;
var size = dv.getUint32(j); var size = dv.getUint32(j);
if ( this.gdh.debug) console.log("GetObjectRefInfoAll received", id, size); if (this.gdh.debug) console.log("GetObjectRefInfoAll received", id, size);
j += 4; j += 4;
for ( var i = 0; i < size; i++) { for (var i = 0; i < size; i++) {
var eid = dv.getUint32(j); var eid = dv.getUint32(j);
j += 4; j += 4;
var esize = dv.getUint32(j); var esize = dv.getUint32(j);
j += 4; j += 4;
var sub = this.gdh.sub[eid]; var sub = this.gdh.sub[eid];
if ( typeof sub == 'undefined') if (typeof sub == 'undefined')
j += esize; j += esize;
else { else {
var value; var value;
switch ( sub.type) { switch (sub.type) {
case Pwr.eType_Boolean: case Pwr.eType_Boolean:
value = dv.getUint8(j); value = dv.getUint8(j);
j += 1; j += 1;
break; break;
case Pwr.eType_Float32: case Pwr.eType_Float32:
if ( sub.elements <= 1) { if (sub.elements <= 1) {
value = dv.getFloat32(j); value = dv.getFloat32(j);
j += 4; j += 4;
} } else {
else { if (esize != sub.elements * 4)
if ( esize != sub.elements * 4)
console.log("Subscription size error", esize, sub.elements, eid); console.log("Subscription size error", esize, sub.elements, eid);
value = new Array(sub.elements); value = new Array(sub.elements);
for ( var k = 0; k < sub.elements; k++) { for (var k = 0; k < sub.elements; k++) {
value[k] = dv.getFloat32(j); value[k] = dv.getFloat32(j);
j += 4; j += 4;
} }
...@@ -1129,23 +1111,23 @@ function Gdh() { ...@@ -1129,23 +1111,23 @@ function Gdh() {
case Pwr.eType_Objid: case Pwr.eType_Objid:
var nsize = dv.getInt16(j); var nsize = dv.getInt16(j);
j += 2; j += 2;
var iarr = new Uint8Array( nsize); var iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
value = String.fromCharCode.apply( null, iarr); value = String.fromCharCode.apply(null, iarr);
break; break;
default: break; default: break;
} }
this.gdh.sub[eid].value = value; this.gdh.sub[eid].value = value;
} }
} }
if ( typeof this.gdh.pending[id] == 'undefined') { if (typeof this.gdh.pending[id] == 'undefined') {
console.log( "** GetObjectRefInfoAll received removed", id); console.log("** GetObjectRefInfoAll received removed", id);
break; break;
} }
var func_cb = this.gdh.pending[id].func_cb; var func_cb = this.gdh.pending[id].func_cb;
func_cb( id, sts); func_cb(id, sts);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
...@@ -1153,10 +1135,10 @@ function Gdh() { ...@@ -1153,10 +1135,10 @@ function Gdh() {
var result = []; var result = [];
var j = 9; var j = 9;
var size = dv.getUint32(j); var size = dv.getUint32(j);
if ( this.gdh.debug) console.log("GetAllXttChildren received", id, size); if (this.gdh.debug) console.log("GetAllXttChildren received", id, size);
console.log("GetAllXttChildren received", sts, id, size); console.log("GetAllXttChildren received", sts, id, size);
j += 4; j += 4;
for ( var i = 0; i < size; i++) { for (var i = 0; i < size; i++) {
var info = new ObjectInfo(); var info = new ObjectInfo();
info.objid = new PwrtObjid(); info.objid = new PwrtObjid();
info.objid.vid = dv.getUint32(j); info.objid.vid = dv.getUint32(j);
...@@ -1169,30 +1151,30 @@ function Gdh() { ...@@ -1169,30 +1151,30 @@ function Gdh() {
j += 2; j += 2;
var nsize = dv.getUint16(j); var nsize = dv.getUint16(j);
j += 2; j += 2;
var iarr = new Uint8Array( nsize); var iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.name = String.fromCharCode.apply( null, iarr); info.name = String.fromCharCode.apply(null, iarr);
//j += nsize; //j += nsize;
var dsize = dv.getUint16(j); var dsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( dsize); iarr = new Uint8Array(dsize);
for ( var k = 0; k < dsize; k++) { for (var k = 0; k < dsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.description = String.fromCharCode.apply( null, iarr); info.description = String.fromCharCode.apply(null, iarr);
var csize = dv.getUint16(j); var csize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( csize); iarr = new Uint8Array(csize);
for ( var k = 0; k < csize; k++) { for (var k = 0; k < csize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.classname = String.fromCharCode.apply( null, iarr); info.classname = String.fromCharCode.apply(null, iarr);
result.push(info); result.push(info);
} }
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, result); pending_data.func_cb(id, pending_data.data, sts, result);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
...@@ -1200,9 +1182,9 @@ function Gdh() { ...@@ -1200,9 +1182,9 @@ function Gdh() {
var result = []; var result = [];
var j = 9; var j = 9;
var size = dv.getUint32(j); var size = dv.getUint32(j);
if ( this.gdh.debug) console.log("GetAllClassAttributes received", id, size); if (this.gdh.debug) console.log("GetAllClassAttributes received", id, size);
j += 4; j += 4;
for ( var i = 0; i < size; i++) { for (var i = 0; i < size; i++) {
var info = new AttributeInfo(); var info = new AttributeInfo();
info.type = dv.getUint32(j); info.type = dv.getUint32(j);
j += 4; j += 4;
...@@ -1214,30 +1196,30 @@ function Gdh() { ...@@ -1214,30 +1196,30 @@ function Gdh() {
j += 2; j += 2;
var nsize = dv.getUint16(j); var nsize = dv.getUint16(j);
j += 2; j += 2;
var iarr = new Uint8Array( nsize); var iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.name = String.fromCharCode.apply( null, iarr); info.name = String.fromCharCode.apply(null, iarr);
nsize = dv.getUint16(j); nsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( nsize); iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.classname = String.fromCharCode.apply( null, iarr); info.classname = String.fromCharCode.apply(null, iarr);
result.push(info); result.push(info);
} }
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, result); pending_data.func_cb(id, pending_data.data, sts, result);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.GET_OBJECT: { case Msg.GET_OBJECT: {
if ( this.gdh.debug) console.log("GetObject received", id, sts); if (this.gdh.debug) console.log("GetObject received", id, sts);
var info = null; var info = null;
if ( (sts & 1) !== 0) { if ((sts & 1) !== 0) {
var j = 9; var j = 9;
info = new ObjectInfo(); info = new ObjectInfo();
info.objid = new PwrtObjid(); info.objid = new PwrtObjid();
...@@ -1252,50 +1234,50 @@ function Gdh() { ...@@ -1252,50 +1234,50 @@ function Gdh() {
var nsize = dv.getUint16(j); var nsize = dv.getUint16(j);
j += 2; j += 2;
var iarr = new Uint8Array( nsize); var iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.name = String.fromCharCode.apply( null, iarr); info.name = String.fromCharCode.apply(null, iarr);
nsize = dv.getUint16(j); nsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( nsize); iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.fullname = String.fromCharCode.apply( null, iarr); info.fullname = String.fromCharCode.apply(null, iarr);
var csize = dv.getUint16(j); var csize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( csize); iarr = new Uint8Array(csize);
for ( var k = 0; k < csize; k++) { for (var k = 0; k < csize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.classname = String.fromCharCode.apply( null, iarr); info.classname = String.fromCharCode.apply(null, iarr);
var dsize = dv.getUint16(j); var dsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( dsize); iarr = new Uint8Array(dsize);
for ( var k = 0; k < dsize; k++) { for (var k = 0; k < dsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.description = String.fromCharCode.apply( null, iarr); info.description = String.fromCharCode.apply(null, iarr);
} }
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, info); pending_data.func_cb(id, pending_data.data, sts, info);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.CRR_SIGNAL: { case Msg.CRR_SIGNAL: {
var crrtext = null; var crrtext = null;
if ( (sts & 1) !== 0) { if ((sts & 1) !== 0) {
var j = 9; var j = 9;
var result = []; var result = [];
var size = dv.getUint16(j); var size = dv.getUint16(j);
j += 2; j += 2;
if ( this.gdh.debug) console.log("CrrSignal received", id, size); if (this.gdh.debug) console.log("CrrSignal received", id, size);
for ( var i = 0; i < size; i++) { for (var i = 0; i < size; i++) {
var info = new CrrInfo(); var info = new CrrInfo();
info.type = dv.getUint16(j); info.type = dv.getUint16(j);
j += 2; j += 2;
...@@ -1306,49 +1288,48 @@ function Gdh() { ...@@ -1306,49 +1288,48 @@ function Gdh() {
j += 4; j += 4;
var nsize = dv.getUint16(j); var nsize = dv.getUint16(j);
j += 2; j += 2;
var iarr = new Uint8Array( nsize); var iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.name = String.fromCharCode.apply( null, iarr); info.name = String.fromCharCode.apply(null, iarr);
var csize = dv.getUint16(j); var csize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( csize); iarr = new Uint8Array(csize);
for ( var k = 0; k < csize; k++) { for (var k = 0; k < csize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
info.classname = String.fromCharCode.apply( null, iarr); info.classname = String.fromCharCode.apply(null, iarr);
result.push(info); result.push(info);
} }
} }
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, result); pending_data.func_cb(id, pending_data.data, sts, result);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.GET_OPWIND_MENU: { case Msg.GET_OPWIND_MENU: {
var result = new OpwindMenuInfo(); var result = new OpwindMenuInfo();
var j = 9; var j = 9;
if ( this.gdh.debug) console.log("GetOpwindMenu received", id, size); if (this.gdh.debug) console.log("GetOpwindMenu received", id, size);
console.log("GetOpwindMenu received", sts, id); console.log("GetOpwindMenu received", sts, id);
if ( sts & 1) { if (sts & 1) {
var nsize = dv.getUint16(j); var nsize = dv.getUint16(j);
j += 2; j += 2;
var iarr = new Uint8Array( nsize); var iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
result.title = String.fromCharCode.apply( null, iarr); result.title = String.fromCharCode.apply(null, iarr);
nsize = dv.getUint16(j); nsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( nsize); iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
result.text = String.fromCharCode.apply( null, iarr); result.text = String.fromCharCode.apply(null, iarr);
result.enable_language = dv.getUint32(j); result.enable_language = dv.getUint32(j);
j += 4; j += 4;
...@@ -1370,51 +1351,51 @@ function Gdh() { ...@@ -1370,51 +1351,51 @@ function Gdh() {
var bsize = dv.getUint16(j); var bsize = dv.getUint16(j);
j += 2; j += 2;
for ( var i = 0; i < bsize; i++) { for (var i = 0; i < bsize; i++) {
var button = new MenuButton(); var button = new MenuButton();
button.type = dv.getUint32(j); button.type = dv.getUint32(j);
j += 4; j += 4;
nsize = dv.getUint16(j); nsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( nsize); iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
button.text = String.fromCharCode.apply( null, iarr); button.text = String.fromCharCode.apply(null, iarr);
nsize = dv.getUint16(j); nsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( nsize); iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
button.name = String.fromCharCode.apply( null, iarr); button.name = String.fromCharCode.apply(null, iarr);
nsize = dv.getUint16(j); nsize = dv.getUint16(j);
j += 2; j += 2;
iarr = new Uint8Array( nsize); iarr = new Uint8Array(nsize);
for ( var k = 0; k < nsize; k++) { for (var k = 0; k < nsize; k++) {
iarr[k] = dv.getUint8(j++); iarr[k] = dv.getUint8(j++);
} }
button.url = String.fromCharCode.apply( null, iarr); button.url = String.fromCharCode.apply(null, iarr);
result.buttons.push(button); result.buttons.push(button);
} }
} }
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, result); pending_data.func_cb(id, pending_data.data, sts, result);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
case Msg.CHECK_USER: { case Msg.CHECK_USER: {
var j = 9; var j = 9;
if ( this.gdh.debug) console.log("Check user received", id, size); if (this.gdh.debug) console.log("Check user received", id, size);
console.log("Check user received", sts, id); console.log("Check user received", sts, id);
var priv = 0; var priv = 0;
if ( sts & 1) { if (sts & 1) {
priv = dv.getUint32(j); priv = dv.getUint32(j);
j += 4; j += 4;
} }
var pending_data = this.gdh.pending[id]; var pending_data = this.gdh.pending[id];
pending_data.func_cb( id, pending_data.data, sts, priv); pending_data.func_cb(id, pending_data.data, sts, priv);
delete this.gdh.pending[id]; delete this.gdh.pending[id];
break; break;
} }
...@@ -1426,61 +1407,61 @@ function Gdh() { ...@@ -1426,61 +1407,61 @@ function Gdh() {
}; };
}; };
this.getObjectInfoBoolean = function( name, return_cb) { this.getObjectInfoBoolean = function (name, return_cb) {
this.return_cb = return_cb; this.return_cb = return_cb;
var buf = new Uint8Array(name.length+6); var buf = new Uint8Array(name.length + 6);
buf[0] = Msg.GET_OBJECT_INFO_BOOLEAN; buf[0] = Msg.GET_OBJECT_INFO_BOOLEAN;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
buf[4] = (this.next_id >> 16) & 0xFF; buf[4] = (this.next_id >> 16) & 0xFF;
buf[5] = (this.next_id >> 24) & 0xFF; buf[5] = (this.next_id >> 24) & 0xFF;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[i+6] = name.charCodeAt(i); buf[i + 6] = name.charCodeAt(i);
} }
this.pending[this.next_id] = new PendingData( return_cb, null); this.pending[this.next_id] = new PendingData(return_cb, null);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.getObjectInfoInt = function( name, return_cb, data) { this.getObjectInfoInt = function (name, return_cb, data) {
this.return_cb = return_cb; this.return_cb = return_cb;
var buf = new Uint8Array(name.length+6); var buf = new Uint8Array(name.length + 6);
buf[0] = Msg.GET_OBJECT_INFO_INT; buf[0] = Msg.GET_OBJECT_INFO_INT;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
buf[4] = (this.next_id >> 16) & 0xFF; buf[4] = (this.next_id >> 16) & 0xFF;
buf[5] = (this.next_id >> 24) & 0xFF; buf[5] = (this.next_id >> 24) & 0xFF;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[i+6] = name.charCodeAt(i); buf[i + 6] = name.charCodeAt(i);
} }
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.getObjectInfoFloat = function( name, return_cb, data) { this.getObjectInfoFloat = function (name, return_cb, data) {
this.return_cb = return_cb; this.return_cb = return_cb;
var buf = new Uint8Array(name.length+6); var buf = new Uint8Array(name.length + 6);
buf[0] = Msg.GET_OBJECT_INFO_FLOAT; buf[0] = Msg.GET_OBJECT_INFO_FLOAT;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
buf[4] = (this.next_id >> 16) & 0xFF; buf[4] = (this.next_id >> 16) & 0xFF;
buf[5] = (this.next_id >> 24) & 0xFF; buf[5] = (this.next_id >> 24) & 0xFF;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[i+6] = name.charCodeAt(i); buf[i + 6] = name.charCodeAt(i);
} }
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.getObjectInfoFloatArray = function( name, asize, return_cb, data) { this.getObjectInfoFloatArray = function (name, asize, return_cb, data) {
this.return_cb = return_cb; this.return_cb = return_cb;
var buf = new Uint8Array(name.length+10); var buf = new Uint8Array(name.length + 10);
buf[0] = Msg.GET_OBJECT_INFO_FLOAT_ARRAY; buf[0] = Msg.GET_OBJECT_INFO_FLOAT_ARRAY;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
...@@ -1490,15 +1471,15 @@ function Gdh() { ...@@ -1490,15 +1471,15 @@ function Gdh() {
buf[7] = (asize >> 8) & 0xFF; buf[7] = (asize >> 8) & 0xFF;
buf[8] = (asize >> 16) & 0xFF; buf[8] = (asize >> 16) & 0xFF;
buf[9] = (asize >> 24) & 0xFF; buf[9] = (asize >> 24) & 0xFF;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[i+10] = name.charCodeAt(i); buf[i + 10] = name.charCodeAt(i);
} }
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.refObjectInfo = function( name, type, elements) { this.refObjectInfo = function (name, type, elements) {
var sub = new Sub(); var sub = new Sub();
sub.name = name; sub.name = name;
sub.refid = this.subscriptionCount; sub.refid = this.subscriptionCount;
...@@ -1506,22 +1487,21 @@ function Gdh() { ...@@ -1506,22 +1487,21 @@ function Gdh() {
sub.elements = elements; sub.elements = elements;
this.sub[this.subscriptionCount] = sub; this.sub[this.subscriptionCount] = sub;
this.subscriptionCount++; this.subscriptionCount++;
if ( !this.listSent) { if (!this.listSent) {
return sub.refid; return sub.refid;
} } else {
else {
var size = 0; var size = 0;
var len = 0; var len = 0;
size = 12 + sub.name.length; size = 12 + sub.name.length;
var buf = new Uint8Array(size+10); var buf = new Uint8Array(size + 10);
buf[0] = Msg.REF_OBJECT_INFO; buf[0] = Msg.REF_OBJECT_INFO;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
buf[4] = (this.next_id >> 16) & 0xFF; buf[4] = (this.next_id >> 16) & 0xFF;
buf[5] = (this.next_id >> 24) & 0xFF; buf[5] = (this.next_id >> 24) & 0xFF;
if ( this.debug) console.log("RefObjectInfo: ", sub.refid); if (this.debug) console.log("RefObjectInfo: ", sub.refid);
var k = 6; var k = 6;
buf[k++] = sub.refid & 0xFF; buf[k++] = sub.refid & 0xFF;
buf[k++] = (sub.refid >> 8) & 0xFF; buf[k++] = (sub.refid >> 8) & 0xFF;
...@@ -1536,12 +1516,12 @@ function Gdh() { ...@@ -1536,12 +1516,12 @@ function Gdh() {
buf[k++] = (sub.name.length >> 16) & 0xFF; buf[k++] = (sub.name.length >> 16) & 0xFF;
buf[k++] = (sub.name.length >> 24) & 0xFF; buf[k++] = (sub.name.length >> 24) & 0xFF;
for ( var j = 0; j < sub.name.length; j++) { for (var j = 0; j < sub.name.length; j++) {
buf[k++] = sub.name.charCodeAt(j); buf[k++] = sub.name.charCodeAt(j);
} }
this.pending[this.next_id] = new PendingData( this.refObjectInfoReply, null); this.pending[this.next_id] = new PendingData(this.refObjectInfoReply, null);
if ( this.debug) console.log( "Sending RefObjectInfo", this.next_id, size, k); if (this.debug) console.log("Sending RefObjectInfo", this.next_id, size, k);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
...@@ -1549,47 +1529,47 @@ function Gdh() { ...@@ -1549,47 +1529,47 @@ function Gdh() {
return sub.refid; return sub.refid;
} }
}; };
this.refObjectInfoReply = function( id, sts) { this.refObjectInfoReply = function (id, sts) {
if ( this.debug) console.log( "refObjectInfoReply", id, sts); if (this.debug) console.log("refObjectInfoReply", id, sts);
}; };
this.unrefObjectInfo = function( refid) { this.unrefObjectInfo = function (refid) {
var size = 0; var size = 0;
var len = 0; var len = 0;
size = 4; size = 4;
var buf = new Uint8Array(size+10); var buf = new Uint8Array(size + 10);
buf[0] = Msg.UNREF_OBJECT_INFO; buf[0] = Msg.UNREF_OBJECT_INFO;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
buf[4] = (this.next_id >> 16) & 0xFF; buf[4] = (this.next_id >> 16) & 0xFF;
buf[5] = (this.next_id >> 24) & 0xFF; buf[5] = (this.next_id >> 24) & 0xFF;
if ( this.debug) console.log("UnrefObjectInfo: ", refid); if (this.debug) console.log("UnrefObjectInfo: ", refid);
var k = 6; var k = 6;
buf[k++] = refid & 0xFF; buf[k++] = refid & 0xFF;
buf[k++] = (refid >> 8) & 0xFF; buf[k++] = (refid >> 8) & 0xFF;
buf[k++] = (refid >> 16) & 0xFF; buf[k++] = (refid >> 16) & 0xFF;
buf[k++] = (refid >> 24) & 0xFF; buf[k++] = (refid >> 24) & 0xFF;
this.pending[this.next_id] = new PendingData( this.unrefObjectInfoReply, null); this.pending[this.next_id] = new PendingData(this.unrefObjectInfoReply, null);
if ( this.debug) console.log( "Sending UnrefObjectInfo", this.next_id, size, k, refid); if (this.debug) console.log("Sending UnrefObjectInfo", this.next_id, size, k, refid);
console.log( "Sending UnrefObjectInfo", this.next_id, size, k, refid); console.log("Sending UnrefObjectInfo", this.next_id, size, k, refid);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
delete this.sub[refid]; delete this.sub[refid];
}; };
this.refObjectInfoList = function( return_cb) { this.refObjectInfoList = function (return_cb) {
var size = 0; var size = 0;
var len = 0; var len = 0;
this.return_cb = return_cb; this.return_cb = return_cb;
for( var i in this.sub) { for (var i in this.sub) {
size += 12 + this.sub[i].name.length; size += 12 + this.sub[i].name.length;
len++; len++;
} }
var buf = new Uint8Array(size+10); var buf = new Uint8Array(size + 10);
buf[0] = Msg.REF_OBJECT_INFO_LIST; buf[0] = Msg.REF_OBJECT_INFO_LIST;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
...@@ -1600,10 +1580,10 @@ function Gdh() { ...@@ -1600,10 +1580,10 @@ function Gdh() {
buf[8] = (len >> 16) & 0xFF; buf[8] = (len >> 16) & 0xFF;
buf[9] = (len >> 24) & 0xFF; buf[9] = (len >> 24) & 0xFF;
var k = 10; var k = 10;
for ( var i in this.sub) { for (var i in this.sub) {
if ( i === 0) if (i === 0)
continue; continue;
if ( this.debug) console.log("RefObjectInfoList: ", this.sub[i].refid); if (this.debug) console.log("RefObjectInfoList: ", this.sub[i].refid);
buf[k++] = this.sub[i].refid & 0xFF; buf[k++] = this.sub[i].refid & 0xFF;
buf[k++] = (this.sub[i].refid >> 8) & 0xFF; buf[k++] = (this.sub[i].refid >> 8) & 0xFF;
buf[k++] = (this.sub[i].refid >> 16) & 0xFF; buf[k++] = (this.sub[i].refid >> 16) & 0xFF;
...@@ -1617,40 +1597,40 @@ function Gdh() { ...@@ -1617,40 +1597,40 @@ function Gdh() {
buf[k++] = (this.sub[i].name.length >> 16) & 0xFF; buf[k++] = (this.sub[i].name.length >> 16) & 0xFF;
buf[k++] = (this.sub[i].name.length >> 24) & 0xFF; buf[k++] = (this.sub[i].name.length >> 24) & 0xFF;
for ( var j = 0; j < this.sub[i].name.length; j++) { for (var j = 0; j < this.sub[i].name.length; j++) {
buf[k++] = this.sub[i].name.charCodeAt(j); buf[k++] = this.sub[i].name.charCodeAt(j);
} }
} }
this.pending[this.next_id] = new PendingData( return_cb, null); this.pending[this.next_id] = new PendingData(return_cb, null);
if ( this.debug) console.log( "Sending RefObjectInfoList", this.next_id, size, k, this.next_id); if (this.debug) console.log("Sending RefObjectInfoList", this.next_id, size, k, this.next_id);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
this.listSent = true; this.listSent = true;
}; };
this.refObjectInfoListReply = function( id, sts) { this.refObjectInfoListReply = function (id, sts) {
if ( this.debug) console.log( "refObjectInfoListReply", id, sts); if (this.debug) console.log("refObjectInfoListReply", id, sts);
}; };
this.getRefObjectInfoAll = function( return_cb) { this.getRefObjectInfoAll = function (return_cb) {
var buf = new Uint8Array(6); var buf = new Uint8Array(6);
buf[0] = Msg.GET_OBJECT_REF_INFO_ALL; buf[0] = Msg.GET_OBJECT_REF_INFO_ALL;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
buf[4] = (this.next_id >> 16) & 0xFF; buf[4] = (this.next_id >> 16) & 0xFF;
buf[5] = (this.next_id >> 24) & 0xFF; buf[5] = (this.next_id >> 24) & 0xFF;
this.pending[this.next_id] = new PendingData( return_cb, null); this.pending[this.next_id] = new PendingData(return_cb, null);
if ( this.debug) console.log( "Sending getRefObjectInfoAll", this.next_id); if (this.debug) console.log("Sending getRefObjectInfoAll", this.next_id);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.getRefObjectInfoAllReply = function( id, sts) { this.getRefObjectInfoAllReply = function (id, sts) {
if ( this.debug) console.log( "getRefObjectInfoAllReply", id, sts); if (this.debug) console.log("getRefObjectInfoAllReply", id, sts);
}; };
this.getObjectRefInfo = function( id) { this.getObjectRefInfo = function (id) {
if ( this.debug) console.log("getObjectRefInfo", id, this.sub[id].value); if (this.debug) console.log("getObjectRefInfo", id, this.sub[id].value);
return this.sub[id].value; return this.sub[id].value;
}; };
this.setObjectInfoBoolean = function( name, value) { this.setObjectInfoBoolean = function (name, value) {
var buf = new Uint8Array(12 + name.length); var buf = new Uint8Array(12 + name.length);
buf[0] = Msg.SET_OBJECT_INFO_BOOLEAN; buf[0] = Msg.SET_OBJECT_INFO_BOOLEAN;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1664,17 +1644,17 @@ function Gdh() { ...@@ -1664,17 +1644,17 @@ function Gdh() {
buf[10] = name.length & 0xFF; buf[10] = name.length & 0xFF;
buf[11] = (name.length >> 8) & 0xFF; buf[11] = (name.length >> 8) & 0xFF;
var k = 12; var k = 12;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[k++] = name.charCodeAt(i); buf[k++] = name.charCodeAt(i);
} }
this.ws.send(buf); this.ws.send(buf);
if ( this.debug) console.log("Sending setObjectInfoBoolean", this.next_id, name, value); if (this.debug) console.log("Sending setObjectInfoBoolean", this.next_id, name, value);
this.next_id++; this.next_id++;
return new PwrtStatus( 1); return new PwrtStatus(1);
}; };
this.setObjectInfoInt = function( name, value) { this.setObjectInfoInt = function (name, value) {
var buf = new Uint8Array(12 + name.length); var buf = new Uint8Array(12 + name.length);
buf[0] = Msg.SET_OBJECT_INFO_INT; buf[0] = Msg.SET_OBJECT_INFO_INT;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1688,18 +1668,18 @@ function Gdh() { ...@@ -1688,18 +1668,18 @@ function Gdh() {
buf[10] = name.length & 0xFF; buf[10] = name.length & 0xFF;
buf[11] = (name.length >> 8) & 0xFF; buf[11] = (name.length >> 8) & 0xFF;
var k = 12; var k = 12;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[k++] = name.charCodeAt(i); buf[k++] = name.charCodeAt(i);
} }
// this.pending[this.next_id] = new PendingData( return_cb, null); // this.pending[this.next_id] = new PendingData( return_cb, null);
this.ws.send(buf); this.ws.send(buf);
if ( this.debug) console.log("Sending setObjectInfoInt", this.next_id, name, value); if (this.debug) console.log("Sending setObjectInfoInt", this.next_id, name, value);
this.next_id++; this.next_id++;
return new PwrtStatus( 1); return new PwrtStatus(1);
}; };
this.setObjectInfoFloat = function( name, value) { this.setObjectInfoFloat = function (name, value) {
var buf = new Uint8Array(12 + name.length); var buf = new Uint8Array(12 + name.length);
buf[0] = Msg.SET_OBJECT_INFO_FLOAT; buf[0] = Msg.SET_OBJECT_INFO_FLOAT;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1717,20 +1697,20 @@ function Gdh() { ...@@ -1717,20 +1697,20 @@ function Gdh() {
buf[10] = name.length & 0xFF; buf[10] = name.length & 0xFF;
buf[11] = (name.length >> 8) & 0xFF; buf[11] = (name.length >> 8) & 0xFF;
var k = 12; var k = 12;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[k++] = name.charCodeAt(i); buf[k++] = name.charCodeAt(i);
} }
// this.pending[this.next_id] = new PendingData( return_cb, null); // this.pending[this.next_id] = new PendingData( return_cb, null);
this.ws.send(buf); this.ws.send(buf);
if ( this.debug) console.log("Sending setObjectInfoFloat", this.next_id, name, value); if (this.debug) console.log("Sending setObjectInfoFloat", this.next_id, name, value);
this.next_id++; this.next_id++;
return new PwrtStatus( 1); return new PwrtStatus(1);
}; };
this.setObjectInfoString = function( name, value) { this.setObjectInfoString = function (name, value) {
var i; var i;
var buf = new Uint8Array( 10 + value.length + name.length); var buf = new Uint8Array(10 + value.length + name.length);
buf[0] = Msg.SET_OBJECT_INFO_STRING; buf[0] = Msg.SET_OBJECT_INFO_STRING;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
buf[3] = (this.next_id >> 8) & 0xFF; buf[3] = (this.next_id >> 8) & 0xFF;
...@@ -1739,22 +1719,22 @@ function Gdh() { ...@@ -1739,22 +1719,22 @@ function Gdh() {
buf[6] = value.length & 0xFF; buf[6] = value.length & 0xFF;
buf[7] = (value.length >> 8) & 0xFF; buf[7] = (value.length >> 8) & 0xFF;
var k = 8; var k = 8;
for ( i = 0; i < value.length; i++) for (i = 0; i < value.length; i++)
buf[k++] = value.charCodeAt(i); buf[k++] = value.charCodeAt(i);
buf[k++] = name.length & 0xFF; buf[k++] = name.length & 0xFF;
buf[k++] = (name.length >> 8) & 0xFF; buf[k++] = (name.length >> 8) & 0xFF;
for ( i = 0; i < name.length; i++) { for (i = 0; i < name.length; i++) {
buf[k++] = name.charCodeAt(i); buf[k++] = name.charCodeAt(i);
} }
// this.pending[this.next_id] = new PendingData( return_cb, null); // this.pending[this.next_id] = new PendingData( return_cb, null);
this.ws.send(buf); this.ws.send(buf);
if ( this.debug) console.log("Sending setObjectInfoString", this.next_id, name, value); if (this.debug) console.log("Sending setObjectInfoString", this.next_id, name, value);
this.next_id++; this.next_id++;
return new PwrtStatus( 1); return new PwrtStatus(1);
}; };
this.toggleObjectInfo = function( name) { this.toggleObjectInfo = function (name) {
var buf = new Uint8Array(8 + name.length); var buf = new Uint8Array(8 + name.length);
buf[0] = Msg.TOGGLE_OBJECT_INFO; buf[0] = Msg.TOGGLE_OBJECT_INFO;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1764,18 +1744,18 @@ function Gdh() { ...@@ -1764,18 +1744,18 @@ function Gdh() {
buf[6] = name.length & 0xFF; buf[6] = name.length & 0xFF;
buf[7] = (name.length >> 8) & 0xFF; buf[7] = (name.length >> 8) & 0xFF;
var k = 8; var k = 8;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[k++] = name.charCodeAt(i); buf[k++] = name.charCodeAt(i);
} }
// this.pending[this.next_id] = new PendingData( return_cb, null); // this.pending[this.next_id] = new PendingData( return_cb, null);
this.ws.send(buf); this.ws.send(buf);
if ( this.debug) console.log("Sending toggleObjectInfoBoolean", this.next_id, name, value); if (this.debug) console.log("Sending toggleObjectInfoBoolean", this.next_id, name, value);
this.next_id++; this.next_id++;
return new PwrtStatus( 1); return new PwrtStatus(1);
}; };
this.getAllXttChildren = function( oid, return_cb, data) { this.getAllXttChildren = function (oid, return_cb, data) {
var buf = new Uint8Array(14); var buf = new Uint8Array(14);
buf[0] = Msg.GET_ALL_XTT_CHILDREN; buf[0] = Msg.GET_ALL_XTT_CHILDREN;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1790,13 +1770,13 @@ function Gdh() { ...@@ -1790,13 +1770,13 @@ function Gdh() {
buf[11] = (oid.oix >> 8) & 0xFF; buf[11] = (oid.oix >> 8) & 0xFF;
buf[12] = (oid.oix >> 16) & 0xFF; buf[12] = (oid.oix >> 16) & 0xFF;
buf[13] = (oid.oix >> 24) & 0xFF; buf[13] = (oid.oix >> 24) & 0xFF;
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
if ( this.debug) console.log( "Sending getAllXttChildren", this.next_id); if (this.debug) console.log("Sending getAllXttChildren", this.next_id);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.getAllClassAttributes = function( cid, oid, return_cb, data) { this.getAllClassAttributes = function (cid, oid, return_cb, data) {
var buf = new Uint8Array(18); var buf = new Uint8Array(18);
buf[0] = Msg.GET_ALL_CLASS_ATTRIBUTES; buf[0] = Msg.GET_ALL_CLASS_ATTRIBUTES;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1815,13 +1795,13 @@ function Gdh() { ...@@ -1815,13 +1795,13 @@ function Gdh() {
buf[15] = (oid.oix >> 8) & 0xFF; buf[15] = (oid.oix >> 8) & 0xFF;
buf[16] = (oid.oix >> 16) & 0xFF; buf[16] = (oid.oix >> 16) & 0xFF;
buf[17] = (oid.oix >> 24) & 0xFF; buf[17] = (oid.oix >> 24) & 0xFF;
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
if ( this.debug) console.log( "Sending getAllClassAttributes", this.next_id, cid, oid.vid, oid.oix); if (this.debug) console.log("Sending getAllClassAttributes", this.next_id, cid, oid.vid, oid.oix);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.getObject = function( oid, op, return_cb, data) { this.getObject = function (oid, op, return_cb, data) {
var buf = new Uint8Array(16); var buf = new Uint8Array(16);
buf[0] = Msg.GET_OBJECT; buf[0] = Msg.GET_OBJECT;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1838,13 +1818,13 @@ function Gdh() { ...@@ -1838,13 +1818,13 @@ function Gdh() {
buf[13] = (oid.oix >> 8) & 0xFF; buf[13] = (oid.oix >> 8) & 0xFF;
buf[14] = (oid.oix >> 16) & 0xFF; buf[14] = (oid.oix >> 16) & 0xFF;
buf[15] = (oid.oix >> 24) & 0xFF; buf[15] = (oid.oix >> 24) & 0xFF;
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
if ( this.debug) console.log( "Sending getObject", this.next_id, oid.vid, oid.oix); if (this.debug) console.log("Sending getObject", this.next_id, oid.vid, oid.oix);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.crrSignal = function( oid, return_cb, data) { this.crrSignal = function (oid, return_cb, data) {
var buf = new Uint8Array(14); var buf = new Uint8Array(14);
buf[0] = Msg.CRR_SIGNAL; buf[0] = Msg.CRR_SIGNAL;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1859,13 +1839,13 @@ function Gdh() { ...@@ -1859,13 +1839,13 @@ function Gdh() {
buf[11] = (oid.oix >> 8) & 0xFF; buf[11] = (oid.oix >> 8) & 0xFF;
buf[12] = (oid.oix >> 16) & 0xFF; buf[12] = (oid.oix >> 16) & 0xFF;
buf[13] = (oid.oix >> 24) & 0xFF; buf[13] = (oid.oix >> 24) & 0xFF;
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
if ( this.debug) console.log( "Sending crrObject", this.next_id, oid.vid, oid.oix); if (this.debug) console.log("Sending crrObject", this.next_id, oid.vid, oid.oix);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.getOpwindMenu = function( name, return_cb, data) { this.getOpwindMenu = function (name, return_cb, data) {
var len = name.length; var len = name.length;
var buf = new Uint8Array(8 + name.length); var buf = new Uint8Array(8 + name.length);
...@@ -1877,17 +1857,16 @@ function Gdh() { ...@@ -1877,17 +1857,16 @@ function Gdh() {
buf[6] = name.length & 0xFF; buf[6] = name.length & 0xFF;
buf[7] = (name.length >> 8) & 0xFF; buf[7] = (name.length >> 8) & 0xFF;
var k = 8; var k = 8;
for ( var i = 0; i < name.length; i++) { for (var i = 0; i < name.length; i++) {
buf[k++] = name.charCodeAt(i); buf[k++] = name.charCodeAt(i);
} }
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
if ( this.debug) console.log( "Sending getOpwindMenu", this.next_id); if (this.debug) console.log("Sending getOpwindMenu", this.next_id);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
this.login = function( user, passwd, return_cb, data) { this.login = function (user, passwd, return_cb, data) {
var buf = new Uint8Array(6 + 2 + user.length + 2 + passwd.length); var buf = new Uint8Array(6 + 2 + user.length + 2 + passwd.length);
buf[0] = Msg.CHECK_USER; buf[0] = Msg.CHECK_USER;
buf[2] = this.next_id & 0xFF; buf[2] = this.next_id & 0xFF;
...@@ -1896,19 +1875,19 @@ function Gdh() { ...@@ -1896,19 +1875,19 @@ function Gdh() {
buf[5] = (this.next_id >> 24) & 0xFF; buf[5] = (this.next_id >> 24) & 0xFF;
var k = 6; var k = 6;
buf[k] = user.length & 0xFF; buf[k] = user.length & 0xFF;
buf[k+1] = (user.length >> 8) & 0xFF; buf[k + 1] = (user.length >> 8) & 0xFF;
k += 2; k += 2;
for ( var i = 0; i < user.length; i++) { for (var i = 0; i < user.length; i++) {
buf[k++] = user.charCodeAt(i); buf[k++] = user.charCodeAt(i);
} }
buf[k] = passwd.length & 0xFF; buf[k] = passwd.length & 0xFF;
buf[k+1] = (passwd.length >> 8) & 0xFF; buf[k + 1] = (passwd.length >> 8) & 0xFF;
k += 2; k += 2;
for ( var i = 0; i < passwd.length; i++) { for (var i = 0; i < passwd.length; i++) {
buf[k++] = passwd.charCodeAt(i); buf[k++] = passwd.charCodeAt(i);
} }
this.pending[this.next_id] = new PendingData( return_cb, data); this.pending[this.next_id] = new PendingData(return_cb, data);
if ( this.debug) console.log( "Sending login", this.next_id); if (this.debug) console.log("Sending login", this.next_id);
this.ws.send(buf); this.ws.send(buf);
this.next_id++; this.next_id++;
}; };
...@@ -1928,9 +1907,9 @@ function OpWindMenu() { ...@@ -1928,9 +1907,9 @@ function OpWindMenu() {
var self = this; var self = this;
this.init = function() { this.init = function () {
this.host = window.location.hostname; this.host = window.location.hostname;
if ( this.host == "") if (this.host == "")
this.host = "localhost"; this.host = "localhost";
this.gdh = new Gdh(); this.gdh = new Gdh();
...@@ -1938,11 +1917,11 @@ function OpWindMenu() { ...@@ -1938,11 +1917,11 @@ function OpWindMenu() {
this.gdh.init(); this.gdh.init();
}; };
this.is_authorized = function( access) { this.is_authorized = function (access) {
return ( this.priv & access) ? true : false; return (this.priv & access) ? true : false;
} }
this.get_opplace = function() { this.get_opplace = function () {
var query = window.location.search.substring(1); var query = window.location.search.substring(1);
console.log("query", query); console.log("query", query);
...@@ -1951,126 +1930,120 @@ function OpWindMenu() { ...@@ -1951,126 +1930,120 @@ function OpWindMenu() {
return vars[0].substring(8); return vars[0].substring(8);
}; };
this.gdh_init_cb = function() { this.gdh_init_cb = function () {
var oid = new PwrtObjid( 0, 0); var oid = new PwrtObjid(0, 0);
self.user = "Default"; self.user = "Default";
self.gdh.login( "", "", self.login_cb, self); self.gdh.login("", "", self.login_cb, self);
self.gdh.getOpwindMenu( self.get_opplace(), self.get_menu_cb, 999); self.gdh.getOpwindMenu(self.get_opplace(), self.get_menu_cb, 999);
}; };
this.add_menu_button = function( context, text) { this.add_menu_button = function (context, text) {
var button = document.createElement( "input"); var button = document.createElement("input");
button.type = "button"; button.type = "button";
button.className = "leftmenu-button"; button.className = "leftmenu-button";
button.value = text; button.value = text;
button.addEventListener( 'click', new Function( "menu.button_cb(\"" + button.value + "\")")); button.addEventListener('click', new Function("menu.button_cb(\"" + button.value + "\")"));
context.appendChild( button); context.appendChild(button);
context.appendChild( document.createElement( "br")); context.appendChild(document.createElement("br"));
return button; return button;
}; };
this.get_menu_cb = function( id, data, sts, result) { this.get_menu_cb = function (id, data, sts, result) {
self.info = result; self.info = result;
console.log( "Menu received", sts, data, result.buttons.length); console.log("Menu received", sts, data, result.buttons.length);
var context = document.getElementById("opwindmenu"); var context = document.getElementById("opwindmenu");
document.getElementById("opwind_title").innerHTML = result.title; document.getElementById("opwind_title").innerHTML = result.title;
document.getElementById("opwind_text").innerHTML = result.text; document.getElementById("opwind_text").innerHTML = result.text;
if ( result.enable_login) { if (result.enable_login) {
self.user_text = document.createTextNode( self.user + " on " + self.host); self.user_text = document.createTextNode(self.user + " on " + self.host);
context.appendChild( self.user_text); context.appendChild(self.user_text);
context.appendChild( document.createElement( "hr")); context.appendChild(document.createElement("hr"));
document.getElementById("login_button").addEventListener( "click", function( event) { document.getElementById("login_button").addEventListener("click", function (event) {
if ( document.getElementById("login_frame").style.visibility == 'hidden') { if (document.getElementById("login_frame").style.visibility == 'hidden') {
document.getElementById("login_user").value = ""; document.getElementById("login_user").value = "";
document.getElementById("login_passw").value = ""; document.getElementById("login_passw").value = "";
document.getElementById("login_frame").style.visibility='visible'; document.getElementById("login_frame").style.visibility = 'visible';
document.getElementById("login_frame").style.height='120px'; document.getElementById("login_frame").style.height = '120px';
document.getElementById("login_user").focus(); document.getElementById("login_user").focus();
} } else {
else { document.getElementById("login_frame").style.visibility = 'hidden';
document.getElementById("login_frame").style.visibility='hidden'; document.getElementById("login_frame").style.height = '0px';
document.getElementById("login_frame").style.height='0px';
} }
}); });
document.getElementById("apply_button").addEventListener( "click", function( event) { document.getElementById("apply_button").addEventListener("click", function (event) {
var user = document.getElementById("login_user").value; var user = document.getElementById("login_user").value;
var passwd = document.getElementById("login_passw").value; var passwd = document.getElementById("login_passw").value;
if ( user.trim() == "") if (user.trim() == "")
return; return;
document.getElementById("login_frame").style.visibility='hidden'; document.getElementById("login_frame").style.visibility = 'hidden';
document.getElementById("login_frame").style.height='0px'; document.getElementById("login_frame").style.height = '0px';
var c = new JopCrypt(); var c = new JopCrypt();
passwd = c.crypt( "aa", passwd); passwd = c.crypt("aa", passwd);
self.user = user; self.user = user;
self.gdh.login( user, passwd, self.login_cb, self); self.gdh.login(user, passwd, self.login_cb, self);
}); });
document.getElementById("cancel_button").addEventListener( "click", function( event) { document.getElementById("cancel_button").addEventListener("click", function (event) {
document.getElementById("login_frame").style.visibility='hidden'; document.getElementById("login_frame").style.visibility = 'hidden';
document.getElementById("login_frame").style.height='0px'; document.getElementById("login_frame").style.height = '0px';
}); });
document.getElementById("logout_button").addEventListener( "click", function( event) { document.getElementById("logout_button").addEventListener("click", function (event) {
document.getElementById("login_frame").style.visibility='hidden'; document.getElementById("login_frame").style.visibility = 'hidden';
document.getElementById("login_frame").style.height='0px'; document.getElementById("login_frame").style.height = '0px';
self.priv = 0; self.priv = 0;
self.user = "Default"; self.user = "Default";
self.gdh.login( "", "", self.login_cb, self); self.gdh.login("", "", self.login_cb, self);
}); });
document.getElementById("login_user").value = ""; document.getElementById("login_user").value = "";
document.getElementById("login_passw").value = ""; document.getElementById("login_passw").value = "";
//document.getElementById("login_frame").setAttribute("style", "visibility:hidden;height:10px"; //document.getElementById("login_frame").setAttribute("style", "visibility:hidden;height:10px";
document.getElementById("login_frame").style.visibility='hidden'; document.getElementById("login_frame").style.visibility = 'hidden';
document.getElementById("login_frame").style.height='0px'; document.getElementById("login_frame").style.height = '0px';
} } else {
else {
document.getElementById("login_button").remove(); document.getElementById("login_button").remove();
document.getElementById("login_frame").remove(); document.getElementById("login_frame").remove();
} }
if ( result.enable_language) if (result.enable_language)
self.add_menu_button( context, "Language"); self.add_menu_button(context, "Language");
if ( result.enable_alarmlist) if (result.enable_alarmlist)
self.add_menu_button( context, "AlarmList"); self.add_menu_button(context, "AlarmList");
if ( result.enable_eventlog) if (result.enable_eventlog)
self.add_menu_button( context, "EventLog"); self.add_menu_button(context, "EventLog");
if ( result.enable_navigator) if (result.enable_navigator)
self.add_menu_button( context, "Navigator"); self.add_menu_button(context, "Navigator");
if ( !result.disable_help) if (!result.disable_help)
self.add_menu_button( context, "Help"); self.add_menu_button(context, "Help");
if ( !result.disable_proview) if (!result.disable_proview)
self.add_menu_button( context, "ProviewR"); self.add_menu_button(context, "ProviewR");
context.appendChild( document.createElement( "hr")); context.appendChild(document.createElement("hr"));
var button; var button;
for ( var i = 0; i < result.buttons.length; i++) { for (var i = 0; i < result.buttons.length; i++) {
self.add_menu_button( context, result.buttons[i].text); self.add_menu_button(context, result.buttons[i].text);
} }
}; };
this.button_cb = function( text) { this.button_cb = function (text) {
if (self.info.enable_language && text == "Language") {
if ( self.info.enable_language && text == "Language") {
console.log("Language activated"); console.log("Language activated");
} } else if (self.info.enable_alarmlist && text == "AlarmList") {
else if ( self.info.enable_alarmlist && text == "AlarmList") {
console.log("AlarmList activated"); console.log("AlarmList activated");
if ( !(self.is_authorized( Pwr.mAccess_RtRead | Pwr.mAccess_RtWrite | if (!(self.is_authorized(Pwr.mAccess_RtRead | Pwr.mAccess_RtWrite |
Pwr.mAccess_AllOperators | Pwr.mAccess_AllOperators |
Pwr.mAccess_System | Pwr.mAccess_Maintenance | Pwr.mAccess_System | Pwr.mAccess_Maintenance |
Pwr.mAccess_Process | Pwr.mAccess_Instrument))) Pwr.mAccess_Process | Pwr.mAccess_Instrument)))
window.alert("Not authorized for this operation"); window.alert("Not authorized for this operation");
else else
window.alert("Not yet implemented"); window.alert("Not yet implemented");
} } else if (self.info.enable_eventlog && text == "EventLog") {
else if ( self.info.enable_eventlog && text == "EventLog") {
console.log("EventLog activated"); console.log("EventLog activated");
if ( !(self.is_authorized( Pwr.mAccess_RtRead | Pwr.mAccess_RtWrite | if (!(self.is_authorized(Pwr.mAccess_RtRead | Pwr.mAccess_RtWrite |
Pwr.mAccess_AllOperators | Pwr.mAccess_AllOperators |
Pwr.mAccess_System | Pwr.mAccess_Maintenance | Pwr.mAccess_System | Pwr.mAccess_Maintenance |
Pwr.mAccess_Process | Pwr.mAccess_Instrument))) Pwr.mAccess_Process | Pwr.mAccess_Instrument)))
...@@ -2078,41 +2051,37 @@ function OpWindMenu() { ...@@ -2078,41 +2051,37 @@ function OpWindMenu() {
window.alert("Not authorized for this operation"); window.alert("Not authorized for this operation");
else else
window.alert("Not yet implemented"); window.alert("Not yet implemented");
} } else if (self.info.enable_navigator && text == "Navigator") {
else if ( self.info.enable_navigator && text == "Navigator") {
console.log("Navigator activated"); console.log("Navigator activated");
if ( !(self.is_authorized( Pwr.mAccess_RtNavigator | if (!(self.is_authorized(Pwr.mAccess_RtNavigator |
Pwr.mAccess_System | Pwr.mAccess_Maintenance | Pwr.mAccess_System | Pwr.mAccess_Maintenance |
Pwr.mAccess_Process | Pwr.mAccess_Instrument))) Pwr.mAccess_Process | Pwr.mAccess_Instrument)))
window.alert("Not authorized for this operation"); window.alert("Not authorized for this operation");
else else
window.open( "xtt.html", "_blank"); window.open("xtt.html", "_blank");
} } else if (!self.info.disable_help && text == "Help") {
else if ( !self.info.disable_help && text == "Help") {
console.log("Help activated"); console.log("Help activated");
window.open( "xtt_help_index.html", "_blank"); window.open("xtt_help_index.html", "_blank");
} } else if (!self.info.disable_proview && text == "ProviewR") {
else if ( !self.info.disable_proview && text == "ProviewR") {
console.log("ProviewR activated"); console.log("ProviewR activated");
window.open( "http://www.proview.se", "_blank"); window.open("http://www.proview.se", "_blank");
} } else {
else { if (!(self.is_authorized(Pwr.mAccess_RtRead | Pwr.mAccess_RtWrite |
if ( !(self.is_authorized( Pwr.mAccess_RtRead | Pwr.mAccess_RtWrite |
Pwr.mAccess_AllOperators | Pwr.mAccess_AllOperators |
Pwr.mAccess_System | Pwr.mAccess_Maintenance | Pwr.mAccess_System | Pwr.mAccess_Maintenance |
Pwr.mAccess_Process | Pwr.mAccess_Instrument))) Pwr.mAccess_Process | Pwr.mAccess_Instrument)))
window.alert("Not authorized for this operation"); window.alert("Not authorized for this operation");
else { else {
for ( var i = 0; i < self.info.buttons.length; i++) { for (var i = 0; i < self.info.buttons.length; i++) {
if ( self.info.buttons[i].text == text) { if (self.info.buttons[i].text == text) {
console.log("Found", self.info.buttons[i].text); console.log("Found", self.info.buttons[i].text);
var name = self.info.buttons[i].name; var name = self.info.buttons[i].name;
var n = name.indexOf(".pwg"); var n = name.indexOf(".pwg");
if ( n != -1) if (n != -1)
name = name.substring(0,n); name = name.substring(0, n);
var url = "ge.html?graph=" + name; var url = "ge.html?graph=" + name;
console.log("url", url); console.log("url", url);
window.open( url, "_blank"); window.open(url, "_blank");
break; break;
} }
} }
...@@ -2120,30 +2089,27 @@ function OpWindMenu() { ...@@ -2120,30 +2089,27 @@ function OpWindMenu() {
} }
}; };
this.login_cb = function( id, data, sts, result) { this.login_cb = function (id, data, sts, result) {
console.log( "Login:", sts, result); console.log("Login:", sts, result);
if ( sts & 1) { if (sts & 1) {
self.priv = result; self.priv = result;
sessionStorage.setItem("pwr_privilege", self.priv); sessionStorage.setItem("pwr_privilege", self.priv);
if ( self.user_text != null) if (self.user_text != null)
self.user_text.textContent = self.user + " on " + self.host; self.user_text.textContent = self.user + " on " + self.host;
console.log( "Login", self.user, "Priv", self.priv); console.log("Login", self.user, "Priv", self.priv);
} } else {
else {
self.priv = 0; self.priv = 0;
self.user = "none"; self.user = "none";
sessionStorage.setItem("pwr_privilege", self.priv); sessionStorage.setItem("pwr_privilege", self.priv);
if ( self.user_text != null) if (self.user_text != null)
self.user_text.textContent = "None on " + self.host; self.user_text.textContent = "None on " + self.host;
console.log( "Login failure", "Priv", self.priv); console.log("Login failure", "Priv", self.priv);
} }
}; };
} }
var menu = new OpWindMenu(); var menu = new OpWindMenu();
menu.init(); menu.init();
/** End OpWind **/ /** End OpWind **/
java/jsw/xtt/src/xtt.js
View file @ 5d22cf54
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7