Browse Source

docs: Fix a few typos

There are small typos in:
- spec/spec/animation/Runner.js
- src/animation/Runner.js
- src/animation/Timeline.js

Fixes:
- Should read `successful` rather than `successfull`.
- Should read `transforms` rather than `tranforms`.
- Should read `resetting` rather than `reseting`.
- Should read `overwrite` rather than `overwfrite`.
- Should read `morpher` rather than `morepher`.
- Should read `declarative` rather than `declaritive`.

Signed-off-by: Tim Gates <tim.gates@iress.com>
tags/3.2.0
Tim Gates 1 year ago
parent
commit
d3630aa698
No account linked to committer's email address
3 changed files with 17 additions and 17 deletions
  1. 11
    11
      spec/spec/animation/Runner.js
  2. 3
    3
      src/animation/Runner.js
  3. 3
    3
      src/animation/Timeline.js

+ 11
- 11
spec/spec/animation/Runner.js View File

it('throws away the morpher if it wasnt initialized yet and returns false', () => { it('throws away the morpher if it wasnt initialized yet and returns false', () => {
const rect = new Rect().move(0, 0) const rect = new Rect().move(0, 0)
const runner = rect.animate().move(10, 10) const runner = rect.animate().move(10, 10)
// In that case tryRetarget is not successfull
// In that case tryRetarget is not successful
expect(runner._tryRetarget('x', 20)).toBe(false) expect(runner._tryRetarget('x', 20)).toBe(false)
}) })


const rect = new Rect().move(0, 0) const rect = new Rect().move(0, 0)
const runner = rect.animate().move(10, 10) const runner = rect.animate().move(10, 10)
jasmine.RequestAnimationFrame.tick(16) jasmine.RequestAnimationFrame.tick(16)
// In that case tryRetarget is not successfull
// In that case tryRetarget is not successful
expect(runner._tryRetarget('foo', 20)).toBe(false) expect(runner._tryRetarget('foo', 20)).toBe(false)
}) })


const rect = new Rect() const rect = new Rect()
const runner = rect.animate(new Controller(() => 0)).transform({ translate: [ 10, 10 ] }) const runner = rect.animate(new Controller(() => 0)).transform({ translate: [ 10, 10 ] })
jasmine.RequestAnimationFrame.tick(16) jasmine.RequestAnimationFrame.tick(16)
// In that case tryRetarget is not successfull
// In that case tryRetarget is not successful
expect(runner._tryRetarget('transform', { translate: [ 20, 20 ] })).toBe(true) expect(runner._tryRetarget('transform', { translate: [ 20, 20 ] })).toBe(true)
}) })


