Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-12-15 15:40:31 +03:00
parent ab69925510
commit fa5b112542
2 changed files with 20 additions and 17 deletions

View File

@ -288,6 +288,7 @@ actions.Actions({
} }
}], }],
// XXX should this clear or load empty??? // XXX should this clear or load empty???
// XXX should this accept args and clear specific stuff (a-la data.clear(..))???
clear: ['File/Clear', clear: ['File/Clear',
{journal: true}, {journal: true},
function(){ function(){

View File

@ -75,7 +75,7 @@ module.COLLECTION_TRANSFER_CHANGES = [
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// XXX undo... // XXX add undo...
var CollectionActions = actions.Actions({ var CollectionActions = actions.Actions({
config: { config: {
// can be: // can be:
@ -101,6 +101,7 @@ var CollectionActions = actions.Actions({
// <title>: { // <title>: {
// title: <title>, // title: <title>,
// gid: <gid>, // gid: <gid>,
// count: <number>,
// //
// crop_stack: [ .. ], // crop_stack: [ .. ],
// //
@ -134,7 +135,6 @@ var CollectionActions = actions.Actions({
this.collection = value }, this.collection = value },
// XXX should this check consistency??? // XXX should this check consistency???
// XXX would be nice for these to also include default collections...
get collection_order(){ get collection_order(){
var collections = this.collections var collections = this.collections
var defaults = this.config['default-collections'] || [] var defaults = this.config['default-collections'] || []
@ -198,6 +198,7 @@ var CollectionActions = actions.Actions({
// ... // ...
// } // }
// //
// XXX revise doc...
get collection_handlers(){ get collection_handlers(){
var handlers = this.__collection_handlers = this.__collection_handlers || {} var handlers = this.__collection_handlers = this.__collection_handlers || {}
@ -266,10 +267,9 @@ var CollectionActions = actions.Actions({
})], })],
// XXX should this queue already running calls or a specific collection????
// ...I think yes!!
// XXX should there be a force arg when we can't actually stop the // XXX should there be a force arg when we can't actually stop the
// running promise and recover??? // running promise and recover???
// XXX need to figure out error handling for this scheme...
// XXX do we need timeouts here???? // XXX do we need timeouts here????
ensureCollection: ['- Collections/', ensureCollection: ['- Collections/',
core.doc`Ensure a collection exists and is consistent... core.doc`Ensure a collection exists and is consistent...
@ -286,7 +286,8 @@ var CollectionActions = actions.Actions({
- initialize if needed - initialize if needed
While the promise for a specific action is not resolved this While the promise for a specific action is not resolved this
will return it and not start a new promise. will return it and not start a new promise thus queuing all
subsequent calls.
`, `,
function(collection){ function(collection){
var that = this var that = this
@ -746,9 +747,12 @@ var CollectionActions = actions.Actions({
// Introspection... // Introspection...
// //
// XXX make this check offline collections -- use .ensureCollection(..) // XXX make this check offline collections -- use .ensureCollection(..)???
inCollections: ['- Image/', inCollections: ['- Image/',
core.doc`Get list of collections containing item`, core.doc`Get list of collections containing item
NOTE: this currently does not load or check offline collections.
`,
function(gid, collections){ function(gid, collections){
var that = this var that = this
gid = this.data.getImage(gid) gid = this.data.getImage(gid)
@ -773,16 +777,17 @@ var CollectionActions = actions.Actions({
// Collection editing.... // Collection editing....
// //
// NOTE: Currently these are sync, and sequencing happens automatically as // NOTE: Currently these are sync, and sequencing collections
// everything uses .ensureCollection(..) // operations happens automatically as everything uses
// to explecitly sequence a call do: // .ensureCollection(..)...
// to explecitly sequence code do:
// .collect(..) // .collect(..)
// .ensureCollection(..) // .ensureCollection(..)
// .then(function(){ // .then(function(){
// // this is run after .collect(..) // // this is run after .collect(..)
// ... // ...
// }) // })
// XXX need to figure out error handling for this scheme... // NOTE: see .ensureCollection(..) for more details...
collect: ['- Collections/', collect: ['- Collections/',
core.doc`Add items to collection core.doc`Add items to collection
@ -1222,6 +1227,7 @@ var CollectionActions = actions.Actions({
delete this.location.collection delete this.location.collection
}], }],
// Config and interface stuff... // Config and interface stuff...
// //
toggleCollectionCropRetention: ['Interface/Collection crop save mode', toggleCollectionCropRetention: ['Interface/Collection crop save mode',
@ -1247,7 +1253,6 @@ var CollectionActions = actions.Actions({
return [MAIN_COLLECTION_TITLE].concat(this.collection_order || []) })], return [MAIN_COLLECTION_TITLE].concat(this.collection_order || []) })],
}) })
var Collection = var Collection =
module.Collection = core.ImageGridFeatures.Feature({ module.Collection = core.ImageGridFeatures.Feature({
title: '', title: '',
@ -1775,6 +1780,7 @@ module.Collection = core.ImageGridFeatures.Feature({
}) })
//--------------------------------------------------------------------- //---------------------------------------------------------------------
var CollectionTagsActions = actions.Actions({ var CollectionTagsActions = actions.Actions({
@ -2221,7 +2227,7 @@ module.AutoCollections = core.ImageGridFeatures.Feature({
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// XXX show collections in image metadata... (???) // XXX show collections in image metadata... (???)
// XXX might be nice to indicate if a collection is loaded -- has .data... // XXX might be nice to indicate if a collection is loaded -- has .data???
// XXX might be nice to add collection previews to the collection list... // XXX might be nice to add collection previews to the collection list...
// ...show the base ribbon from collection as background // ...show the base ribbon from collection as background
var UICollectionActions = actions.Actions({ var UICollectionActions = actions.Actions({
@ -2644,7 +2650,6 @@ module.UICollection = core.ImageGridFeatures.Feature({
//--------------------------------------------------------------------- //---------------------------------------------------------------------
// XXX collection id...
// XXX Things to try/do: // XXX Things to try/do:
// - load directories as collections (auto?)... // - load directories as collections (auto?)...
// - export collections to directories... // - export collections to directories...
@ -2743,9 +2748,6 @@ var FileSystemCollectionActions = actions.Actions({
}], }],
}) })
// XXX manage format...
// XXX manage changes...
var FileSystemCollection = var FileSystemCollection =
module.FileSystemCollection = core.ImageGridFeatures.Feature({ module.FileSystemCollection = core.ImageGridFeatures.Feature({
title: '', title: '',