Refixing Issue Reactive-Extensions#37

Author: mattpodwysocki

Gruntfile.js

@@ -23,8 +23,8 @@ module.exports = function (grunt) {
       basic: {
         src: [
           'src/license.js',
-          'src/basicheader.js',
           'src/intro.js',
+          'src/basicheader.js',
           'src/module.js',
           'src/factory.js',
           'src/observeonscope.js',

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "rx-angular",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": "rx.angular.js",
   "dependencies": {
     "Rx": "*"

package.json

@@ -2,7 +2,7 @@
   "name": "rx-angular",
   "title": "The Reactive Extensions Bindings for the AngularJS.",
   "description": "Library for bridging between RxJS and AngularJS.",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "homepage": "https://github.com/Reactive-Extensions/rx.angular.js",
   "author": {
     "name": "MS Open Tech"

rx.angular.js

@@ -1,25 +1,24 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
-  var Rx = window.Rx,
-    observable = Rx.Observable,
-    observableProto = observable.prototype,
-    observableCreate = observable.create,
-    disposableCreate = Rx.Disposable.create,
-    SingleAssignmentDisposable = Rx.SingleAssignmentDisposable,
-    CompositeDisposable = Rx.CompositeDisposable,
-    Scheduler = Rx.Scheduler,
-    noop = Rx.helpers.noop;
-
-  // Utilities
-  var toString = Object.prototype.toString,
-    slice = Array.prototype.slice;
+;(function (root, factory) {
+  var objectTypes = {
+    'boolean': false,
+    'function': true,
+    'object': true,
+    'number': false,
+    'string': false,
+    'undefined': false
+  };
 
-  function isFunction (fn) {
-    return toString.call(fn) === '[object Function]';
+  var root = (objectTypes[typeof window] && window) || this,
+    freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports,
+    freeModule = objectTypes[typeof module] && module && !module.nodeType && module,
+    moduleExports = freeModule && freeModule.exports === freeExports && freeExports,
+    freeGlobal = objectTypes[typeof global] && global;
+  
+  if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal)) {
+    root = freeGlobal;
   }
-;(function (root, factory) {
-  var freeExports = typeof exports == 'object' && exports &&
-  (typeof root == 'object' && root && root == root.global && (window = root), exports);
 
   // Because of build optimizers
   if (typeof define === 'function' && define.amd) {
@@ -30,10 +29,26 @@
   } else if (typeof module == 'object' && module && module.exports == freeExports) {
     module.exports = factory(root, module.exports, require('rx'), require('angular'));
   } else {
-    root.Rx = factory(root, {}, root.Rx, angular);
+    root.Rx = factory(root, {}, root.Rx, root.angular);
   }
 }(this, function (global, exp, Rx, angular, undefined) {
 
+  var observable = Rx.Observable,
+    observableProto = observable.prototype,
+    observableCreate = observable.create,
+    disposableCreate = Rx.Disposable.create,
+    SingleAssignmentDisposable = Rx.SingleAssignmentDisposable,
+    CompositeDisposable = Rx.CompositeDisposable,
+    Scheduler = Rx.Scheduler,
+    noop = Rx.helpers.noop;
+
+  // Utilities
+  var toString = Object.prototype.toString,
+    slice = Array.prototype.slice;
+
+  function isFunction (fn) {
+    return toString.call(fn) === '[object Function]';
+  }
   /**
    * @ngdoc overview
    * @name rx

rx.angular.min.js

@@ -1,5 +1,4 @@
-  var Rx = window.Rx,
-    observable = Rx.Observable,
+  var observable = Rx.Observable,
     observableProto = observable.prototype,
     observableCreate = observable.create,
     disposableCreate = Rx.Disposable.create,

src/basicheader.js

@@ -1,6 +1,22 @@
 ;(function (root, factory) {
-  var freeExports = typeof exports == 'object' && exports &&
-  (typeof root == 'object' && root && root == root.global && (window = root), exports);
+  var objectTypes = {
+    'boolean': false,
+    'function': true,
+    'object': true,
+    'number': false,
+    'string': false,
+    'undefined': false
+  };
+
+  var root = (objectTypes[typeof window] && window) || this,
+    freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports,
+    freeModule = objectTypes[typeof module] && module && !module.nodeType && module,
+    moduleExports = freeModule && freeModule.exports === freeExports && freeExports,
+    freeGlobal = objectTypes[typeof global] && global;
+  
+  if (freeGlobal && (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal)) {
+    root = freeGlobal;
+  }
 
   // Because of build optimizers
   if (typeof define === 'function' && define.amd) {
@@ -11,6 +27,6 @@
   } else if (typeof module == 'object' && module && module.exports == freeExports) {
     module.exports = factory(root, module.exports, require('rx'), require('angular'));
   } else {
-    root.Rx = factory(root, {}, root.Rx, angular);
+    root.Rx = factory(root, {}, root.Rx, root.angular);
   }
 }(this, function (global, exp, Rx, angular, undefined) {