* fix: Tests now passes

* fix: Added missing file

Author: dalisoft

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "es6-tween",
-	"version": "3.2.0",
+	"version": "3.3.0",
 	"description": "ES6 implementation of amazing tween.js",
 	"browser": "dist/Tween.min.js",
 	"cdn": "dist/Tween.min.js",

src/dist/PlaybackPosition.js

@@ -0,0 +1,60 @@
+export default class PlaybackPosition {
+  constructor () {
+    this.totalTime = 0
+    this.labels = []
+    this.offsets = []
+  }
+  parseLabel (name, offset) {
+    const { offsets, labels } = this
+    let i = labels.indexOf(name)
+    if (typeof name === 'string' && name.indexOf('=') !== -1 && !offset && i === -1) {
+      const rty = name.substr(name.indexOf('=') - 1, 2)
+      let rt = name.split(rty)
+      offset = rt.length === 2 ? rty + rt[1] : null
+      name = rt[0]
+      i = labels.indexOf(name)
+    }
+    if (i !== -1 && name) {
+      let currOffset = offsets[i] || 0
+      if (typeof offset === 'number') {
+        currOffset = offset
+      } else if (typeof offset === 'string') {
+        if (offset.indexOf('=') !== -1) {
+          const type = offset.charAt(0)
+          offset = Number(offset.substr(2))
+          if (type === '+' || type === '-') {
+            currOffset += parseFloat(type + offset)
+          } else if (type === '*') {
+            currOffset *= offset
+          } else if (type === '/') {
+            currOffset /= offset
+          } else if (type === '%') {
+            currOffset *= offset / 100
+          }
+        }
+      }
+      return currOffset
+    }
+    return typeof offset === 'number' ? offset : 0
+  }
+  addLabel (name, offset) {
+    this.labels.push(name)
+    this.offsets.push(this.parseLabel(name, offset))
+    return this
+  }
+  setLabel (name, offset) {
+    const i = this.labels.indexOf(name)
+    if (i !== -1) {
+      this.offsets.splice(i, 1, this.parseLabel(name, offset))
+    }
+    return this
+  }
+  eraseLabel (name) {
+    const i = this.labels.indexOf(name)
+    if (i !== -1) {
+      this.labels.splice(i, 1)
+      this.offsets.splice(i, 1)
+    }
+    return this
+  }
+}

src/dist/Tween.js

@@ -326,7 +326,7 @@ class Tween extends EventClass {
     return this.object
   }
 
-  update (time) {
+  update (time, preserve) {
     let {
       _onStartCallbackFired,
       _easingFunction,
@@ -389,6 +389,17 @@ class Tween extends EventClass {
         object[property] = _interpolationFunction(end, value)
       } else if (typeof (end) === 'number') {
         object[property] = start + (end - start) * value
+      } else if (typeof (end) === 'string') {
+        if (end.charAt(0) === '+' || end.charAt(0) === '-') {
+          end = start + parseFloat(end)
+        } else {
+          end = parseFloat(end)
+        }
+
+        // Protect against non numeric properties.
+        if (typeof (end) === 'number') {
+          object[property] = start + (end - start) * value
+        }
       }
     }
 
@@ -400,6 +411,12 @@ class Tween extends EventClass {
           this._repeat--
         }
 
+        for (property in _valuesEnd) {
+          if (typeof (_valuesEnd[property]) === 'string' && typeof (_valuesStart[property]) === 'number') {
+            _valuesStart[property] = _valuesStart[property] + parseFloat(_valuesEnd[property])
+          }
+        }
+
         // Reassign starting values, restart by making startTime = now
         this.emit(_reversed ? EVENT_REVERSE : EVENT_REPEAT, object)
 
@@ -415,11 +432,11 @@ class Tween extends EventClass {
           this._startTime += _duration
         }
 
-        this.reassignValues()
-
         return true
       } else {
-        remove(this)
+        if (!preserve) {
+          remove(this)
+        }
         this.emit(EVENT_COMPLETE, object)
         this._repeat = this._r
 

src/dist/core.js

@@ -96,7 +96,7 @@ let now = (function () {
   }
 }())
 
-const update = (time) => {
+const update = (time, preserve) => {
   time = time !== undefined ? time : now()
 
   _tick = _ticker(update)
@@ -110,7 +110,7 @@ const update = (time) => {
   }
 
   for (i in _tweens) {
-    _tweens[i].update(time)
+    _tweens[i].update(time, preserve)
   }
 
   return true