From 963147104ab842bd90f0e5a7ef915637008c46a9 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Mon, 23 Feb 2015 20:17:20 -0800 Subject: [PATCH] Use placeholder images for item groups --- scripts/server | 5 ++++- src/scripts/controllers/image_loader.coffee | 16 +++++++++++++--- .../controllers/mod_page_controller.coffee | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/scripts/server b/scripts/server index 9efd8feb1..b44bf1bb7 100755 --- a/scripts/server +++ b/scripts/server @@ -41,7 +41,10 @@ app.get '*', (request, response)-> console.log ">>> #{request.path}" response.set 'Content-Type', contentType - response.sendFile request.path, root:ROOT + + sendFile = -> response.sendFile request.path, root:ROOT + + setTimeout sendFile, 100 # change the zero to post files after a short delay server = app.listen 8000, -> console.log "listening at: #{server.address().address}:#{server.address().port}" diff --git a/src/scripts/controllers/image_loader.coffee b/src/scripts/controllers/image_loader.coffee index 3283f39cf..83a3d3846 100644 --- a/src/scripts/controllers/image_loader.coffee +++ b/src/scripts/controllers/image_loader.coffee @@ -13,8 +13,10 @@ module.exports = class ImageLoader constructor: (options={})-> options.defaultUrl ?= null - options.onLoading ?= -> @hide() - options.onLoad ?= -> @show() + + if not options.defaultUrl? + options.onLoading ?= -> @hide() + options.onLoad ?= -> @show() @defaultUrl = options.defaultUrl @onLoading = options.onLoading @@ -22,6 +24,10 @@ module.exports = class ImageLoader @_images = {} + if @defaultUrl + @_defaultImage = new Image + @_defaultImage.src = @defaultUrl + # Class Methods ################################################################################ @load: (imageUrl, $el, options={}) -> @@ -48,7 +54,11 @@ module.exports = class ImageLoader if data.isLoaded @_loadImageIntoElement data.imageUrl, $el else - $el.removeAttr 'src' + if @defaultUrl? + $el.attr 'src', @defaultUrl + else + $el.removeAttr 'src' + if data.elements.indexOf($el) is -1 then data.elements.push $el return this diff --git a/src/scripts/controllers/mod_page_controller.coffee b/src/scripts/controllers/mod_page_controller.coffee index c09758661..08f20f403 100644 --- a/src/scripts/controllers/mod_page_controller.coffee +++ b/src/scripts/controllers/mod_page_controller.coffee @@ -129,7 +129,7 @@ module.exports = class ModPageController extends BaseController $link.slideDown duration:Duration.normal $link.attr 'href', url else - $link.sludeUp duration:Duration.normal + $link.slideUp duration:Duration.normal _refreshVersions: -> @$versionSelector.empty()