From 7ccbdac37bc50f7d6c9ded766170d8b2f22cc1d9 Mon Sep 17 00:00:00 2001 From: Bala Clark Date: Wed, 15 Jul 2015 10:47:44 +0200 Subject: [PATCH] use arrow function syntax where possible --- app/comic-book.js | 37 +++++++++++++++++++------------------ test/comic-book.test.js | 8 ++++---- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/comic-book.js b/app/comic-book.js index e764a4e..977af1d 100644 --- a/app/comic-book.js +++ b/app/comic-book.js @@ -22,25 +22,26 @@ module.exports = class ComicBook extends EventEmitter { } preload () { + let self = this + this.emit('preload:start') - this.srcs.forEach(loadImage.bind(this)) - } -} - -function loadImage (src, pageIndex) { - let self = this - let image = new window.Image() - - image.src = src - image.onload = setImage - - function setImage () { - self.pages.set(pageIndex, this) - self.emit('preload:image', this) - - if (self.pages.size === self.srcs.size) { - self.emit('preload:finish') - } + + this.srcs.forEach((src, pageIndex) => { + let image = new window.Image() + + image.src = src + image.onload = setImage + + function setImage () { + self.pages.set(pageIndex, this) + self.emit('preload:image', this) + + if (self.pages.size === self.srcs.size) { + self.emit('preload:finish') + } + } + }) } + } diff --git a/test/comic-book.test.js b/test/comic-book.test.js index 1eec13c..e850dd0 100644 --- a/test/comic-book.test.js +++ b/test/comic-book.test.js @@ -12,13 +12,13 @@ describe('ComicBook', function () { describe('preload images', function () { - it('should preload all given image srcs and emit preload:image, preload:finish events', function (done) { + it('should preload all given image srcs and emit preload:image, preload:finish events', done => { let comic = new ComicBook(srcs) let loaded = [] comic.on('preload:image', image => loaded.push(image.src)) - comic.on('preload:finish', function () { + comic.on('preload:finish', () => { assert.deepEqual(loaded, srcs, 'all requested images should have been loaded') done() }) @@ -30,7 +30,7 @@ describe('ComicBook', function () { it('should preload images in both directions') - it('should emit a preload:start event', function (done) { + it('should emit a preload:start event', done => { let comic = new ComicBook(srcs) comic.on('preload:start', () => done()) @@ -42,7 +42,7 @@ describe('ComicBook', function () { it('preload:ready should make sure that double page mode can show two images') - it('should show the load indicator on preload:start', function (done) { + it('should show the load indicator on preload:start', done => { let comic = new ComicBook(srcs) assert.equal(comic.loadIndicator.el.style.display, 'none') comic.loadIndicator.on('show', () => done())