diff options
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/Ice/IncomingAsync.js | 2 | ||||
| -rw-r--r-- | js/src/Ice/Instance.js | 4 | ||||
| -rw-r--r-- | js/src/Ice/Long.js | 4 | ||||
| -rw-r--r-- | js/src/Ice/StringUtil.js | 6 | ||||
| -rw-r--r-- | js/src/Ice/Value.js | 11 | ||||
| -rw-r--r-- | js/src/Ice/browser/ModuleRegistry.js | 12 |
6 files changed, 22 insertions, 17 deletions
diff --git a/js/src/Ice/IncomingAsync.js b/js/src/Ice/IncomingAsync.js index 4ef1526eb44..cd03834bf9f 100644 --- a/js/src/Ice/IncomingAsync.js +++ b/js/src/Ice/IncomingAsync.js @@ -522,7 +522,7 @@ class IncomingAsync Debug.assert(this._connection !== null); - if(exc != null) + if(exc !== null) { this.handleException(exc, amd); } diff --git a/js/src/Ice/Instance.js b/js/src/Ice/Instance.js index 863ac578055..7e3ca7e704b 100644 --- a/js/src/Ice/Instance.js +++ b/js/src/Ice/Instance.js @@ -359,11 +359,11 @@ class Instance const toStringModeStr = this._initData.properties.getPropertyWithDefault("Ice.ToStringMode", "Unicode"); if(toStringModeStr === "ASCII") { - _toStringMode = Ice.ToStringMode.ASCII; + this._toStringMode = Ice.ToStringMode.ASCII; } else if(toStringModeStr === "Compat") { - _toStringMode = Ice.ToStringMode.Compat; + this._toStringMode = Ice.ToStringMode.Compat; } else if(toStringModeStr !== "Unicode") { diff --git a/js/src/Ice/Long.js b/js/src/Ice/Long.js index cf748c8c4ba..02fab7929bc 100644 --- a/js/src/Ice/Long.js +++ b/js/src/Ice/Long.js @@ -23,7 +23,7 @@ class Long // If two arguments are provided we asume these are the high and low words // respectively. // - constructor(high = 0, low) + constructor(high = 0, low = undefined) { if(!Number.isSafeInteger(high)) { @@ -90,7 +90,7 @@ class Long { return Number.NEGATIVE_INFINITY; } - return -((h * Long.HIGH_MASK) + l + 1) + return -((h * Long.HIGH_MASK) + l + 1); } else { diff --git a/js/src/Ice/StringUtil.js b/js/src/Ice/StringUtil.js index 0f125dc3e02..875a8be63ca 100644 --- a/js/src/Ice/StringUtil.js +++ b/js/src/Ice/StringUtil.js @@ -419,7 +419,7 @@ function checkChar(s, pos) msg += " has invalid ordinal value" + c; throw new Error(msg); } - return s.charAt(pos) + return s.charAt(pos); } // // Decode the character or escape sequence starting at start and appends it to result; @@ -483,13 +483,13 @@ function decodeChar(s, start, end, special, result) case 'r': { ++start; - result.push("\r") + result.push("\r"); break; } case 't': { ++start; - result.push("\t") + result.push("\t"); break; } case 'v': diff --git a/js/src/Ice/Value.js b/js/src/Ice/Value.js index 93431f950f3..04a1fbbfcd7 100644 --- a/js/src/Ice/Value.js +++ b/js/src/Ice/Value.js @@ -172,8 +172,7 @@ function readPreserved(is) is.startValue(); readImpl(this, is, this._iceMostDerivedType()); this._iceSlicedData = is.endValue(true); -}; - +} const Slice = Ice.Slice; @@ -188,17 +187,17 @@ Slice.defineValue = function(valueType, id, preserved, compactId = 0) valueType.prototype.ice_id = function() { return id; - } + }; valueType.prototype._iceMostDerivedType = function() { return valueType; - } + }; valueType.ice_staticId = function() { return id; - } + }; if(preserved) { @@ -210,7 +209,7 @@ Slice.defineValue = function(valueType, id, preserved, compactId = 0) { Ice.CompactIdRegistry.set(compactId, id); } -} +}; Slice.defineValue(Ice.Value, "::Ice::Object"); module.exports.Ice = Ice;
\ No newline at end of file diff --git a/js/src/Ice/browser/ModuleRegistry.js b/js/src/Ice/browser/ModuleRegistry.js index 006b28a937f..ac1d676d2c4 100644 --- a/js/src/Ice/browser/ModuleRegistry.js +++ b/js/src/Ice/browser/ModuleRegistry.js @@ -7,9 +7,15 @@ // // ********************************************************************** -/* globals self */ -const root = typeof(window) !== "undefined" ? window : typeof(global) !== "undefined" ? global : typeof(self) !== "undefined" ? self : {}; -/* globals -self */ +/* global + self : false +*/ +const root = typeof(window) !== "undefined" ? window : + typeof(global) !== "undefined" ? global : + typeof(self) !== "undefined" ? self : {}; +/* global + self : true +*/ class _ModuleRegistry { |