From ea159882341c6ebf73700dc8ac69b1cbef18ea85 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 9 Feb 2017 16:44:09 +0300 Subject: [PATCH] minor tweaking... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/history.js | 3 +-- ui (gen4)/features/ui-marks.js | 10 +++++----- ui (gen4)/features/ui-widgets.js | 5 ++++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ui (gen4)/features/history.js b/ui (gen4)/features/history.js index 189156b7..fdb39f61 100755 --- a/ui (gen4)/features/history.js +++ b/ui (gen4)/features/history.js @@ -850,8 +850,7 @@ var URLHistoryUIActions = actions.Actions({ save() }) .on('pin_button', function(evt, p, e){ - that.config['url-history-focus-on-pin'] - && dialog.select(e) + dialog.select(that.config['url-history-focus-on-pin'] ? p : '!') }) .on('to_top_button', function(evt, p, e){ to_sort.splice(0, 0, p) diff --git a/ui (gen4)/features/ui-marks.js b/ui (gen4)/features/ui-marks.js index 306a0cc9..1ff2f2eb 100755 --- a/ui (gen4)/features/ui-marks.js +++ b/ui (gen4)/features/ui-marks.js @@ -133,10 +133,10 @@ var ImageMarkActions = actions.Actions({ // Invert marks on current ribbon // .toggleMark('ribbon') // - toggleMark: ['Mark|Image/Image mark', + toggleMark: ['Mark|Image/Image $mark', makeTagTogglerAction('selected')], // XXX - toggleMarkBlock: ['Mark/Block marks', + toggleMarkBlock: ['Mark/$Block marks', 'A block is a set of adjacent images either marked on unmarked ' +'in the same way', function(target){ @@ -162,7 +162,7 @@ var ImageMarkActions = actions.Actions({ nextMarked: ['Mark|Navigate/Next marked image', function(mode){ this.nextTagged('selected', mode) }], - cropMarked: ['Mark|Crop/Crop marked images', + cropMarked: ['Mark|Crop/Crop $marked images', function(flatten){ this.cropTagged('selected', 'any', flatten) }], }) @@ -211,7 +211,7 @@ var ImageBookmarkActions = actions.Actions({ return this.data.tags['bookmark'].slice() }, - toggleBookmark: ['Bookmark|Image/Image bookmark', + toggleBookmark: ['Bookmark|Image/Image $bookmark', makeTagTogglerAction('bookmark')], // action can be: // 'on' - toggle all on @@ -227,7 +227,7 @@ var ImageBookmarkActions = actions.Actions({ nextBookmarked: ['Bookmark|Navigate/Next bookmarked image', function(mode){ this.nextTagged('bookmark', mode) }], - cropBookmarked: ['Bookmark|Crop/Crop bookmarked images', + cropBookmarked: ['Bookmark|Crop/Crop $bookmarked images', function(flatten){ this.cropTagged('bookmark', 'any', flatten) }], }) diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index a234b9bf..a558f76c 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -947,11 +947,14 @@ var BrowseActionsActions = actions.Actions({ // check if it's a priority path... } else { + var t = text.replace(priority, '') + t = (marker ? t.replace(marker, '$1') : t).trim() + for(var e in level){ var n = e.replace(priority, '') n = (marker ? n.replace(marker, '$1') : n).trim() - if(n == text){ + if(n == t){ return [e, level[e]] } }