From d4a096a75fa4b3495f79b5d03a6ccc3a5f03a7ef Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 14 Jun 2013 13:16:27 +0400 Subject: [PATCH] minor tweaks and cleaning... Signed-off-by: Alex A. Naanou --- ui/TODO.otl | 24 ++++++++++++++++++++++-- ui/data.js | 2 +- ui/files.js | 9 +++++---- ui/layout.css | 1 + ui/layout.less | 2 ++ 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ui/TODO.otl b/ui/TODO.otl index 285de4b3..5c6b440e 100755 --- a/ui/TODO.otl +++ b/ui/TODO.otl @@ -91,8 +91,28 @@ Roadmap -[_] 29% Gen 3 current todo - [_] 58% High priority +[_] 28% Gen 3 current todo + [_] 57% High priority + [_] BUG: align problems are back... + | default data set (browser/images.js) same images #4 (going + | from right) & #5 (going from left) of 18 in the first ribbon + | get aligned wrong... + | + | this is at a zoom level with screen proportions... + | + | zooming to a different level affects which images are + | misaligned, at "max" #2 and #5 are affected... + | + | centerView() fixes this, but only for the current image... + [_] BUG: sometimes the previews are not updated... + | there seams to be two cases: + | - wrong resolution preview is loaded + | when coming out of single-image-mode after moving to a + | different position (so as ribbons go reloaded) + | - previews do not get replaced at all, e.g. everything + | behaves correctly (order, etc.) but the previews are + | from wrong (ones before re-attaching) images + | (this I can't repeat at this point) [_] 60% basic dialogs [X] alert [X] prompt diff --git a/ui/data.js b/ui/data.js index 4f198619..a2de54f0 100755 --- a/ui/data.js +++ b/ui/data.js @@ -1037,7 +1037,7 @@ function loadSettings(){ // NOTE: this will always overwrite the previous cache set for a ribbon... // NOTE: it appears that sorting images by priority before loading them -// to cache has little or no affect on the order they are +// to cache has little or no effect on the order they are // loaded/rendered... function preCacheRibbonImages(ribbon){ var i = getRibbonIndex(ribbon) diff --git a/ui/files.js b/ui/files.js index 19b4d102..d10f00e6 100755 --- a/ui/files.js +++ b/ui/files.js @@ -89,6 +89,9 @@ function bubbleProgress(prefix, from, to, only_progress){ // if diff_pattern is given, then merge all matching files in order // (first to last) with the loaded "main" file // +// NOTE: this expects a file to be JSON. +// NOTE: if diffs are available this expects the file to contain an object, +// and will extend that object. // NOTE: if neither of dfl, pattern or diff_pattern are given, then this // is essentially the same as $.getJSON(...) // NOTE: this needs listDir(...) to search for latest versions of files. @@ -280,7 +283,7 @@ function loadFileImages(path, no_load_diffs){ // (full) images.json file. Also removing the diff files. // // NOTE: if an explicit name is given then this will not remove anything. -// NOTE: this will uses CACHE_DIR as the location if no name is given. +// NOTE: this will use CACHE_DIR as the location if no name is given. function saveFileImages(name){ var remove_diffs = (name == null) name = name == null ? normalizePath(CACHE_DIR_VAR +'/'+ Date.timeStamp()) : name @@ -476,6 +479,7 @@ function loadRawDir(path, prefix){ IMAGES = imagesFromUrls(image_paths) res.notify(prefix, 'Loaded', 'Images.') + IMAGES_CREATED = true DATA = dataFromImages(IMAGES) res.notify(prefix, 'Loaded', 'Data.') @@ -535,9 +539,6 @@ function loadDir(path, prefix){ }) .fail(function(){ bubbleProgress('Raw directory', loadRawDir(orig_path), res) - .done(function(){ - IMAGES_CREATED = true - }) }) return res diff --git a/ui/layout.css b/ui/layout.css index b75f5c69..3aef6ddb 100644 --- a/ui/layout.css +++ b/ui/layout.css @@ -137,6 +137,7 @@ button:hover { font-weight: bold; color: silver; opacity: 0.9; + cursor: hand; } .ribbon-set:empty:after { content: "Press 'O' to load, 'F1' for help or '?' for keyboard mappings."; diff --git a/ui/layout.less b/ui/layout.less index 1d585499..6c84848b 100755 --- a/ui/layout.less +++ b/ui/layout.less @@ -217,6 +217,8 @@ button:hover { font-weight: bold; color: silver; opacity: 0.9; + + cursor: hand; } .ribbon-set:empty:after {