Skip to content

Commit

Permalink
Detect node in one place
Browse files Browse the repository at this point in the history
  • Loading branch information
petkaantonov committed Feb 2, 2015
1 parent 751c7bd commit 98b0252
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
8 changes: 3 additions & 5 deletions src/captured_trace.js
Expand Up @@ -2,7 +2,7 @@
module.exports = function() {
var async = require("./async.js");
var ASSERT = require("./assert.js");
var inherits = require("./util.js").inherits;
var util = require("./util.js");
var bluebirdFramePattern =
/[\\\/]bluebird[\\\/]js[\\\/](main|debug|zalgo|instrumented)/;
var stackFramePattern = null;
Expand All @@ -18,7 +18,7 @@ function CapturedTrace(parent) {
// there must be cycles
if (length > 32) this.uncycle();
}
inherits(CapturedTrace, Error);
util.inherits(CapturedTrace, Error);

CapturedTrace.prototype.uncycle = function() {
var length = this._length;
Expand Down Expand Up @@ -435,9 +435,7 @@ var captureStackTrace = (function stackDetection() {

var fireDomEvent;
var fireGlobalEvent = (function() {
if (typeof process !== "undefined" &&
typeof process.version === "string" &&
typeof window === "undefined") {
if (util.isNode) {
return function(name, reason, promise) {
if (name === REJECTION_HANDLED_EVENT) {
return process.emit(name, promise);
Expand Down
10 changes: 3 additions & 7 deletions src/debuggability.js
Expand Up @@ -7,13 +7,9 @@ var ASSERT = require("./assert.js");
var canAttachTrace = util.canAttachTrace;
var unhandledRejectionHandled;
var possiblyUnhandledRejection;
var debugging = __DEBUG__ || !!(
typeof process !== "undefined" &&
typeof process.execPath === "string" &&
typeof process.env === "object" &&
(process.env["BLUEBIRD_DEBUG"] ||
process.env["NODE_ENV"] === "development")
);
var debugging = __DEBUG__ || (util.isNode &&
(!!process.env["BLUEBIRD_DEBUG"] ||
process.env["NODE_ENV"] === "development"));

Promise.prototype._ensurePossibleRejectionHandled = function () {
this._setRejectionIsUnhandled();
Expand Down
1 change: 0 additions & 1 deletion src/promise.js
Expand Up @@ -37,7 +37,6 @@ var PromiseResolver = require("./promise_resolver.js");
var nodebackForPromise = PromiseResolver._nodebackForPromise;
var errorObj = util.errorObj;
var tryCatch = util.tryCatch;

function Promise(resolver) {
if (typeof resolver !== "function") {
throw new TypeError(CONSTRUCT_ERROR_ARG);
Expand Down
2 changes: 1 addition & 1 deletion src/schedule.js
@@ -1,6 +1,6 @@
"use strict";
var schedule;
if (typeof process === "object" && typeof process.version === "string") {
if (require("./util.js").isNode) {
var version = process.version.split(".").map(Number);
schedule = (version[0] === 0 && version[1] > 10) || (version[0] > 0)
? global.setImmediate : process.nextTick;
Expand Down
4 changes: 3 additions & 1 deletion src/util.js
Expand Up @@ -269,7 +269,9 @@ var ret = {
ensureErrorObject: ensureErrorObject,
originatesFromRejection: originatesFromRejection,
markAsOriginatingFromRejection: markAsOriginatingFromRejection,
classString: classString
classString: classString,
isNode: typeof process !== "undefined" &&
classString(process).toLowerCase() === "[object process]"
};
try {throw new Error(); } catch (e) {ret.lastLineError = e;}
module.exports = ret;

0 comments on commit 98b0252

Please sign in to comment.