flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-30 19:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

some minor tweaks and cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2014-01-30 01:22:56 +04:00
parent 84a869c2c8
commit 4ead136b4d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/files.js
View File

@ -80,7 +80,7 @@ function statusNotify(prefix, loader, not_queued){
} }
return loader return loader
.progress(function(){ .progress(function(){
var args = args2array(arguments) var args = $.makeArray(arguments)
var getter = args[args.length-1] var getter = args[args.length-1]
if(getter != null && getter.isResolved != null){ if(getter != null && getter.isResolved != null){
@ -120,7 +120,7 @@ function statusProgress(msg, tracker){
closeProgressBar(progress) closeProgressBar(progress)
}) })
.progress(function(){ .progress(function(){
var args = args2array(arguments) var args = $.makeArray(arguments)
var getter = args[args.length-1] var getter = args[args.length-1]
total += 1 total += 1
@ -156,7 +156,7 @@ function bubbleProgress(prefix, from, to, only_progress){
from from
.progress(function(){ .progress(function(){
var args = args2array(arguments) var args = $.makeArray(arguments)
prefix != null && args.splice(0, 0, prefix) prefix != null && args.splice(0, 0, prefix)
to.notify.apply(to, args) to.notify.apply(to, args)
}) })
@ -164,11 +164,11 @@ function bubbleProgress(prefix, from, to, only_progress){
if(!only_progress){ if(!only_progress){
from from
.done(function(){ .done(function(){
var args = args2array(arguments) var args = $.makeArray(arguments)
to.resolve.apply(to, args) to.resolve.apply(to, args)
}) })
.fail(function(){ .fail(function(){
var args = args2array(arguments) var args = $.makeArray(arguments)
prefix != null && args.splice(0, 0, prefix) prefix != null && args.splice(0, 0, prefix)
to.reject.apply(to, args) to.reject.apply(to, args)
}) })
@ -244,14 +244,10 @@ function loadLatestJSONFile(path, dfl, pattern, diff_pattern, default_data, trac
// keep the sort order... // keep the sort order...
diff_data[i+1] = data diff_data[i+1] = data
}) })
// XXX need to notify as early as possible but doing
// it outside this (see below) will notify BEFORE
// anyone's listening...
.always(function(){ .always(function(){
res.notify(e, getter) res.notify(e, getter)
}) })
// XXX the problem here is if we miss this, then there
// is no chance to get it back...
tracker != null && tracker.notify(e, getter) tracker != null && tracker.notify(e, getter)
return getter return getter
@ -268,8 +264,8 @@ function loadLatestJSONFile(path, dfl, pattern, diff_pattern, default_data, trac
// load the main file and merge the diff with it... // load the main file and merge the diff with it...
var getter = $.getJSON(path +'/'+ file) var getter = $.getJSON(path +'/'+ file)
.always(function(){ .always(function(){
tracker != null && tracker.notify(file, getter)
res.notify(file, getter) res.notify(file, getter)
tracker != null && tracker.notify(file, getter)
}) })
$.when(diff, getter) $.when(diff, getter)
.done(function(_, json){ .done(function(_, json){