many improvements

* draw single images
* integrate load overlay properly
* preload:ready event
This commit is contained in:
Bala Clark 2015-07-19 00:16:22 +02:00
parent d8cbdc709d
commit 78e5fcd049
10 changed files with 363 additions and 115 deletions

View file

@ -1,4 +1,5 @@
let EventEmitter = require('events').EventEmitter
let Canvas = require('./view/canvas')
let LoadIndicator = require('./view/load-indicator')
let ProgressBar = require('./view/progress-bar')
@ -8,11 +9,17 @@ class ComicBook extends EventEmitter {
super()
// requested image srcs
this.srcs = new Set(srcs)
this.srcs = srcs
// loaded image objects
this.pages = new Map()
this.preloadBuffer = 4
// TODO move this logic into the router
this.currentPageIndex = 0
this.canvas = new Canvas()
this.loadIndicator = new LoadIndicator()
this.progressBar = new ProgressBar()
@ -23,41 +30,60 @@ class ComicBook extends EventEmitter {
this.on('preload:start', this.loadIndicator.show.bind(this.loadIndicator))
this.on('preload:start', this.progressBar.show.bind(this.progressBar))
this.on('preload:image', this.updateProgressBar.bind(this))
this.on('preload:ready', this.loadIndicator.hide.bind(this.loadIndicator))
this.on('preload:ready', this.drawPage.bind(this))
this.on('preload:finish', this.progressBar.hide.bind(this.progressBar))
}
render () {
this.el = document.createElement('div')
this.el.appendChild(this.canvas.canvas)
this.el.appendChild(this.progressBar.el)
this.el.appendChild(this.loadIndicator.el)
return this
}
preload () {
let self = this
this.emit('preload:start')
this.srcs.forEach((src, pageIndex) => {
let image = new window.Image()
image.src = src
image.onload = setImage
image.onload = setImage.bind(this, image, pageIndex)
function setImage () {
self.pages.set(pageIndex, this)
self.emit('preload:image', this)
function setImage (image, index) {
this.pages.set(index, image)
this.emit('preload:image', image)
if (self.pages.size === self.srcs.size) {
self.emit('preload:finish')
if (this.pages.size === this.preloadBuffer) {
this.emit('preload:ready')
}
if (this.pages.size === this.srcs.length) {
this.emit('preload:finish')
}
}
})
}
updateProgressBar () {
let percentage = Math.floor((this.pages.size / this.srcs.size) * 100)
let percentage = Math.floor((this.pages.size / this.srcs.length) * 100)
this.progressBar.update(percentage)
}
drawPage () {
let page = this.pages.get(this.currentPageIndex)
this.canvas.drawImage(page)
}
drawNextPage () {
// TODO
}
drawPrevioousPage () {
// TODO
}
}
module.exports = ComicBook

View file

@ -49,6 +49,11 @@ body:not(.mobile) .navigate:hover {
opacity: 0.8;
background: #000 url("img/loading.gif") no-repeat center;
box-shadow: none;
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
#cb-status {