rollex 1.0.0.pre.rc.1 → 1.0.0.pre.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad0f0ba1285add1c1bcdb04414f9c579e39e2bc
-  data.tar.gz: fda8553769da16f94746c9487e7e51f5cead2b6b
+  metadata.gz: 33637c95180b914ae5241f2995cc617d3b22a180
+  data.tar.gz: d4223bc0f521d7112991422122d712866fe4d841
 SHA512:
-  metadata.gz: 739a58c7a5071664bd69e939c14e87d240cde02993c59219ee05b60ffc2356b4b15283a27ab4cc6036a9a143afb4c2a03a7892512442490fad92add2e1ad852b
-  data.tar.gz: 06bd190f50d87db53705476f139359dc5c4f6537c433135b8e9c24171f2119f1028a40ee2d484babb809eb3bedd3f4be3a00848c53e7a839770cc199edf7f374
+  metadata.gz: '099d2622a38c712289b42690e2a5eaafe7412724c307e59a81091f03346ebc355b5a45703ef4ac87cd29ddb6f3880aee9f3d8518c0540503937ff0f9628f654e'
+  data.tar.gz: 3a017b20f6224a319ea4a51aed75684692177320215e1a842fda3555dbcee576c100e2851e00e7690263de2edf4cc2ca51ca5de12a235b9276809b9b68ce5969

data/lib/rollex/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rollex
   module Rails
-    VERSION = "1.0.0-rc.1"
+    VERSION = "1.0.0-rc.3"
   end
 end

data/vendor/assets/javascripts/rollex.js

@@ -92,8 +92,8 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_0__;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.digitPropTypes = undefined;
+exports.decorateDigit = decorateDigit;
 
 var _react = __webpack_require__(0);
 
@@ -101,12 +101,6 @@ var _react2 = _interopRequireDefault(_react);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
 var _React$PropTypes = _react2.default.PropTypes,
     objectOf = _React$PropTypes.objectOf,
     any = _React$PropTypes.any,
@@ -115,50 +109,28 @@ var _React$PropTypes = _react2.default.PropTypes,
     func = _React$PropTypes.func;
 
 /**
- * Common logic for {@link StaticCounterDigit} and {@link AnimatedCounterDigit}.
+ * @property {string} digit - digit to display
+ * @property {number} radix
+ * @property {Object} digitMap - a map for transforming particular digits
+ * @property {function(digit: number)} digitWrapper - a function for wrapping mapped digits
  */
 
-var AbstractCounterDigit = function (_React$Component) {
-  _inherits(AbstractCounterDigit, _React$Component);
-
-  function AbstractCounterDigit() {
-    _classCallCheck(this, AbstractCounterDigit);
-
-    return _possibleConstructorReturn(this, (AbstractCounterDigit.__proto__ || Object.getPrototypeOf(AbstractCounterDigit)).apply(this, arguments));
-  }
-
-  _createClass(AbstractCounterDigit, [{
-    key: 'decorateDigit',
-
-
-    /**
-     * Decorates given digit according to radix, digit map and digit wrapper.
-     * @param {number} digit
-     * @return {string} decoratedDigit
-     */
-    value: function decorateDigit(digit) {
-      var digitString = digit.toString(this.props.radix);
-      return this.props.digitWrapper(this.props.digitMap[digitString] || digitString);
-    }
-    /**
-     * @property {string} digit - digit to display
-     * @property {number} radix
-     * @property {Object} digitMap - a map for transforming particular digits
-     * @property {function(digit: number)} digitWrapper - a function for wrapping mapped digits
-     */
-
-  }]);
-
-  return AbstractCounterDigit;
-}(_react2.default.Component);
-
-AbstractCounterDigit.propTypes = {
+var digitPropTypes = exports.digitPropTypes = {
   digit: string.isRequired,
   radix: number.isRequired,
   digitMap: objectOf(any).isRequired,
   digitWrapper: func.isRequired
 };
-exports.default = AbstractCounterDigit;
+
+/**
+ * Decorates given digit according to radix, digit map and digit wrapper.
+ * @param {number} digit
+ * @return {string} decoratedDigit
+ */
+function decorateDigit(digit, props) {
+  var digitString = digit.toString(props.radix);
+  return props.digitWrapper(props.digitMap[digitString] || digitString);
+}
 
 /***/ }),
 /* 2 */
