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

bumped DATA version to 2.2...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-12-24 22:08:18 +04:00
parent e00fb6af4b
commit b80756ac72
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/data.js
View File

@ -38,12 +38,16 @@
// - MARKED now maintained sorted, live, // - MARKED now maintained sorted, live,
// - will auto-sort marks on load of 2.0 data and change // - will auto-sort marks on load of 2.0 data and change
// data version to 2.1, will need a re-save, // data version to 2.1, will need a re-save,
// 2.2 - Minor update to how data is handled and saved
// - now DATA.current is saved separately in current.json
// loading is done from current.json and if not found from
// data.json
// //
// NOTE: Gen1 and Gen3 refer to code generations rather than data format // NOTE: Gen1 and Gen3 refer to code generations rather than data format
// iterations, Gen2 is skipped here as it is a different project // iterations, Gen2 is skipped here as it is a different project
// (PortableMag) mostly built on the same code base as // (PortableMag) mostly built on the same code base as
// ImageGrid.Viewer // ImageGrid.Viewer
var DATA_VERSION = '2.1' var DATA_VERSION = '2.2'
var CONFIG = { var CONFIG = {

5
ui/files.js
View File

@ -486,12 +486,13 @@ function loadFileState(path, prefix){
res.resolve() res.resolve()
// version 2.* // version 2.*
} else if(/2\.[0-9*]/.test(json.version)) { } else if(/2\.[0-9]*/.test(json.version)) {
DATA = json DATA = json
$.when( $.when(
// XXX load config... // XXX load config...
// load current position... // load current position...
// added on 2.2
bubbleProgress(prefix, bubbleProgress(prefix,
loadLatestFile(path, loadLatestFile(path,
CURRENT_FILE, CURRENT_FILE,
@ -508,6 +509,8 @@ function loadFileState(path, prefix){
// normalizePath(DATA.image_file, base) // normalizePath(DATA.image_file, base)
// : null), res, true), // : null), res, true),
// run registered loaders... // run registered loaders...
// added on 2.1
// XXX bubbleProgress???
runFileLoaders(prefix, res)) runFileLoaders(prefix, res))
.done(function(){ .done(function(){
$('.viewer').trigger('fileStateLoaded') $('.viewer').trigger('fileStateLoaded')