minor tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-02-09 16:44:09 +03:00
parent 009943e793
commit ea15988234
3 changed files with 10 additions and 8 deletions

View File

@ -850,8 +850,7 @@ var URLHistoryUIActions = actions.Actions({
save() save()
}) })
.on('pin_button', function(evt, p, e){ .on('pin_button', function(evt, p, e){
that.config['url-history-focus-on-pin'] dialog.select(that.config['url-history-focus-on-pin'] ? p : '!')
&& dialog.select(e)
}) })
.on('to_top_button', function(evt, p, e){ .on('to_top_button', function(evt, p, e){
to_sort.splice(0, 0, p) to_sort.splice(0, 0, p)

View File

@ -133,10 +133,10 @@ var ImageMarkActions = actions.Actions({
// Invert marks on current ribbon // Invert marks on current ribbon
// .toggleMark('ribbon') // .toggleMark('ribbon')
// //
toggleMark: ['Mark|Image/Image mark', toggleMark: ['Mark|Image/Image $mark',
makeTagTogglerAction('selected')], makeTagTogglerAction('selected')],
// XXX // XXX
toggleMarkBlock: ['Mark/Block marks', toggleMarkBlock: ['Mark/$Block marks',
'A block is a set of adjacent images either marked on unmarked ' 'A block is a set of adjacent images either marked on unmarked '
+'in the same way', +'in the same way',
function(target){ function(target){
@ -162,7 +162,7 @@ var ImageMarkActions = actions.Actions({
nextMarked: ['Mark|Navigate/Next marked image', nextMarked: ['Mark|Navigate/Next marked image',
function(mode){ this.nextTagged('selected', mode) }], 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) }], function(flatten){ this.cropTagged('selected', 'any', flatten) }],
}) })
@ -211,7 +211,7 @@ var ImageBookmarkActions = actions.Actions({
return this.data.tags['bookmark'].slice() return this.data.tags['bookmark'].slice()
}, },
toggleBookmark: ['Bookmark|Image/Image bookmark', toggleBookmark: ['Bookmark|Image/Image $bookmark',
makeTagTogglerAction('bookmark')], makeTagTogglerAction('bookmark')],
// action can be: // action can be:
// 'on' - toggle all on // 'on' - toggle all on
@ -227,7 +227,7 @@ var ImageBookmarkActions = actions.Actions({
nextBookmarked: ['Bookmark|Navigate/Next bookmarked image', nextBookmarked: ['Bookmark|Navigate/Next bookmarked image',
function(mode){ this.nextTagged('bookmark', mode) }], 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) }], function(flatten){ this.cropTagged('bookmark', 'any', flatten) }],
}) })

View File

@ -947,11 +947,14 @@ var BrowseActionsActions = actions.Actions({
// check if it's a priority path... // check if it's a priority path...
} else { } else {
var t = text.replace(priority, '')
t = (marker ? t.replace(marker, '$1') : t).trim()
for(var e in level){ for(var e in level){
var n = e.replace(priority, '') var n = e.replace(priority, '')
n = (marker ? n.replace(marker, '$1') : n).trim() n = (marker ? n.replace(marker, '$1') : n).trim()
if(n == text){ if(n == t){
return [e, level[e]] return [e, level[e]]
} }
} }