@eva/eva.js 1.1.12-alpha.0 → 1.1.14

package/dist/EVA.js

@@ -1,7 +1,3 @@
-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); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 var EVA = function (exports) {
@@ -933,14 +929,14 @@ var EVA = function (exports) {
   ListCache.prototype.get = listCacheGet;
   ListCache.prototype.has = listCacheHas;
   ListCache.prototype.set = listCacheSet;
-  var Map$1 = getNative(root$1, 'Map');
-  var Map$2 = Map$1;
+  var Map = getNative(root$1, 'Map');
+  var Map$1 = Map;
 
   function mapCacheClear() {
     this.size = 0;
     this.__data__ = {
       'hash': new Hash(),
-      'map': new (Map$2 || ListCache)(),
+      'map': new (Map$1 || ListCache)(),
       'string': new Hash()
     };
   }
@@ -1034,7 +1030,7 @@ var EVA = function (exports) {
     if (data instanceof ListCache) {
       var pairs = data.__data__;
 
-      if (!Map$2 || pairs.length < LARGE_ARRAY_SIZE - 1) {
+      if (!Map$1 || pairs.length < LARGE_ARRAY_SIZE - 1) {
         pairs.push([key, value]);
         this.size = ++data.size;
         return this;
@@ -1117,13 +1113,13 @@ var EVA = function (exports) {
       weakMapTag = '[object WeakMap]';
   var dataViewTag$1 = '[object DataView]';
   var dataViewCtorString = toSource(DataView$1),
-      mapCtorString = toSource(Map$2),
+      mapCtorString = toSource(Map$1),
       promiseCtorString = toSource(Promise$2),
       setCtorString = toSource(Set$2),
       weakMapCtorString = toSource(WeakMap$1);
   var getTag = baseGetTag;
 
-  if (DataView$1 && getTag(new DataView$1(new ArrayBuffer(1))) != dataViewTag$1 || Map$2 && getTag(new Map$2()) != mapTag$1 || Promise$2 && getTag(Promise$2.resolve()) != promiseTag || Set$2 && getTag(new Set$2()) != setTag$1 || WeakMap$1 && getTag(new WeakMap$1()) != weakMapTag) {
+  if (DataView$1 && getTag(new DataView$1(new ArrayBuffer(1))) != dataViewTag$1 || Map$1 && getTag(new Map$1()) != mapTag$1 || Promise$2 && getTag(Promise$2.resolve()) != promiseTag || Set$2 && getTag(new Set$2()) != setTag$1 || WeakMap$1 && getTag(new WeakMap$1()) != weakMapTag) {
     getTag = function getTag(value) {
       var result = baseGetTag(value),
           Ctor = result == objectTag$1 ? value.constructor : undefined,
@@ -2174,6 +2170,12 @@ var EVA = function (exports) {
           componentName = _a.componentName;
 
       if (type === exports.OBSERVER_TYPE.REMOVE) {
+        if (this.events.find(function (changed) {
+          return changed.component === component && changed.type === exports.OBSERVER_TYPE.ADD;
+        })) {
+          return;
+        }
+
         this.events = this.events.filter(function (changed) {
           return changed.component !== component;
         });
@@ -2240,11 +2242,7 @@ var EVA = function (exports) {
 
   var System$1 = System;
 
-  function createNowTime(syncLocker) {
-    if (syncLocker === void 0) {
-      syncLocker = true;
-    }
-
+  function createNowTime() {
     var nowtime = null;
 
     if (Date.now) {
@@ -2258,21 +2256,6 @@ var EVA = function (exports) {
     return nowtime;
   }
 
-  function formatDelay(delay) {
-    if (typeof delay === 'number') {
-      delay = {
-        delay: delay
-      };
-    } else if ('entropy' in delay) {
-      delay = {
-        delay: delay.entropy,
-        isEntropy: true
-      };
-    }
-
-    return delay;
-  }
-
   var _nowtime = createNowTime();
 
   var defaultOptions$1 = {
@@ -2280,13 +2263,6 @@ var EVA = function (exports) {
     playbackRate: 1.0
   };
 
-  var _timeMark = Symbol('timeMark'),
-      _playbackRate = Symbol('playbackRate'),
-      _timers = Symbol('timers'),
-      _originTime = Symbol('originTime'),
-      _setTimer = Symbol('setTimer'),
-      _parent = Symbol('parent');
-
   var Timeline = function () {
     function Timeline(options, parent) {
       if (options instanceof Timeline) {
@@ -2297,27 +2273,11 @@ var EVA = function (exports) {
       options = _extends({}, defaultOptions$1, options);
 
       if (parent) {
-        this[_parent] = parent;
-      }
-
-      var nowtime = options.nowtime || _nowtime;
-
-      if (!parent) {
-        var createTime = nowtime();
-        Object.defineProperty(this, 'globalTime', {
-          get: function get() {
-            return nowtime() - createTime;
-          }
-        });
-      } else {
-        Object.defineProperty(this, 'globalTime', {
-          get: function get() {
-            return parent.currentTime;
-          }
-        });
+        this._parent = parent;
       }
 
-      this[_timeMark] = [{
+      this._createTime = _nowtime();
+      this._timeMark = [{
         globalTime: this.globalTime,
         localTime: -options.originTime,
         entropy: -options.originTime,
@@ -2325,25 +2285,43 @@ var EVA = function (exports) {
         globalEntropy: 0
       }];
 
-      if (this[_parent]) {
-        this[_timeMark][0].globalEntropy = this[_parent].entropy;
+      if (this._parent) {
+        this._timeMark[0].globalEntropy = this._parent.entropy;
       }
 
-      this[_originTime] = options.originTime;
-      this[_playbackRate] = options.playbackRate;
-      this[_timers] = new Map();
+      this._playbackRate = options.playbackRate;
     }
 
-    var _proto = Timeline.prototype;
+    Object.defineProperty(Timeline.prototype, "globalTime", {
+      get: function get() {
+        return this.parent ? this.parent.currentTime : _nowtime() - this._createTime;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(Timeline.prototype, "parent", {
+      get: function get() {
+        return this._parent;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(Timeline.prototype, "lastTimeMark", {
+      get: function get() {
+        return this._timeMark[this._timeMark.length - 1];
+      },
+      enumerable: false,
+      configurable: true
+    });
 
-    _proto.markTime = function markTime(_temp) {
-      var _ref = _temp === void 0 ? {} : _temp,
-          _ref$time = _ref.time,
-          time = _ref$time === void 0 ? this.currentTime : _ref$time,
-          _ref$entropy = _ref.entropy,
-          entropy = _ref$entropy === void 0 ? this.entropy : _ref$entropy,
-          _ref$playbackRate = _ref.playbackRate,
-          playbackRate = _ref$playbackRate === void 0 ? this.playbackRate : _ref$playbackRate;
+    Timeline.prototype.markTime = function (_a) {
+      var _b = _a === void 0 ? {} : _a,
+          _c = _b.time,
+          time = _c === void 0 ? this.currentTime : _c,
+          _d = _b.entropy,
+          entropy = _d === void 0 ? this.entropy : _d,
+          _e = _b.playbackRate,
+          playbackRate = _e === void 0 ? this.playbackRate : _e;
 
       var timeMark = {
         globalTime: this.globalTime,
@@ -2353,25 +2331,68 @@ var EVA = function (exports) {
         globalEntropy: this.globalEntropy
       };
 
-      this[_timeMark].push(timeMark);
+      this._timeMark.push(timeMark);
     };
 
-    _proto.fork = function fork(options) {
+    Object.defineProperty(Timeline.prototype, "currentTime", {
+      get: function get() {
+        var _a = this.lastTimeMark,
+            localTime = _a.localTime,
+            globalTime = _a.globalTime;
+        return localTime + (this.globalTime - globalTime) * this.playbackRate;
+      },
+      set: function set(time) {
+        this.markTime({
+          time: time
+        });
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(Timeline.prototype, "globalEntropy", {
+      get: function get() {
+        return this._parent ? this._parent.entropy : this.globalTime;
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(Timeline.prototype, "entropy", {
+      get: function get() {
+        var _a = this.lastTimeMark,
+            entropy = _a.entropy,
+            globalEntropy = _a.globalEntropy;
+        return entropy + Math.abs((this.globalEntropy - globalEntropy) * this.playbackRate);
+      },
+      set: function set(entropy) {
+        if (this.entropy > entropy) {
+          var idx = this.seekTimeMark(entropy);
+          this._timeMark.length = idx + 1;
+        }
+
+        this.markTime({
+          entropy: entropy
+        });
+      },
+      enumerable: false,
+      configurable: true
+    });
+
+    Timeline.prototype.fork = function (options) {
       return new Timeline(options, this);
     };
 
-    _proto.seekGlobalTime = function seekGlobalTime(seekEntropy) {
+    Timeline.prototype.seekGlobalTime = function (seekEntropy) {
       var idx = this.seekTimeMark(seekEntropy),
-          timeMark = this[_timeMark][idx];
+          timeMark = this._timeMark[idx];
       var entropy = timeMark.entropy,
           playbackRate = timeMark.playbackRate,
           globalTime = timeMark.globalTime;
       return globalTime + (seekEntropy - entropy) / Math.abs(playbackRate);
     };
 
-    _proto.seekLocalTime = function seekLocalTime(seekEntropy) {
+    Timeline.prototype.seekLocalTime = function (seekEntropy) {
       var idx = this.seekTimeMark(seekEntropy),
-          timeMark = this[_timeMark][idx];
+          timeMark = this._timeMark[idx];
       var localTime = timeMark.localTime,
           entropy = timeMark.entropy,
           playbackRate = timeMark.playbackRate;
@@ -2383,8 +2404,8 @@ var EVA = function (exports) {
       return localTime - (seekEntropy - entropy);
     };
 
-    _proto.seekTimeMark = function seekTimeMark(entropy) {
-      var timeMark = this[_timeMark];
+    Timeline.prototype.seekTimeMark = function (entropy) {
+      var timeMark = this._timeMark;
       var l = 0,
           r = timeMark.length - 1;
 
@@ -2415,246 +2436,22 @@ var EVA = function (exports) {
       return l;
     };
 
-    _proto.updateTimers = function updateTimers() {
-      var _this2 = this;
-
-      var timers = Array.from(this[_timers].entries());
-      timers.forEach(function (_ref2) {
-        var id = _ref2[0],
-            timer = _ref2[1];
-
-        _this2[_setTimer](timer.handler, timer.time, id);
-      });
-    };
-
-    _proto.clearTimeout = function (_clearTimeout) {
-      function clearTimeout(_x) {
-        return _clearTimeout.apply(this, arguments);
-      }
-
-      clearTimeout.toString = function () {
-        return _clearTimeout.toString();
-      };
-
-      return clearTimeout;
-    }(function (id) {
-      var timer = this[_timers].get(id);
-
-      if (timer && timer.timerID != null) {
-        if (this[_parent]) {
-          this[_parent].clearTimeout(timer.timerID);
-        } else {
-          clearTimeout(timer.timerID);
-        }
-      }
-
-      this[_timers].delete(id);
-    });
-
-    _proto.clearInterval = function clearInterval(id) {
-      return this.clearTimeout(id);
-    };
-
-    _proto.clear = function clear() {
-      var _this3 = this;
-
-      var timers = this[_timers];
-      Array.from(Object.keys(timers)).forEach(function (id) {
-        _this3.clearTimeout(id);
-      });
-    };
-
-    _proto.setTimeout = function setTimeout(handler, time) {
-      if (time === void 0) {
-        time = {
-          delay: 0
-        };
-      }
-
-      return this[_setTimer](handler, time);
-    };
-
-    _proto.setInterval = function setInterval(handler, time) {
-      if (time === void 0) {
-        time = {
-          delay: 0
-        };
-      }
-
-      var that = this;
-
-      var id = this[_setTimer](function step() {
-        that[_setTimer](step, time, id);
-
-        handler();
-      }, time);
-
-      return id;
-    };
-
-    _proto[_setTimer] = function (handler, time, id) {
-      var _this4 = this;
-
-      if (id === void 0) {
-        id = Symbol('timerID');
-      }
-
-      time = formatDelay(time);
-
-      var timer = this[_timers].get(id);
-
-      var delay,
-          timerID = null,
-          startTime,
-          startEntropy;
-
-      if (timer) {
-        this.clearTimeout(id);
-
-        if (time.isEntropy) {
-          delay = (time.delay - (this.entropy - timer.startEntropy)) / Math.abs(this.playbackRate);
-        } else {
-          delay = (time.delay - (this.currentTime - timer.startTime)) / this.playbackRate;
-        }
-
-        startTime = timer.startTime;
-        startEntropy = timer.startEntropy;
-      } else {
-        delay = time.delay / (time.isEntropy ? Math.abs(this.playbackRate) : this.playbackRate);
-        startTime = this.currentTime;
-        startEntropy = this.entropy;
-      }
-
-      var parent = this[_parent],
-          globalTimeout = parent ? parent.setTimeout.bind(parent) : setTimeout;
-      var heading = time.heading;
-
-      if (!parent && heading === false && delay < 0) {
-        delay = Infinity;
-      }
-
-      if (isFinite(delay) || parent) {
-        delay = Math.ceil(delay);
-
-        if (globalTimeout !== setTimeout) {
-          delay = {
-            delay: delay,
-            heading: heading
-          };
-        }
-
-        timerID = globalTimeout(function () {
-          _this4[_timers].delete(id);
-
-          handler();
-        }, delay);
-      }
-
-      this[_timers].set(id, {
-        timerID: timerID,
-        handler: handler,
-        time: time,
-        startTime: startTime,
-        startEntropy: startEntropy
-      });
-
-      return id;
-    };
-
-    _createClass(Timeline, [{
-      key: "parent",
-      get: function get() {
-        return this[_parent];
-      }
-    }, {
-      key: "lastTimeMark",
-      get: function get() {
-        return this[_timeMark][this[_timeMark].length - 1];
-      }
-    }, {
-      key: "currentTime",
-      get: function get() {
-        var _this$lastTimeMark = this.lastTimeMark,
-            localTime = _this$lastTimeMark.localTime,
-            globalTime = _this$lastTimeMark.globalTime;
-        return localTime + (this.globalTime - globalTime) * this.playbackRate;
-      },
-      set: function set(time) {
-        var _this5 = this;
-
-        var from = this.currentTime,
-            to = time,
-            timers = this[_timers];
-        this.markTime({
-          time: time
-        });
-        Array.from(Object.entries(timers)).forEach(function (_ref3) {
-          var id = _ref3[0],
-              timer = _ref3[1];
-          if (!timers.has(id)) return;
-          var _timer$time = timer.time,
-              isEntropy = _timer$time.isEntropy,
-              delay = _timer$time.delay,
-              heading = _timer$time.heading,
-              handler = timer.handler,
-              startTime = timer.startTime;
-
-          if (!isEntropy) {
-            var endTime = startTime + delay;
-
-            if (delay === 0 || heading !== false && (to - from) * delay <= 0 || from <= endTime && endTime <= to || from >= endTime && endTime >= to) {
-              handler();
-
-              _this5.clearTimeout(id);
-            }
-          } else if (delay === 0) {
-            handler();
-
-            _this5.clearTimeout(id);
-          }
-        });
-        this.updateTimers();
-      }
-    }, {
-      key: "entropy",
+    Object.defineProperty(Timeline.prototype, "playbackRate", {
       get: function get() {
-        var _this$lastTimeMark2 = this.lastTimeMark,
-            entropy = _this$lastTimeMark2.entropy,
-            globalEntropy = _this$lastTimeMark2.globalEntropy;
-        return entropy + Math.abs((this.globalEntropy - globalEntropy) * this.playbackRate);
-      },
-      set: function set(entropy) {
-        if (this.entropy > entropy) {
-          var idx = this.seekTimeMark(entropy);
-          this[_timeMark].length = idx + 1;
-        }
-
-        this.markTime({
-          entropy: entropy
-        });
-        this.updateTimers();
-      }
-    }, {
-      key: "globalEntropy",
-      get: function get() {
-        return this[_parent] ? this[_parent].entropy : this.globalTime;
-      }
-    }, {
-      key: "playbackRate",
-      get: function get() {
-        return this[_playbackRate];
+        return this._playbackRate;
       },
       set: function set(rate) {
         if (rate !== this.playbackRate) {
           this.markTime({
             playbackRate: rate
           });
-          this[_playbackRate] = rate;
-          this.updateTimers();
+          this._playbackRate = rate;
         }
-      }
-    }, {
-      key: "paused",
+      },
+      enumerable: false,
+      configurable: true
+    });
+    Object.defineProperty(Timeline.prototype, "paused", {
       get: function get() {
         if (this.playbackRate === 0) return true;
         var parent = this.parent;
@@ -2665,9 +2462,10 @@ var EVA = function (exports) {
         }
 
         return false;
-      }
-    }]);
-
+      },
+      enumerable: false,
+      configurable: true
+    });
     return Timeline;
   }();
 
@@ -5294,7 +5092,7 @@ var EVA = function (exports) {
     IDEProp: IDEProp,
     componentObserver: componentObserver
   };
-  var version = '1.1.11';
+  var version = '1.1.14';
   console.log("Eva.js version: " + version);
   exports.Component = Component$1;
   exports.Game = Game$1;