@@ -364,7 +336,7 @@ var Counter = function (_React$Component) {
      */
     var _this = _possibleConstructorReturn(this, (Counter.__proto__ || Object.getPrototypeOf(Counter)).call(this, props));
 
-    _this.state = new _counterBuilder2.default(_this).buildInitialState();
+    _this.state = new _counterBuilder2.default(props).buildInitialState();
 
     /**
      * Creates a function bound to "this"
@@ -382,7 +354,7 @@ var Counter = function (_React$Component) {
   }, {
     key: 'componentWillUnmount',
     value: function componentWillUnmount() {
-      if (!this.props.frozen && !this.state.stopped) this.stop();
+      if (!this.props.frozen && !this.stopped) this.stop();
     }
 
     /**
@@ -409,9 +381,8 @@ var Counter = function (_React$Component) {
   }, {
     key: 'start',
     value: function start() {
-      _globalIntervals2.default.ensureExistence(this.props.interval);
-      _globalIntervals2.default.subscribe(this.props.interval, this.boundTick);
-      this.setState({ stopped: false });
+      this.unsubscribe = _globalIntervals2.default.subscribe(this.props.interval, this.boundTick);
+      this.stopped = false;
     }
 
     /**
@@ -421,9 +392,9 @@ var Counter = function (_React$Component) {
   }, {
     key: 'stop',
     value: function stop() {
-      _globalIntervals2.default.unsubscribe(this.props.interval, this.boundTick);
-      _globalIntervals2.default.cleanup(this.props.interval);
-      this.setState({ stopped: true });
+      if (!this.unsubscribe) return;
+      this.unsubscribe();
+      this.stopped = true;
     }
 
     /**
@@ -628,9 +599,7 @@ var _reactDom = __webpack_require__(10);
 
 var _reactDom2 = _interopRequireDefault(_reactDom);
 
-var _AbstractCounterDigit2 = __webpack_require__(1);
-
-var _AbstractCounterDigit3 = _interopRequireDefault(_AbstractCounterDigit2);
+var _counterDigitHelper = __webpack_require__(1);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -669,8 +638,8 @@ function forceReflow(element) {
  * />
  */
 
-var AnimatedCounterDigit = function (_AbstractCounterDigit) {
-  _inherits(AnimatedCounterDigit, _AbstractCounterDigit);
+var AnimatedCounterDigit = function (_React$Component) {
+  _inherits(AnimatedCounterDigit, _React$Component);
 
   function AnimatedCounterDigit(props) {
     _classCallCheck(this, AnimatedCounterDigit);
@@ -687,11 +656,11 @@ var AnimatedCounterDigit = function (_AbstractCounterDigit) {
       }
     };
 
-    var singleDigitHeight = 100 / (_this.props.maxValue + 2);
-    var upperZeroPosition = -singleDigitHeight * (_this.props.radix - _this.props.maxValue - 1);
-    var lowerZeroPosition = -singleDigitHeight * _this.props.radix;
-    var initialZeroPosition = _this.props.direction === 'down' ? lowerZeroPosition : upperZeroPosition;
-    var finalZeroPosition = _this.props.direction === 'down' ? upperZeroPosition : lowerZeroPosition;
+    var singleDigitHeight = 100 / (props.maxValue + 2);
+    var upperZeroPosition = -singleDigitHeight * (props.radix - props.maxValue - 1);
+    var lowerZeroPosition = -singleDigitHeight * props.radix;
+    var initialZeroPosition = props.direction === 'down' ? lowerZeroPosition : upperZeroPosition;
+    var finalZeroPosition = props.direction === 'down' ? upperZeroPosition : lowerZeroPosition;
 
     _this.state = {
       initialZeroPosition: initialZeroPosition,
@@ -702,6 +671,10 @@ var AnimatedCounterDigit = function (_AbstractCounterDigit) {
     return _this;
   }
   /**
+   * @property {string} digit - digit to display
+   * @property {number} radix
+   * @property {Object} digitMap - a map for transforming particular digits
+   * @property {function(digit: number)} digitWrapper - a function for wrapping mapped digits
    * @property {string} direction - counting direction
    * @property {number} maxValue - maximum value used to build a digit lane
    * @property {string} easingFunction - easing function for transitions
@@ -735,7 +708,7 @@ var AnimatedCounterDigit = function (_AbstractCounterDigit) {
       return _react2.default.createElement(
         'div',
         { key: key || digit, className: 'rollex-digit-lane-label' },
-        this.decorateDigit(digit)
+        (0, _counterDigitHelper.decorateDigit)(digit, this.props)
       );
     }
 
@@ -801,9 +774,9 @@ var AnimatedCounterDigit = function (_AbstractCounterDigit) {
   }]);
 
   return AnimatedCounterDigit;
-}(_AbstractCounterDigit3.default);
+}(_react2.default.Component);
 
-AnimatedCounterDigit.propTypes = _extends({}, _AbstractCounterDigit3.default.propTypes, {
+AnimatedCounterDigit.propTypes = _extends({}, _counterDigitHelper.digitPropTypes, {
   direction: string.isRequired,
   maxValue: number.isRequired,
   easingFunction: string.isRequired,
@@ -821,8 +794,7 @@ exports.default = AnimatedCounterDigit;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.default = CounterSegment;
 
 var _react = __webpack_require__(0);
 
@@ -838,12 +810,6 @@ var _StaticCounterDigit2 = _interopRequireDefault(_StaticCounterDigit);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
 var _React$PropTypes = _react2.default.PropTypes,
     arrayOf = _React$PropTypes.arrayOf,
     object = _React$PropTypes.object,
@@ -863,6 +829,29 @@ var PERIOD_LIMITS = {
   'days': 0
 };
 
+/**
+ * @property {string[]} digits - digits to display
+ * @property {string} period
+ * @property {number} radix
+ * @property {string} direction - counting direction
+ * @property {string} easingFunction - easing function to use for digit transitions
+ * @property {number} easingDuration - duration of digit transitions
+ * @property {Object} digitMap - a map for transforming particular digits
+ * @property {function(digit: number)} digitWrapper - a function for wrapping mapped digits
+ * @property {string} label
+ */
+CounterSegment.propTypes = {
+  digits: arrayOf(string).isRequired,
+  period: string.isRequired,
+  radix: number.isRequired,
+  direction: string.isRequired,
+  easingFunction: string,
+  easingDuration: number.isRequired,
+  digitMap: object.isRequired,
+  digitWrapper: func.isRequired,
+  label: string
+};
+
 /**
  * Counter segment component.
  * @example
@@ -876,125 +865,67 @@ var PERIOD_LIMITS = {
  *   digitWrapper={(digit) => digit}
  * />
  */
+function CounterSegment(props) {
+  /**
+   * Gets maximum value for period's digit with account for radix.
+   * Used for building digit lanes in {@link AnimatedCounterDigit}.
+   * @param {number} index - digit's index in number
+   * @return {number} maxValue
+   */
+  function getMaxValue(index) {
+    var maxValue = PERIOD_LIMITS[props.period];
+    if (!maxValue) return props.radix - 1;
 
-var CounterSegment = function (_React$Component) {
-  _inherits(CounterSegment, _React$Component);
-
-  function CounterSegment() {
-    _classCallCheck(this, CounterSegment);
-
-    return _possibleConstructorReturn(this, (CounterSegment.__proto__ || Object.getPrototypeOf(CounterSegment)).apply(this, arguments));
+    var maxValueString = maxValue.toString(props.radix);
+    var maxDigitPos = maxValueString.length;
+    return index === props.digits.length - maxDigitPos ? parseInt(maxValueString[0]) : props.radix - 1;
   }
 
-  _createClass(CounterSegment, [{
-    key: 'getMaxValue',
-
-
-    /**
-     * OPTIMIZE: this probably shouldn't be done in buildDigits. Perhaps we could perform calculations
-     * for each possible index it in the constructor, but only for animated counters.
-     *
-     * Gets maximum value for period's digit with account for radix.
-     * Used for building digit lanes in {@link AnimatedCounterDigit}.
-     * @param {number} index - digit's index in number
-     * @return {number} maxValue
-     */
-    value: function getMaxValue(index) {
-      var maxValue = PERIOD_LIMITS[this.props.period];
-      if (!maxValue) return this.props.radix - 1;
-
-      var maxValueString = maxValue.toString(this.props.radix);
-      var maxDigitPos = maxValueString.length;
-      return index === this.props.digits.length - maxDigitPos ? parseInt(maxValueString[0]) : this.props.radix - 1;
-    }
-
-    /**
-     * Maps digits to corresponding components according to easing function.
-     * @return {ReactElement[]}
-     */
-
-    /**
-     * @property {string[]} digits - digits to display
-     * @property {string} period
-     * @property {number} radix
-     * @property {string} direction - counting direction
-     * @property {string} easingFunction - easing function to use for digit transitions
-     * @property {number} easingDuration - duration of digit transitions
-     * @property {Object} digitMap - a map for transforming particular digits
-     * @property {function(digit: number)} digitWrapper - a function for wrapping mapped digits
-     * @property {string} label
-     */
-
-  }, {
-    key: 'buildDigits',
-    value: function buildDigits() {
-      var _this2 = this;
-
-      return this.props.digits.map(function (digit, index) {
-        if (_this2.props.easingFunction) {
-          return _react2.default.createElement(_AnimatedCounterDigit2.default, {
-            key: index,
-            digit: digit,
-            maxValue: _this2.getMaxValue(index),
-            radix: _this2.props.radix,
-            direction: _this2.props.direction,
-            easingFunction: _this2.props.easingFunction,
-            easingDuration: _this2.props.easingDuration,
-            digitMap: _this2.props.digitMap,
-            digitWrapper: _this2.props.digitWrapper
-          });
-        } else {
-          return _react2.default.createElement(_StaticCounterDigit2.default, {
-            key: index,
-            digit: digit,
-            radix: _this2.props.radix,
-            digitMap: _this2.props.digitMap,
-            digitWrapper: _this2.props.digitWrapper
-          });
-        }
-      });
-    }
-
-    /**
-     * Renders the segment.
-     * @return {ReactElement} counter segment
-     */
-
-  }, {
-    key: 'render',
-    value: function render() {
-      return _react2.default.createElement(
-        'div',
-        { className: 'rollex-segment' },
-        _react2.default.createElement(
-          'div',
-          { className: 'rollex-digits', style: { overflow: 'hidden' } },
-          this.buildDigits()
-        ),
-        _react2.default.createElement(
-          'div',
-          { className: 'rollex-label' },
-          this.props.label
-        )
-      );
-    }
-  }]);
-
-  return CounterSegment;
-}(_react2.default.Component);
+  /**
+   * Maps digits to corresponding components according to easing function.
+   * @return {ReactElement[]}
+   */
+  function buildDigits() {
+    return props.digits.map(function (digit, index) {
+      if (props.easingFunction) {
+        return _react2.default.createElement(_AnimatedCounterDigit2.default, {
+          key: index,
+          digit: digit,
+          maxValue: getMaxValue(index),
+          radix: props.radix,
+          direction: props.direction,
+          easingFunction: props.easingFunction,
+          easingDuration: props.easingDuration,
+          digitMap: props.digitMap,
+          digitWrapper: props.digitWrapper
+        });
+      } else {
+        return _react2.default.createElement(_StaticCounterDigit2.default, {
+          key: index,
+          digit: digit,
+          radix: props.radix,
+          digitMap: props.digitMap,
+          digitWrapper: props.digitWrapper
+        });
+      }
+    });
+  }
 
-CounterSegment.propTypes = {
-  digits: arrayOf(string).isRequired,
-  period: string.isRequired,
-  radix: number.isRequired,
-  direction: string.isRequired,
-  easingFunction: string,
-  easingDuration: number.isRequired,
-  digitMap: object.isRequired,
-  digitWrapper: func.isRequired,
-  label: string
-};
-exports.default = CounterSegment;
+  return _react2.default.createElement(
+    'div',
+    { className: 'rollex-segment' },
+    _react2.default.createElement(
+      'div',
+      { className: 'rollex-digits', style: { overflow: 'hidden' } },
+      buildDigits()
+    ),
+    _react2.default.createElement(
+      'div',
+      { className: 'rollex-label' },
+      props.label
+    )
+  );
+}
 
 /***/ }),
 /* 6 */
@@ -1078,24 +1009,23 @@ exports.default = CounterSegmentSeparator;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+exports.default = StaticCounterDigit;
 
 var _react = __webpack_require__(0);
 
 var _react2 = _interopRequireDefault(_react);
 
-var _AbstractCounterDigit2 = __webpack_require__(1);
-
-var _AbstractCounterDigit3 = _interopRequireDefault(_AbstractCounterDigit2);
+var _counterDigitHelper = __webpack_require__(1);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+/**
+ * @property {string} digit - digit to display
+ * @property {number} radix
+ * @property {Object} digitMap - a map for transforming particular digits
+ * @property {function(digit: number)} digitWrapper - a function for wrapping mapped digits
+ */
+StaticCounterDigit.propTypes = _counterDigitHelper.digitPropTypes;
 
 /**
  * Static digit component.
@@ -1108,35 +1038,13 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
  *   digitWrapper={(digit) => digit}
  * />
  */
-var StaticCounterDigit = function (_AbstractCounterDigit) {
-  _inherits(StaticCounterDigit, _AbstractCounterDigit);
-
-  function StaticCounterDigit() {
-    _classCallCheck(this, StaticCounterDigit);
-
-    return _possibleConstructorReturn(this, (StaticCounterDigit.__proto__ || Object.getPrototypeOf(StaticCounterDigit)).apply(this, arguments));
-  }
-
-  _createClass(StaticCounterDigit, [{
-    key: 'render',
-
-    /**
-     * Renders the digit.
-     * @return {ReactElement} digit
-     */
-    value: function render() {
-      return _react2.default.createElement(
-        'div',
-        { className: 'rollex-digit' },
-        this.decorateDigit(this.props.digit)
-      );
-    }
-  }]);
-
-  return StaticCounterDigit;
-}(_AbstractCounterDigit3.default);
-
-exports.default = StaticCounterDigit;
+function StaticCounterDigit(props) {
+  return _react2.default.createElement(
+    'div',
+    { className: 'rollex-digit' },
+    (0, _counterDigitHelper.decorateDigit)(props.digit, props)
+  );
+}
 
 /***/ }),
 /* 8 */
@@ -1220,16 +1128,15 @@ var CounterBuilder = function () {
     }
 
     /**
-     * @param {Counter} counter
+     * @param {object} props
      */
 
   }]);
 
