55a065e · project-m36 · git.iko.soy

git.iko.soy/project-m36

fix flipped logic for eval button in websocket client

commit55a065efb40a62d74cf90e5d12c38802efed6800 authorAgentM <agentm@themactionfaction.com> dateSat 28 Jan 2017, 11:13 (10 years ago) parent2bb187d

2 files changed+26−2

compare with master

unifiedsplit

src/bin/ProjectM36/Server/WebSocket/project-m36.js+9−1 src/bin/ProjectM36/Server/WebSocket/websocket-client.js+17−1

src/bin/ProjectM36/Server/WebSocket/project-m36.js+9−1

@@ -4,7 +4,15 @@ var ProjectM36Connection = function (protocol, host, port, path, dbname, openCal

44 this.port = port;

55 this.path = path;

66 this.dbname = dbname;

7− var connectURL = protocol + '://' + host + ":" + port + "/" + path;

7+ var connectURL = protocol + '://' + host;

8+ if(port)

9+ {

10+ connectURL = connectURL + ":" + port;

11+ }

12+ if(path)

13+ {

14+ connectURL = connectURL + "/" + path;

15+ }

816 var socket = new WebSocket(connectURL);

917 var self = this;

1018 socket.onopen = function(event) {

src/bin/ProjectM36/Server/WebSocket/websocket-client.js+17−1

@@ -109,8 +109,8 @@ function toggleConnectionFields(form, enabled, status)

109109 form.elements["dbname"],

110110 form.elements["path"]];

111111 var disableElements = [form.elements["protocol"],

112− document.getElementById("eval")

113112 ]

113+ var enableElements = [document.getElementById("eval")];

114114

115115 for(var ein=0; ein < readonlyElements.length; ein++)

116116 {

@@ -139,6 +139,22 @@ function toggleConnectionFields(form, enabled, status)

139139 }

140140 }

141141

142+ for(var ein=0; ein < enableElements.length; ein++)

143+ {

144+ var e = enableElements[ein];

145+ if(!enabled)

146+ {

147+ e.removeAttribute("disabled");

148+ }

149+ else

150+ {

151+ e.setAttribute("disabled", "disabled");

152+

153+ }

154+ }

155+

156+

157+

142158}

143159

144160function connectionOpened(event)