From 58ddd97a69dd08b84a06c8d9b5b3e413005a1bf1 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 16 Nov 2018 04:08:00 +0300 Subject: [PATCH] tweaking the crop/tag menu... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/base.js | 2 +- ui (gen4)/features/collections.js | 2 +- ui (gen4)/features/ui-widgets.js | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js index f46b66a4..184f0d72 100755 --- a/ui (gen4)/features/base.js +++ b/ui (gen4)/features/base.js @@ -1695,7 +1695,7 @@ module.CropActions = actions.Actions({ function(restore_current){ this.uncrop('all', restore_current) }], // XXX see if we need to do this on this level?? // ...might be a good idea to do this in data... - uncropAndKeepOrder: ['Crop|Edit/Uncrop and keep crop image order', { + uncropAndKeepOrder: ['Crop|Edit/Uncrop keeping image order', { journal: true, browseMode: 'uncrop'}, function(level, restore_current){ this.uncrop(level, restore_current, true) }], diff --git a/ui (gen4)/features/collections.js b/ui (gen4)/features/collections.js index e7f52751..2cdea8ef 100755 --- a/ui (gen4)/features/collections.js +++ b/ui (gen4)/features/collections.js @@ -2747,7 +2747,7 @@ var UICollectionActions = actions.Actions({ that.crop(images, false) }) }, null, false)], - cropOutImagesInCollection: ['Collections|Crop/Crop $out images in collec$tion...', + cropOutImagesInCollection: ['Collections|Crop/Remove collection images from crop...', {browseMode: 'cropImagesInCollection'}, mixedModeCollectionAction(function(title){ var that = this diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index 422b83a7..8b2bb8fe 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -1323,6 +1323,8 @@ var BrowseActionsActions = actions.Actions({ // this is not a bug... 'Crop/60:crop .*ribbon.*', + 'Crop/60:.*tag.*', + // The rest of the elements in the path will get added // between the positive and negative prioritized items... // ... @@ -1339,10 +1341,15 @@ var BrowseActionsActions = actions.Actions({ 'Crop/-70:---', //*/ - 'Crop/-70:---', - 'Crop/-70:.*remove.*', + 'Crop/-50:---', + 'Crop/-60:Remove from crop', + 'Crop/-70:Remove ribbon.*', + 'Crop/-71:Remove marked.*', + 'Crop/-72:.*remove.*', - 'Crop/-80:Uncrop and keep crop image order', + 'Crop/-75:---', + + 'Crop/-80:Uncrop keeping image order', 'Crop/-81:Uncrop all', 'Crop/-82:$Uncrop', 'Co$llections',