ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
JoelKatz
2013-02-13 05:28:16 -08:00
parent ca57bf8290 85f9f67865
commit cf02cfd089
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/remote.js
View File

@@ -395,11 +395,13 @@ Remote.prototype.ledger_hash = function () {
// Stop from open state.
Remote.prototype._connect_stop = function () {
delete this.ws.onerror;
delete this.ws.onclose;
if (this.ws) {
delete this.ws.onerror;
delete this.ws.onclose;
this.ws.terminate();
delete this.ws;
this.ws.close();
delete this.ws;
}
this._set_state('offline');
};
@@ -458,6 +460,12 @@ Remote.prototype._connect_start = function () {
if (this.trace) console.log("remote: connect: %s", url);
// There should not be an active connection at this point, but if there is
// we will shut it down so we don't end up with a duplicate.
if (this.ws) {
this._connect_stop();
}
var WebSocket = require('ws');
var ws = this.ws = new WebSocket(url);

10
src/js/transaction.js
View File

@@ -401,8 +401,8 @@ Transaction.prototype.destination_tag = function (tag) {
Transaction._path_rewrite = function (path) {
var path_new = [];
for (var index in path) {
var node = path[index];
for (var i = 0, l = path.length; i < l; i++) {
var node = path[i];
var node_new = {};
if ('account' in node)
@@ -421,7 +421,7 @@ Transaction._path_rewrite = function (path) {
}
Transaction.prototype.path_add = function (path) {
this.tx_json.Paths = this.tx_json.Paths || []
this.tx_json.Paths = this.tx_json.Paths || [];
this.tx_json.Paths.push(Transaction._path_rewrite(path));
return this;
@@ -430,8 +430,8 @@ Transaction.prototype.path_add = function (path) {
// --> paths: undefined or array of path
// A path is an array of objects containing some combination of: account, currency, issuer
Transaction.prototype.paths = function (paths) {
for (var index in paths) {
this.path_add(paths[index]);
for (var i = 0, l = paths.length; i < l; i++) {
this.path_add(paths[i]);
}
return this;