Fix #982: Make sure self points to the global scope on Webpack.

This commit is contained in:
Jürg Lehni 2016-02-17 19:06:29 +01:00
parent 6df4602b2b
commit b5c837bb87
2 changed files with 5 additions and 5 deletions

View file

@ -17,10 +17,10 @@
// their shared scope. // their shared scope.
/* global document:true, window:true */ /* global document:true, window:true */
// Use typeof self to detect both browsers and web-workers. // Create a window variable valid in the paper.js scope, that points to the
// In workers, window will then be null, so we can use the validity of the // native window in browsers and the emulated JSDom one in node.js
// window object to decide if we're in a worker-like context in the rest of // In workers, window is null (but self is defined), so we can use the validity
// the library. // of the local window object to detect a worker-like context in the library.
var window = self ? self.window : require('./node/window'), var window = self ? self.window : require('./node/window'),
document = window && window.document; document = window && window.document;
// Make sure 'self' always points to a window object, also on Node.js. // Make sure 'self' always points to a window object, also on Node.js.

View file

@ -123,4 +123,4 @@ var paper = function(self, undefined) {
/*#*/ include('export.js'); /*#*/ include('export.js');
return paper; return paper;
}(this.self); }(typeof self === 'object' ? self : null);