fmartingr
/
shelfzilla
Archived
1
0
Fork 0
Code Releases Activity

Improved imageLoaded integration with pjax

This commit is contained in:
Felipe Martin 2014-04-21 18:18:58 +02:00
parent 5a08f09455
commit 88c74d0188
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
shelfzilla/themes/bootflat/static/coffee/main.coffee
View File

@ -14,17 +14,29 @@ window.updateMessages = ->
toastr[message.extra_tags](message.message) toastr[message.extra_tags](message.message)
window._updateMessages = false window._updateMessages = false
window.imageLoad = (element) ->
imgLoad = imagesLoaded(element)
imgLoad.on 'done', (event) ->
NProgress.done()
imgLoad.on 'progress', (instance, image) ->
inc = instance.images.length/1000
NProgress.inc(inc)
# Document ready # Document ready
$ -> $ ->
# Update messages # Update messages
window.updateMessages() window.updateMessages()
# Increment for document loaded
NProgress.inc(0.3) # Document load progress bar
window.imageLoad(document)
# Background # Background
$.vegas $.vegas
src: '/static/backgrounds/shelves.jpg' src: '/static/backgrounds/shelves.jpg'
fade: 1200 fade: 1200
complete: -> NProgress.done() #complete: -> NProgress.done()
# PJAX # PJAX
if $.support.pjax if $.support.pjax
@ -43,7 +55,7 @@ $ ->
$.pjax.click event, { $.pjax.click event, {
container: container, container: container,
timeout: 1000, timeout: 5000,
push: push push: push
} }
@ -56,8 +68,7 @@ $('[data-toggle="tooltip"]').tooltip();
# Nprogress # Nprogress
$(document).on 'pjax:start', -> NProgress.start() $(document).on 'pjax:start', -> NProgress.start()
$(document).on 'pjax:end', (event) -> $(document).on 'pjax:end', (event) ->
$(event.target).imagesLoaded -> window.imageLoad(event.target)
NProgress.done()
if window._updateMessages if window._updateMessages
window.updateMessages() window.updateMessages()