Merge branch 'master' of github.com:facebook/immutable-js

leebyron · leebyron · commit 58c27baad590 · 2014-10-13T14:33:10.000-07:00
Conflicts:
	dist/Immutable.min.js
diff --git a/__tests__/IndexedSequence.ts b/__tests__/IndexedSequence.ts
@@ -0,0 +1,27 @@
+///<reference path='../resources/jest.d.ts'/>
+///<reference path='../dist/Immutable.d.ts'/>
+jest.autoMockOff();
+
+import jasmineCheck = require('jasmine-check');
+jasmineCheck.install();
+
+import Immutable = require('immutable');
+
+describe('IndexedSequence', () => {
+
+  it('maintains skipped offset', () => {
+    var seq = Immutable.Sequence(['A', 'B', 'C', 'D', 'E']);
+
+    // This is what we expect for IndexedSequences
+    var operated = seq.skip(1);
+    expect(operated.entrySeq().toArray()).toEqual([
+      [0, 'B'],
+      [1, 'C'],
+      [2, 'D'],
+      [3, 'E']
+    ]);
+
+    expect(operated.first()).toEqual('B');
+  });
+
+});
diff --git a/dist/Immutable.js b/dist/Immutable.js
@@ -683,7 +683,7 @@ var $IndexedSequence = IndexedSequence;
     var skipSeq = skipFactory(this, amount, false);
     if (skipSeq !== this) {
       skipSeq.get = (function(index, notSetValue) {
-        return $__0.get(index - amount, notSetValue);
+        return $__0.get(index + amount, notSetValue);
       });
     }
     return skipSeq;
diff --git a/dist/Immutable.min.js b/dist/Immutable.min.js
diff --git a/src/Sequence.js b/src/Sequence.js
@@ -595,7 +595,7 @@ class IndexedSequence extends Sequence {
   skip(amount) {
     var skipSeq = skipFactory(this, amount, false);
     if (skipSeq !== this) {
-      skipSeq.get = (index, notSetValue) => this.get(index - amount, notSetValue);
+      skipSeq.get = (index, notSetValue) => this.get(index + amount, notSetValue);
     }
     return skipSeq;
   }

Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ var $IndexedSequence = IndexedSequence;`
`683`	`683`	`var skipSeq = skipFactory(this, amount, false);`
`684`	`684`	`if (skipSeq !== this) {`
`685`	`685`	`skipSeq.get = (function(index, notSetValue) {`
`686`		`- return $__0.get(index - amount, notSetValue);`
	`686`	`+ return $__0.get(index + amount, notSetValue);`
`687`	`687`	`});`
`688`	`688`	`}`
`689`	`689`	`return skipSeq;`
Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ class IndexedSequence extends Sequence {`
`595`	`595`	`skip(amount) {`
`596`	`596`	`var skipSeq = skipFactory(this, amount, false);`
`597`	`597`	`if (skipSeq !== this) {`
`598`		`- skipSeq.get = (index, notSetValue) => this.get(index - amount, notSetValue);`
	`598`	`+ skipSeq.get = (index, notSetValue) => this.get(index + amount, notSetValue);`
`599`	`599`	`}`
`600`	`600`	`return skipSeq;`
`601`	`601`	`}`