From dd65fcbb723b4a6d83701ee7298ce8e447b6a987 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Mon, 25 Dec 2017 05:00:46 +0300 Subject: [PATCH] minor refactorng and moving stuff around... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/collections.js | 20 ++++++++------------ ui (gen4)/features/ui-widgets.js | 1 + 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ui (gen4)/features/collections.js b/ui (gen4)/features/collections.js index f191c39d..805cd3eb 100755 --- a/ui (gen4)/features/collections.js +++ b/ui (gen4)/features/collections.js @@ -772,18 +772,6 @@ var CollectionActions = actions.Actions({ }], - // aliases... - // - // XXX this may show up as a dialog, to disable this just add - // __dialog__: false to attrs... - loadMainCollection: ['Collections/Exit collection view', - { - browseMode: 'uncollect', - __dialog__: false, - }, - `loadCollection: "${MAIN_COLLECTION_TITLE}"`], - - // Collection editing.... // // NOTE: Currently these are sync, and sequencing collections @@ -2579,6 +2567,14 @@ var UICollectionActions = actions.Actions({ // XXX EXPERIMENTAL... loadCollection: [ collectionGetterWrapper(function(title){ this.loadCollection(title) })], + loadMainCollection: ['Collections/Exit collection view', + { + browseMode: 'uncollect', + // prevent this from showing up in .uiDialogs list... + __dialog__: false, + }, + `loadCollection: "${MAIN_COLLECTION_TITLE}"`], + // Collection actions with collection selection... // diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index 5753b993..d34b8215 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -1310,6 +1310,7 @@ var BrowseActionsActions = actions.Actions({ 'Crop/-81:Uncrop all', 'Crop/-82:$Uncrop', 'Collec$tions', + 'Collections/-50:.*exit.*', 'Collections/-60:.*edit.*', 'Collections/-70:---', 'Collections/-70:.*remove.*',