shuffle

Author: josex2r

README.md

@@ -85,7 +85,7 @@ machine.visible; //Returns boolean
 Change spin result, if the returned value is out of bounds, the element will be randomly choosen:
 
 ```javascript
-machine.setRandomize(foo); //foo must be a function (should return int) or an int
+machine.randomize = foo; //foo must be a function (should return int) or an int
 ```
 
 Change spin direction, machine must not be running:

dist/slotmachine.js

@@ -51,6 +51,8 @@ module.exports = class SlotMachine {
     this.running = false;
     // Machine is stopping?
     this.stopping = false;
+    // Randomize Function|Number
+    this.randomize = this.settings.randomize;
     // Current active element
     this.settings.active = Number(this.settings.active);
     if (isNaN(this.settings.active) ||
@@ -69,7 +71,7 @@ module.exports = class SlotMachine {
     // Initialize spin direction [up, down]
     this._initDirection();
     // Show active element
-    this.resetPosition();
+    this._resetPosition();
     // Start auto animation
     if (this.settings.auto !== false) {
       if (this.settings.auto === true) {
@@ -157,8 +159,8 @@ module.exports = class SlotMachine {
   get custom () {
     let choosen;
 
-    if (typeof this.settings.randomize === 'function') {
-      let index = this.settings.randomize.call(this, this.active);
+    if (typeof this._randomize === 'function') {
+      let index = this._randomize(this.active);
       if (index < 0 || index >= this.tiles.length) {
         index = 0;
       }
@@ -248,6 +250,18 @@ module.exports = class SlotMachine {
     }
   }
 
+  /**
+   * @desc PUBLIC - Changes randomize function
+   * @param function|Number - Set new randomize function
+   */
+  set randomize (rnd) {
+    this._randomize = rnd;
+
+    if (typeof rnd === 'number') {
+      this._randomize = () => rnd;
+    }
+  }
+
   /**
    * @desc PRIVATE - Set CSS speed cclass
    * @param string FX_SPEED - Element speed [FX_FAST_BLUR||FX_NORMAL_BLUR||FX_SLOW_BLUR||FX_STOP]
@@ -349,26 +363,14 @@ module.exports = class SlotMachine {
   /**
    * @desc PRIVATE - Reset active element position
    */
-  resetPosition (margin) {
+  _resetPosition (margin) {
     this.container.classList.toggle(FX_NO_TRANSITION);
     this._animate(margin === undefined ? this.direction.initial : margin);
     // Force reflow, flushing the CSS changes
     this.container.offsetHeight;
     this.container.classList.toggle(FX_NO_TRANSITION);
   }
 
-  /**
-   * @desc PUBLIC - Changes randomize function
-   * @param function|Number - Set new randomize function
-   */
-  setRandomize (rnd) {
-    this.settings.randomize = rnd;
-
-    if (typeof rnd === 'number') {
-      this.settings.randomize = () => rnd;
-    }
-  }
-
   /**
    * @desc PUBLIC - SELECT previous element relative to the current active element
    * @return {Number} - Returns result index
@@ -394,11 +396,11 @@ module.exports = class SlotMachine {
   }
 
   /**
-   * @desc PUBLIC - Starts shuffling the elements
+   * @desc PRIVATE - Starts shuffling the elements
    * @param {Number} repeations - Number of shuffles (undefined to make infinite animation
    * @return {Number} - Returns result index
    */
-  getDelayFromSpins (spins) {
+  _getDelayFromSpins (spins) {
     let delay = this.settings.delay;
     this._transition = 'linear';
 
@@ -443,14 +445,14 @@ module.exports = class SlotMachine {
     if (!this.visible && this.settings.stopHidden === true) {
       this.stop(onComplete);
     } else {
-      const delay = this.getDelayFromSpins(spins);
+      const delay = this._getDelayFromSpins(spins);
       this.delay = delay;
       this._animate(this.direction.to);
       raf(() => {
         if (!this.stopping && this.running) {
           const left = spins - 1;
 
-          this.resetPosition(this.direction.first);
+          this._resetPosition(this.direction.first);
           if (left <= 1) {
             this.stop(onComplete);
           } else {
@@ -483,16 +485,16 @@ module.exports = class SlotMachine {
 
     // Check direction to prevent jumping
     if (this._isGoingBackward()) {
-      this.resetPosition(this.direction.firstToLast);
+      this._resetPosition(this.direction.firstToLast);
     } else if (this._isGoingForward()) {
-      this.resetPosition(this.direction.lastToFirst);
+      this._resetPosition(this.direction.lastToFirst);
     }
 
     // Update last choosen element index
     this.active = this.futureActive;
 
     // Perform animation
-    const delay = this.getDelayFromSpins(1);
+    const delay = this._getDelayFromSpins(1);
     this.delay = delay;
     this._animationFX = FX_STOP;
     this._animate(this.getTileOffset(this.active));
@@ -522,8 +524,8 @@ module.exports = class SlotMachine {
     }
 
     this._timer = new Timer(() => {
-      if (typeof this.settings.randomize !== 'function') {
-        this.settings.randomize = () => this._nextIndex;
+      if (typeof this._randomize !== 'function') {
+        this._randomize = () => this._nextIndex;
       }
       if (!this.visible && this.settings.stopHidden === true) {
         raf(() => {

dist/slotmachine.min.js

@@ -73,6 +73,15 @@ describe('Constructor', () => {
     });
   });
 
+  it('sets randomize', () => {
+    const randomize = () => {};
+    machine = render({
+      randomize
+    });
+
+    expect(machine._randomize).to.be.equal(randomize);
+  });
+
   it('does not auto start', () => {
     machine = render();
 

lib/slot-machine.js

@@ -200,156 +200,4 @@ describe('Getters', () => {
       expect(machine.visible).to.be.false;
     });
   });
-
-  describe('Next tiles', () => {
-    it('shows next element: first to second, direction "up"', () => {
-      machine = render({
-        direction: 'up'
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(0);
-      expect(machine.active).to.be.equal(0);
-      expect(tile.innerText).to.be.equal('foo');
-
-      machine.next();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(2);
-      expect(machine.active).to.be.equal(2);
-      expect(tile.innerText).to.be.equal('wow');
-    });
-
-    it('shows next element: last to first, direction "up"', () => {
-      machine = render({
-        active: 2,
-        direction: 'up'
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(2);
-      expect(machine.active).to.be.equal(2);
-      expect(tile.innerText).to.be.equal('wow');
-
-      machine.next();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(1);
-      expect(machine.active).to.be.equal(1);
-      expect(tile.innerText).to.be.equal('bar');
-    });
-
-    it('shows next element: first to second, direction "down"', () => {
-      machine = render({
-        direction: 'down'
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(0);
-      expect(machine.active).to.be.equal(0);
-      expect(tile.innerText).to.be.equal('foo');
-
-      machine.next();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(1);
-      expect(machine.active).to.be.equal(1);
-      expect(tile.innerText).to.be.equal('bar');
-    });
-
-    it('shows next element: last to first, direction "down"', () => {
-      machine = render({
-        direction: 'down',
-        active: 2
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(2);
-      expect(machine.active).to.be.equal(2);
-      expect(tile.innerText).to.be.equal('wow');
-
-      machine.next();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(0);
-      expect(machine.active).to.be.equal(0);
-      expect(tile.innerText).to.be.equal('foo');
-    });
-  });
-
-  describe('Prev tiles', () => {
-    it('shows prev element: second to first, direction "up"', () => {
-      machine = render({
-        direction: 'up',
-        active: 1
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(1);
-      expect(machine.active).to.be.equal(1);
-      expect(tile.innerText).to.be.equal('bar');
-
-      machine.prev();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(2);
-      expect(machine.active).to.be.equal(2);
-      expect(tile.innerText).to.be.equal('wow');
-    });
-
-    it('shows prev element: first to last, direction "up"', () => {
-      machine = render({
-        direction: 'up'
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(0);
-      expect(machine.active).to.be.equal(0);
-      expect(tile.innerText).to.be.equal('foo');
-
-      machine.prev();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(1);
-      expect(machine.active).to.be.equal(1);
-      expect(tile.innerText).to.be.equal('bar');
-    });
-
-    it('shows prev element: second to first, direction "down"', () => {
-      machine = render({
-        direction: 'down',
-        active: 1
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(1);
-      expect(machine.active).to.be.equal(1);
-      expect(tile.innerText).to.be.equal('bar');
-
-      machine.prev();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(0);
-      expect(machine.active).to.be.equal(0);
-      expect(tile.innerText).to.be.equal('foo');
-    });
-
-    it('shows prev element: first to last, direction "down"', () => {
-      machine = render({
-        direction: 'down'
-      });
-
-      let tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(0);
-      expect(machine.active).to.be.equal(0);
-      expect(tile.innerText).to.be.equal('foo');
-
-      machine.prev();
-
-      tile = getVisibleTile(machine);
-      expect(machine.visibleTile).to.be.equal(2);
-      expect(machine.active).to.be.equal(2);
-      expect(tile.innerText).to.be.equal('wow');
-    });
-  });
 });