From b627b7c6c60f5fb24d73c8915b73e4d9e0fd176d Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Mon, 17 Apr 2017 17:31:03 -0700 Subject: [PATCH] Undo PR: make flatbuffers.js into a UMD module (#4228) This PR did not work in all JS environments and caused downstream breakage. Change-Id: Ib565129e26622d02bad2d45816bd05f6b961b994 --- js/flatbuffers.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/js/flatbuffers.js b/js/flatbuffers.js index 2bb36eac6..ccbd362ab 100644 --- a/js/flatbuffers.js +++ b/js/flatbuffers.js @@ -3,14 +3,18 @@ /// @{ /// @cond FLATBUFFERS_INTERNAL -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = { flatbuffers: factory() } : - typeof define === 'function' && define.amd ? define(factory) : - (global.flatbuffers = factory()); -}(this, (function () { 'use strict'; /** -* @exports flatbuffers -*/ + * @fileoverview + * + * Need to suppress 'global this' error so the Node.js export line doesn't cause + * closure compile to error out. + * @suppress {globalThis} + */ + +/** + * @const + * @namespace + */ var flatbuffers = {}; /** @@ -1185,9 +1189,8 @@ flatbuffers.ByteBuffer.prototype.createLong = function(low, high) { return flatbuffers.Long.create(low, high); }; -return flatbuffers; - -}))); +// Exports for Node.js and RequireJS +this.flatbuffers = flatbuffers; /// @endcond /// @}