flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-12-16 16:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks and cleaning...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-06-14 13:16:27 +04:00
parent d6b29fe464
commit d4a096a75f
5 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/TODO.otl
View File

@ -91,8 +91,28 @@ Roadmap
[_] 29% Gen 3 current todo [_] 28% Gen 3 current todo
[_] 58% High priority [_] 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 [_] 60% basic dialogs
[X] alert [X] alert
[X] prompt [X] prompt

2
ui/data.js
View File

@ -1037,7 +1037,7 @@ function loadSettings(){
// NOTE: this will always overwrite the previous cache set for a ribbon... // NOTE: this will always overwrite the previous cache set for a ribbon...
// NOTE: it appears that sorting images by priority before loading them // 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... // loaded/rendered...
function preCacheRibbonImages(ribbon){ function preCacheRibbonImages(ribbon){
var i = getRibbonIndex(ribbon) var i = getRibbonIndex(ribbon)

9
ui/files.js
View File

@ -89,6 +89,9 @@ function bubbleProgress(prefix, from, to, only_progress){
// if diff_pattern is given, then merge all matching files in order // if diff_pattern is given, then merge all matching files in order
// (first to last) with the loaded "main" file // (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 // NOTE: if neither of dfl, pattern or diff_pattern are given, then this
// is essentially the same as $.getJSON(...) // is essentially the same as $.getJSON(...)
// NOTE: this needs listDir(...) to search for latest versions of files. // 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. // (full) images.json file. Also removing the diff files.
// //
// NOTE: if an explicit name is given then this will not remove anything. // 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){ function saveFileImages(name){
var remove_diffs = (name == null) var remove_diffs = (name == null)
name = name == null ? normalizePath(CACHE_DIR_VAR +'/'+ Date.timeStamp()) : name name = name == null ? normalizePath(CACHE_DIR_VAR +'/'+ Date.timeStamp()) : name
@ -476,6 +479,7 @@ function loadRawDir(path, prefix){
IMAGES = imagesFromUrls(image_paths) IMAGES = imagesFromUrls(image_paths)
res.notify(prefix, 'Loaded', 'Images.') res.notify(prefix, 'Loaded', 'Images.')
IMAGES_CREATED = true
DATA = dataFromImages(IMAGES) DATA = dataFromImages(IMAGES)
res.notify(prefix, 'Loaded', 'Data.') res.notify(prefix, 'Loaded', 'Data.')
@ -535,9 +539,6 @@ function loadDir(path, prefix){
}) })
.fail(function(){ .fail(function(){
bubbleProgress('Raw directory', loadRawDir(orig_path), res) bubbleProgress('Raw directory', loadRawDir(orig_path), res)
.done(function(){
IMAGES_CREATED = true
})
}) })
return res return res

1
ui/layout.css
View File

@ -137,6 +137,7 @@ button:hover {
font-weight: bold; font-weight: bold;
color: silver; color: silver;
opacity: 0.9; opacity: 0.9;
cursor: hand;
} }
.ribbon-set:empty:after { .ribbon-set:empty:after {
content: "Press 'O' to load, 'F1' for help or '?' for keyboard mappings."; content: "Press 'O' to load, 'F1' for help or '?' for keyboard mappings.";

2
ui/layout.less
View File

@ -217,6 +217,8 @@ button:hover {
font-weight: bold; font-weight: bold;
color: silver; color: silver;
opacity: 0.9; opacity: 0.9;
cursor: hand;
} }
.ribbon-set:empty:after { .ribbon-set:empty:after {