Skip to content

Commit 1e3c535

Browse files
author
Daniel Wirtz
committed
Uint64 support, Long.js>=1.1.0
1 parent e8a6706 commit 1e3c535

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

ByteBuffer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,7 @@
17831783
/** @expose */
17841784
module["exports"] = loadByteBuffer(require("long"));
17851785
} else if (typeof define != 'undefined' && define["amd"]) { // AMD
1786-
define("ByteBuffer", ["Long"], function(Long) { return loadByteBuffer(Long); });
1786+
define("ByteBuffer", ["Math/Long"], function(Long) { return loadByteBuffer(Long); });
17871787
} else { // Shim
17881788
if (!global["dcodeIO"]) {
17891789
/** @expose */

ByteBuffer.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ByteBuffer.min.map

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

ByteBuffer.noexpose.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,7 @@
16811681
if (typeof module != 'undefined' && module["exports"]) { // CommonJS
16821682
module["exports"] = loadByteBuffer(require("long"));
16831683
} else if (typeof define != 'undefined' && define["amd"]) { // AMD
1684-
define("ByteBuffer", ["Long"], function(Long) { return loadByteBuffer(Long); });
1684+
define("ByteBuffer", ["Math/Long"], function(Long) { return loadByteBuffer(Long); });
16851685
} else { // Shim
16861686
if (!global["dcodeIO"]) {
16871687
global["dcodeIO"] = {};

src/ByteBuffer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1783,7 +1783,7 @@
17831783
/** @expose */
17841784
module["exports"] = loadByteBuffer(require("long"));
17851785
} else if (typeof define != 'undefined' && define["amd"]) { // AMD
1786-
define("ByteBuffer", ["Long"], function(Long) { return loadByteBuffer(Long); });
1786+
define("ByteBuffer", ["Math/Long"], function(Long) { return loadByteBuffer(Long); });
17871787
} else { // Shim
17881788
if (!global["dcodeIO"]) {
17891789
/** @expose */

tests/suite.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -659,17 +659,17 @@ var suite = {
659659
var sandbox = new Sandbox({
660660
require: function() {},
661661
define: (function() {
662-
function define() {
663-
define.called = true;
662+
function define(moduleName, dependencies, constructor) {
663+
define.called = [moduleName, dependencies];
664664
}
665665
define.amd = true;
666-
define.called = false;
666+
define.called = null;
667667
return define;
668668
})()
669669
});
670670
vm.runInNewContext(code, sandbox, "ByteBuffer.js in AMD-VM");
671671
// console.log(util.inspect(sandbox));
672-
test.ok(sandbox.define.called == true);
672+
test.ok(sandbox.define.called && sandbox.define.called[0] == "ByteBuffer" && sandbox.define.called[1][0] == "Math/Long");
673673
test.done();
674674
},
675675

0 commit comments

Comments
 (0)