it('starts the timeline if retarget was successfull', () => {
it('starts the timeline if retarget was successful', () => {
const timeline = new Timeline() const timeline = new Timeline()
const rect = new Rect().move(0, 0).timeline(timeline) const rect = new Rect().move(0, 0).timeline(timeline)
const runner = rect.animate().move(10, 10) const runner = rect.animate().move(10, 10)
runner.transform({ translate: [ 10, 20 ], scale: 2, rotate: 90 }) runner.transform({ translate: [ 10, 20 ], scale: 2, rotate: 90 })
runner.step(50) runner.step(50)
// transform sets an immediate callback to apply all merged transforms // transform sets an immediate callback to apply all merged transforms
// when every runner had the chance to add its bit of tranforms
// when every runner had the chance to add its bit of transforms
jasmine.RequestAnimationFrame.tick(1) jasmine.RequestAnimationFrame.tick(1)
expect(element.matrix().decompose()).toEqual(objectContaining({ expect(element.matrix().decompose()).toEqual(objectContaining({
translateX: 5, translateX: 5,
runner.translate(10, 20).scale(2).rotate(45) runner.translate(10, 20).scale(2).rotate(45)
runner.step(50) runner.step(50)
// transform sets an immediate callback to apply all merged transforms // transform sets an immediate callback to apply all merged transforms
// when every runner had the chance to add its bit of tranforms
// when every runner had the chance to add its bit of transforms
jasmine.RequestAnimationFrame.tick(1) jasmine.RequestAnimationFrame.tick(1)


// The origin is transformed with every // The origin is transformed with every
runner2.step(50) runner2.step(50)
runner3.step(50) runner3.step(50)
// transform sets an immediate callback to apply all merged transforms // transform sets an immediate callback to apply all merged transforms
// when every runner had the chance to add its bit of tranforms
// when every runner had the chance to add its bit of transforms
jasmine.RequestAnimationFrame.tick(1) jasmine.RequestAnimationFrame.tick(1)


// The origin is transformed with every // The origin is transformed with every
runner2.step(50) runner2.step(50)
runner3.step(50) runner3.step(50)
// transform sets an immediate callback to apply all merged transforms // transform sets an immediate callback to apply all merged transforms
// when every runner had the chance to add its bit of tranforms
// when every runner had the chance to add its bit of transforms
jasmine.RequestAnimationFrame.tick(1) jasmine.RequestAnimationFrame.tick(1)


expect(runner1._queue.length).toBe(0) expect(runner1._queue.length).toBe(0)
runner.transform(new Matrix({ rotate: 90 })) runner.transform(new Matrix({ rotate: 90 }))
runner.step(50) runner.step(50)
// transform sets an immediate callback to apply all merged transforms // transform sets an immediate callback to apply all merged transforms
// when every runner had the chance to add its bit of tranforms
// when every runner had the chance to add its bit of transforms
jasmine.RequestAnimationFrame.tick(1) jasmine.RequestAnimationFrame.tick(1)


// The origin is transformed with every // The origin is transformed with every
runner.transform(Object.assign({ affine: true }, new Matrix({ rotate: 90 }))) runner.transform(Object.assign({ affine: true }, new Matrix({ rotate: 90 })))
runner.step(50) runner.step(50)
// transform sets an immediate callback to apply all merged transforms // transform sets an immediate callback to apply all merged transforms
// when every runner had the chance to add its bit of tranforms
// when every runner had the chance to add its bit of transforms
jasmine.RequestAnimationFrame.tick(1) jasmine.RequestAnimationFrame.tick(1)


// The origin is transformed with every // The origin is transformed with every
runner.transform(new Matrix({ rotate: 90 }), true, true) runner.transform(new Matrix({ rotate: 90 }), true, true)
runner.step(50) runner.step(50)
// transform sets an immediate callback to apply all merged transforms // transform sets an immediate callback to apply all merged transforms
// when every runner had the chance to add its bit of tranforms
// when every runner had the chance to add its bit of transforms
jasmine.RequestAnimationFrame.tick(1) jasmine.RequestAnimationFrame.tick(1)


// The origin is transformed with every // The origin is transformed with every

+ 3
- 3
src/animation/Runner.js View File

this.fire('step', this) this.fire('step', this)
} }
// correct the done flag here // correct the done flag here
// declaritive animations itself know when they converged
// declarative animations itself know when they converged
this.done = this.done || (converged && declarative) this.done = this.done || (converged && declarative)
if (justFinished) { if (justFinished) {
this.fire('finished', this) this.fire('finished', this)


// this function searches for all runners on the element and deletes the ones // this function searches for all runners on the element and deletes the ones
// which run before the current one. This is because absolute transformations // which run before the current one. This is because absolute transformations
// overwfrite anything anyway so there is no need to waste time computing
// overwrite anything anyway so there is no need to waste time computing
// other runners // other runners
_clearTransformRunnersBefore (currentRunner) { _clearTransformRunnersBefore (currentRunner) {
this._transformationRunners.clearBefore(currentRunner.id) this._transformationRunners.clearBefore(currentRunner.id)
? transforms.affine ? transforms.affine
: (affine != null ? affine : !isMatrix) : (affine != null ? affine : !isMatrix)


// Create a morepher and set its type
// Create a morpher and set its type
const morpher = new Morphable(this._stepper) const morpher = new Morphable(this._stepper)
.type(affine ? TransformBag : Matrix) .type(affine ? TransformBag : Matrix)



+ 3
- 3
src/animation/Timeline.js View File

// the runner to position 0 // the runner to position 0


// FIXME: // FIXME:
// However, reseting in insertion order leads to bugs. Considering the case,
// However, resetting in insertion order leads to bugs. Considering the case,
// where 2 runners change the same attribute but in different times, // where 2 runners change the same attribute but in different times,
// reseting both of them will lead to the case where the later defined
// resetting both of them will lead to the case where the later defined
// runner always wins the reset even if the other runner started earlier // runner always wins the reset even if the other runner started earlier
// and therefore should win the attribute battle // and therefore should win the attribute battle
// this can be solved by reseting them backwards
// this can be solved by resetting them backwards
for (let k = this._runners.length; k--;) { for (let k = this._runners.length; k--;) {
// Get and run the current runner and ignore it if its inactive // Get and run the current runner and ignore it if its inactive
const runnerInfo = this._runners[k] const runnerInfo = this._runners[k]

Loading…
Cancel
Save