Fixing globals

Author: mattpodwysocki

src/modular/dist/rx.all.js

@@ -63,6 +63,7 @@ Observable.addToPrototype({
   combineLatest: require('./observable/combinelatest'),
   concat: require('./observable/concat'),
   concatAll: require('./observable/concatall'),
+  controlled: require('./observable/controlled'),
   count: require('./observable/count'),
   debounce: require('./observable/debounce'),
   defaultIfEmpty: require('./observable/defaultifempty'),

src/modular/dist/rx.all.min.js

@@ -1,9 +1,7 @@
 'use strict';
 
 var isFunction = require('../helpers/isfunction');
-
-global._Rx || (global._Rx = {});
-var errorObj = global._Rx.errorObj = {e: {}};
+var errorObj = module.exports.errorObj = {e: {}};
 
 function tryCatcherGen(tryCatchTarget) {
   return function tryCatcher() {
@@ -16,16 +14,11 @@ function tryCatcherGen(tryCatchTarget) {
   };
 }
 
-function tryCatch(fn) {
+module.exports.tryCatch = function tryCatch(fn) {
   if (!isFunction(fn)) { throw new TypeError('fn must be a function'); }
   return tryCatcherGen(fn);
-}
+};
 
-function thrower(e) {
+module.exports.thrower = function thrower(e) {
   throw e;
-}
-
-module.exports = {
-  tryCatch: tryCatch,
-  thrower: thrower
 };

src/modular/dist/rx.js

@@ -2,7 +2,8 @@
 
 var ActivePlan = require('./activeplan');
 var JoinObserver = require('./joinobserver');
-var tryCatch = require('../internal/trycatchutils').tryCatch;
+var tryCatchUtils = require('../internal/trycatchutils');
+var tryCatch = tryCatchUtils.tryCatch, errorObj = tryCatchUtils.errorObj;
 
 function planCreateObserver(externalSubscriptions, observable, onError) {
   var entry = externalSubscriptions.get(observable);
@@ -23,7 +24,7 @@ function handleOnError(o) { return function (e) { o.onError(e); }; }
 function handleOnNext(self, observer) {
   return function onNext () {
     var result = tryCatch(self._selector).apply(self, arguments);
-    if (result === global._Rx.errorObj) { return observer.onError(result.e); }
+    if (result === errorObj) { return observer.onError(result.e); }
     observer.onNext(result);
   };
 }

src/modular/dist/rx.lite.js

@@ -2,7 +2,8 @@
 
 var ObservableBase = require('./observablebase');
 var AbstractObserver = require('../observer/abstractobserver');
-var tryCatch = require('../internal/trycatchutils').tryCatch;
+var tryCatchUtils = require('../internal/trycatchutils');
+var tryCatch = tryCatchUtils.tryCatch, errorObj = tryCatchUtils.errorObj;
 var inherits = require('inherits');
 
 function ExtremaByObserver(o, k, c) {
@@ -19,14 +20,14 @@ inherits(ExtremaByObserver, AbstractObserver);
 
 ExtremaByObserver.prototype.next = function (x) {
   var key = tryCatch(this._k)(x);
-  if (key === global._Rx.errorObj) { return this._o.onError(key.e); }
+  if (key === errorObj) { return this._o.onError(key.e); }
   var comparison = 0;
   if (!this._hv) {
     this._hv = true;
     this._v = key;
   } else {
     comparison = tryCatch(this._c)(key, this._v);
-    if (comparison === global._Rx.errorObj) { return this._o.onError(comparison.e); }
+    if (comparison === errorObj) { return this._o.onError(comparison.e); }
   }
   if (comparison > 0) {
     this._v = key;