Merge pull request #75 from apiaryio/kylef/module

Allow overriding `Module` and environment
apiaryio · Jan 24, 2017 · 261d366 · 261d366
2 parents fd267fa + ecec969
commit 261d366
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # drafter.js Changelog
 
+## 2.6.4
+
+### Bug Fixes
+
+- Drafter.js will no longer override `Module` allowing drafter.js users to
+  [override the emscripten execution
+  environment](https://kripken.github.io/emscripten-site/docs/api_reference/module.html#overriding-execution-environment).
+
+
 ## 2.6.3
 
 This update now uses Drafter 3.2.3. Please see [Drafter

diff --git a/ext/drafter b/ext/drafter
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drafter.js",
-  "version": "2.6.3",
+  "version": "2.6.4",
   "description": "Pure JS Drafter built with Emscripten",
   "main": "lib/drafter.nomem.js",
   "scripts": {

diff --git a/src/pre.js b/src/pre.js
@@ -1,6 +1,10 @@
-var Module = {
-    'ready': false,
-    'log': function(text) { console.log('drafter.js: ' + text); },
-    'logErr': function(text) { console.error('drafter.js: ' + text); },
-    'onRuntimeInitialized': function() { this.ready = true; }
-};
+var Module;
+
+if (!Module) {
+  Module = {};
+}
+
+Module['ready'] = false;
+Module['log'] = function(text) { console.log('drafter.js: ' + text); };
+Module['logErr'] = function(text) { console.error('drafter.js: ' + text); };
+Module['onRuntimeInitialized'] = function() { this.ready = true; };
+0 −19		CHANGELOG.md
+1 −1		ext/snowcrash
+0 −4		features/step_definitions/file_content_step.rb
+1 −1		src/Version.h
+1 −1		tools/homebrew/drafter.rb