From b7d9047c9c45098979837366fa642063204b8a48 Mon Sep 17 00:00:00 2001 From: Andrea Bogazzi Date: Mon, 14 Aug 2017 13:42:17 +0200 Subject: [PATCH] Put window.fabric under a build flag (#4199) * moved global in a module * fix package.json --- HEADER.js | 2 -- build.js | 2 +- package.json | 2 +- src/globalFabric.js | 4 ++++ 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 src/globalFabric.js diff --git a/HEADER.js b/HEADER.js index a4eacb1d..ac2af58c 100644 --- a/HEADER.js +++ b/HEADER.js @@ -8,8 +8,6 @@ if (typeof exports !== 'undefined') { if (typeof document !== 'undefined' && typeof window !== 'undefined') { fabric.document = document; fabric.window = window; - // ensure globality even if entire library were function wrapped (as in Meteor.js packaging system) - window.fabric = fabric; } else { // assume we're running under node.js when document/window are not present diff --git a/build.js b/build.js index 2e3c3ac2..bc7b928d 100644 --- a/build.js +++ b/build.js @@ -123,7 +123,7 @@ function ifSpecifiedAMDInclude(amdLib) { var filesToInclude = [ 'HEADER.js', - + ifSpecifiedInclude('global', 'src/globalFabric.js'), ifSpecifiedInclude('gestures', 'lib/event.js'), 'src/mixins/observable.mixin.js', diff --git a/package.json b/package.json index 7ccd184a..d1573c96 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ }, "license": "MIT", "scripts": { - "build": "node build.js modules=ALL exclude=json,gestures,accessors", + "build": "node build.js modules=ALL exclude=gestures,accessors", "build:watch": "onchange 'src/**/**' 'HEADER.js' 'lib/**/**' -- npm run build_export", "build_with_gestures": "node build.js modules=ALL exclude=json", "build_export": "npm run build && npm run export_dist_to_site", diff --git a/src/globalFabric.js b/src/globalFabric.js new file mode 100644 index 00000000..525356d9 --- /dev/null +++ b/src/globalFabric.js @@ -0,0 +1,4 @@ +if (typeof document !== 'undefined' && typeof window !== 'undefined') { + // ensure globality even if entire library were function wrapped (as in Meteor.js packaging system) + window.fabric = fabric; +}