-  function CounterBuilder(counter) {
+  function CounterBuilder(props) {
     _classCallCheck(this, CounterBuilder);
 
-    this.counter = counter;
-    this.props = counter.props;
+    this.props = props;
     this.state = {};
   }
 
@@ -1447,51 +1354,68 @@ Object.defineProperty(exports, "__esModule", {
  */
 var GlobalIntervals = {
   /**
-   * Ensures existence of an interval.
+   * Returns an interval with a given duration. Creates one if it doesn't exist.
    * @param {!number} duration - interval duration in milliseconds
+   * @return {object}
    */
-  ensureExistence: function ensureExistence(duration) {
-    if (!window.rollexIntervals) window.rollexIntervals = {};
-    if (!window.rollexIntervals[duration]) {
-      window.rollexIntervals[duration] = {
-        interval: setInterval(function () {
-          window.dispatchEvent(new CustomEvent("rollex:tick:" + duration));
-        }, duration, false),
-        counterCount: 0
+  getInterval: function getInterval(duration) {
+    if (!this.intervals[duration]) {
+      var intervalsObj = this.intervals[duration] = {
+        callbacks: []
       };
+      intervalsObj.interval = setInterval(function () {
+        this.callbacks.forEach(function (cb) {
+          return cb();
+        });
+      }.bind(intervalsObj), duration, false);
     }
+    return this.intervals[duration];
   },
 
   /**
-   * Cleans up an interval.
    * @param {!number} duration - interval duration in milliseconds
    */
-  cleanup: function cleanup(duration) {
-    if (window.rollexIntervals[duration].counterCount === 0) {
-      clearInterval(window.rollexIntervals[duration].interval);
-      delete window.rollexIntervals[duration];
-    }
+  removeIntervalWithDuration: function removeIntervalWithDuration(duration) {
+    clearInterval(this.intervals[duration].interval);
+    delete this.intervals[duration];
   },
 
   /**
-   * Adds a subscriber to an interval.
+   * Adds a listener to an interval.
    * @param {!number} duration - interval duration in milliseconds
-   * @param {!Object|function} subscriber
+   * @param {!function} callback - listener
+   * @return {function} unsubscribe
+   */
+  subscribe: function subscribe(duration, callback) {
+    var _this = this;
+
+    var callbacks = this.getInterval(duration).callbacks;
+    callbacks.push(callback);
+    return function () {
+      return _this.removeListener(duration, callback);
+    };
+  },
+
+  /**
+   * Removes a listener from its interval. Stops the interval if it no longer has listeners.
+   * @param {!number} duration
+   * @param {!function} cb - listener
    */
-  subscribe: function subscribe(duration, subscriber) {
-    window.rollexIntervals[duration].counterCount += 1;
-    window.addEventListener("rollex:tick:" + duration, subscriber, false);
+  removeListener: function removeListener(duration, cb) {
+    var interval = this.intervals[duration];
+    var callbacks = interval.callbacks;
+
+    if (callbacks.length > 1) {
+      callbacks.splice(callbacks.indexOf(cb));
+    } else {
+      this.removeIntervalWithDuration(duration);
+    }
   },
 
   /**
-   * Removes a subscriber from an interval.
-   * @param {!number} duration - interval duration in milliseconds
-   * @param {!Object|function} subscriber
+   * Stores global intervals
    */
-  unsubscribe: function unsubscribe(duration, subscriber) {
-    window.removeEventListener("rollex:tick:" + duration, subscriber, false);
-    window.rollexIntervals[duration].counterCount -= 1;
-  }
+  intervals: {}
 };
 
 exports.default = GlobalIntervals;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollex
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.1
+  version: 1.0.0.pre.rc.3
 platform: ruby
 authors:
 - Alexander Komarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: