Fixing zip

dist/rx.all.compat.js

@@ -4284,6 +4284,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

dist/rx.all.js

@@ -4139,6 +4139,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

dist/rx.compat.js

@@ -4198,6 +4198,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

dist/rx.js

@@ -4007,6 +4007,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

dist/rx.lite.compat.js

@@ -3685,6 +3685,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

dist/rx.lite.js

@@ -3496,6 +3496,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

doc/api/core/operators/from.md

@@ -1,5 +1,5 @@
 ### `Rx.Observable.from(iterable, [mapFn], [thisArg], [scheduler])`
-[Ⓢ](https://github.com/Reactive-Extensions/RxJS/blob/master/src/core/linq/observable/from.js "View in source")
+[Ⓢ](https://github.com/Reactive-Extensions/RxJS/blob/master/src/core/linq/observable/from.js 'View in source')
 
 This method creates a new Observable sequence from an array-like or iterable object.
 
@@ -37,7 +37,7 @@ f(1, 2, 3).subscribe(
 
 // Any iterable object...
 // Set
-var s = new Set(["foo", window]);
+var s = new Set(['foo', window]);
 Rx.Observable.from(s).subscribe(
   function (x) {
     console.log('Next: ' + x);
@@ -70,7 +70,7 @@ Rx.Observable.from(m).subscribe(
 // => Completed
 
 // String
-Rx.Observable.from("foo").subscribe(
+Rx.Observable.from('foo').subscribe(
   function (x) {
     console.log('Next: ' + x);
   },

modules/rx-lite-compat/rx.lite.compat.js

@@ -3685,6 +3685,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

modules/rx-lite/rx.lite.js

@@ -3496,6 +3496,9 @@ var FlatMapObservable = (function(__super__){
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

src/core/linq/observable/zip.js

@@ -7,6 +7,9 @@
   Observable.zip = function () {
     var len = arguments.length, args = new Array(len);
     for(var i = 0; i < len; i++) { args[i] = arguments[i]; }
+    if (Array.isArray(args[0])) {
+      args = isFunction(args[1]) ? args[0].concat(args[1]) : args[0];
+    }
     var first = args.shift();
     return first.zip.apply(first, args);
   };

tests/observable/zip.js

@@ -54,6 +54,138 @@
     );
   });
 
+  test('zip n-ary symmetric selector', function () {
+    var scheduler = new TestScheduler();
+
+    var e0 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(210, 1),
+      onNext(250, 4),
+      onCompleted(420));
+
+    var e1 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(220, 2),
+      onNext(240, 5),
+      onCompleted(410));
+
+    var e2 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(230, 3),
+      onNext(260, 6),
+      onCompleted(400));
+
+    var res = scheduler.startWithCreate(function () {
+      return Observable.zip(e0, e1, e2, function (r0, r1, r2) { return [r0, r1, r2]; });
+    });
+
+    res.messages.assertEqual(
+      onNext(230, [1, 2, 3]),
+      onNext(260, [4, 5, 6]),
+      onCompleted(420)
+    );
+
+    e0.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+
+    e1.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+
+    e2.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+  });
+
+  test('zip n-ary array symmetric', function () {
+    var scheduler = new TestScheduler();
+
+    var e0 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(210, 1),
+      onNext(250, 4),
+      onCompleted(420));
+
+    var e1 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(220, 2),
+      onNext(240, 5),
+      onCompleted(410));
+
+    var e2 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(230, 3),
+      onNext(260, 6),
+      onCompleted(400));
+
+    var res = scheduler.startWithCreate(function () {
+      return Observable.zip([e0, e1, e2])
+    });
+
+    res.messages.assertEqual(
+      onNext(230, [1, 2, 3]),
+      onNext(260, [4, 5, 6]),
+      onCompleted(420)
+    );
+
+    e0.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+
+    e1.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+
+    e2.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+  });
+
+  test('zip n-ary symmetric array selector', function () {
+    var scheduler = new TestScheduler();
+
+    var e0 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(210, 1),
+      onNext(250, 4),
+      onCompleted(420));
+
+    var e1 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(220, 2),
+      onNext(240, 5),
+      onCompleted(410));
+
+    var e2 = scheduler.createHotObservable(
+      onNext(150, 1),
+      onNext(230, 3),
+      onNext(260, 6),
+      onCompleted(400));
+
+    var res = scheduler.startWithCreate(function () {
+      return Observable.zip([e0, e1, e2], function (r0, r1, r2) { return [r0, r1, r2]; });
+    });
+
+    res.messages.assertEqual(
+      onNext(230, [1, 2, 3]),
+      onNext(260, [4, 5, 6]),
+      onCompleted(420)
+    );
+
+    e0.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+
+    e1.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+
+    e2.subscriptions.assertEqual(
+      subscribe(200, 420)
+    );
+  });
+
   test('zip never never', function () {
     var scheduler = new TestScheduler();