Skip to content

Window defensiveness #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 2, 2016
Merged

Window defensiveness #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc07d80
Be defensive against window being undefined
LewisJEllis Nov 30, 2016
1be00c4
Tracekit window defensiveness
LewisJEllis Nov 30, 2016
a9a9c20
Add comments on window defensiveness
LewisJEllis Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/raven.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ function now() {
return +new Date();
}

var _window = typeof window !== 'undefined' ? window : undefined;
var _document = _window && _window.document;
// This is to be defensive in environments where window does not exist (see https://github.com/getsentry/raven-js/pull/785)
var _window = typeof window !== 'undefined' ? window
: typeof global !== 'undefined' ? global
: typeof self !== 'undefined' ? self
: {};
var _document = _window.document;

// First, check for JSON support
// If there is no JSON, we no-op the core features of Raven
Expand Down
9 changes: 7 additions & 2 deletions src/singleton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@

var RavenConstructor = require('./raven');

var _Raven = window.Raven;
// This is to be defensive in environments where window does not exist (see https://github.com/getsentry/raven-js/pull/785)
var _window = typeof window !== 'undefined' ? window
: typeof global !== 'undefined' ? global
: typeof self !== 'undefined' ? self
: {};
var _Raven = _window.Raven;

var Raven = new RavenConstructor();

Expand All @@ -19,7 +24,7 @@ var Raven = new RavenConstructor();
* @return {Raven}
*/
Raven.noConflict = function () {
window.Raven = _Raven;
_window.Raven = _Raven;
return Raven;
};

Expand Down
12 changes: 9 additions & 3 deletions vendor/TraceKit/tracekit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ var TraceKit = {
debug: false
};

// This is to be defensive in environments where window does not exist (see https://github.com/getsentry/raven-js/pull/785)
var _window = typeof window !== 'undefined' ? window
: typeof global !== 'undefined' ? global
: typeof self !== 'undefined' ? self
: {};

// global reference to slice
var _slice = [].slice;
var UNKNOWN_FUNCTION = '?';
Expand Down Expand Up @@ -188,8 +194,8 @@ TraceKit.report = (function reportModuleWrapper() {
if (_onErrorHandlerInstalled) {
return;
}
_oldOnerrorHandler = window.onerror;
window.onerror = traceKitWindowOnError;
_oldOnerrorHandler = _window.onerror;
_window.onerror = traceKitWindowOnError;
_onErrorHandlerInstalled = true;
}

Expand All @@ -198,7 +204,7 @@ TraceKit.report = (function reportModuleWrapper() {
if (!_onErrorHandlerInstalled) {
return;
}
window.onerror = _oldOnerrorHandler;
_window.onerror = _oldOnerrorHandler;
_onErrorHandlerInstalled = false;
_oldOnerrorHandler = undefined;
}
Expand Down