several bugfixes...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-06-08 23:53:35 +04:00
parent 07415e244b
commit 6bd8782a21
2 changed files with 18 additions and 19 deletions

View File

@ -1,5 +1,5 @@
Roadmap
[_] 41% Pre-Alpha - limited preview
[_] 43% Pre-Alpha - limited preview
[_] 31% UI
[_] 0% Tablet-specific
[_] screen buttons
@ -53,16 +53,16 @@ Roadmap
[X] marked
[_] tag
[_] date
[_] 39% storage and loading
[_] 45% storage and loading
[_] 75% ImageGrid cache
[X] generate
[X] load
[X] save
[_] update
| needs revision...
[_] 25% fav tree
[_] 50% fav tree
[X] generate
[_] load
[X] load
[_] save
[_] update
[_] 25% xmp files
@ -77,12 +77,12 @@ Roadmap
[_] 14% build targets
[X] 100% Windows
[X] CEF (Python/...)
[X] AppJS
[_] MacOS X (AppJS)
[X] node-webkit
[_] MacOS X (node-webkit)
[_] Android (PhoneGap)
[_] iOS (PhoneGap)
[_] Windows 8 (Native?)
[_] Linux (AppJS)
[_] Linux (node-webkit)
[_] Windows Phone 8 (PhoneGap/Native)
[_] 0% Alpha - limited preview
[_] 0% Beta - public?
@ -92,11 +92,12 @@ Roadmap
[_] 24% Gen 3 current todo
[_] 49% High priority
[_] ASAP: directory selector UI...
[_] usable empty view -- w.o. data...
[_] 0% Tablet UI
[_] screen buttons
[_] save settings to config.json
[_] Q: do we need seporate theme settings?
[_] Q: do we need separate theme settings?
| ...for ribbon and single-image modes?
[_] editable list of external commands...
| to add things like exportdirs.py etc.

View File

@ -93,11 +93,17 @@ function bubbleProgress(prefix, from, to, only_progress){
// is essentially the same as $.getJSON(...)
// NOTE: this needs listDir(...) to search for latest versions of files.
function loadLatestFile(path, dfl, pattern, diff_pattern){
dfl = dfl == null ? path.split(/[\/\\]/).pop() : dfl
path = path == dfl ? '.' : path
var pparts = path.split(/[\/\\]/)
dfl = dfl == null ? pparts.pop() : dfl
//path = path == dfl ? '.' : path
path = pparts.join('/')
var res = $.Deferred()
if(dfl == ''){
return res.reject()
}
// can't find diffs if can't list dirs...
if(window.listDir == null && (pattern != null || diff_pattern != null)){
res.notify('Unsupported', 'directory listing.')
@ -246,16 +252,8 @@ function loadFileImages(path, no_load_diffs){
IMAGES_DIFF_FILE_PATTERN)
// explicit path...
// XXX need to account for paths without a CACHE_DIR
} else {
path = normalizePath(path)
var base = path.split(CACHE_DIR)[0]
base += '/'+ CACHE_DIR
// XXX is this correct???
var loader = loadLatestFile(base,
path.split(base)[0],
RegExp(path.split(base)[0]))
var loader = loadLatestFile(normalizePath(path))
}
bubbleProgress('Images', loader, res)