mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-28 18:00:09 +00:00
bugfix...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
3833545c55
commit
2f56bf6191
@ -167,6 +167,7 @@ body {
|
|||||||
.keyboard-shortcut {
|
.keyboard-shortcut {
|
||||||
text-decoration: none !important;
|
text-decoration: none !important;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
}
|
}
|
||||||
.keyboard-shortcut:after {
|
.keyboard-shortcut:after {
|
||||||
content: "";
|
content: "";
|
||||||
@ -315,7 +316,7 @@ body {
|
|||||||
|
|
||||||
/* make buttons a bit different in action browser... */
|
/* make buttons a bit different in action browser... */
|
||||||
.browse-widget.browse-actions.show-keys .list .button {
|
.browse-widget.browse-actions.show-keys .list .button {
|
||||||
background-color: rgba(0, 0, 0, 0.1);
|
background-color: rgba(0, 0, 0, 0.12);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -325,7 +326,7 @@ body {
|
|||||||
background: rgba(0, 0, 0, 0.03);
|
background: rgba(0, 0, 0, 0.03);
|
||||||
}
|
}
|
||||||
.browse-widget.key-bindings .list .item .button {
|
.browse-widget.key-bindings .list .item .button {
|
||||||
background-color: rgba(0, 0, 0, 0.1);
|
background-color: rgba(0, 0, 0, 0.12);
|
||||||
}
|
}
|
||||||
|
|
||||||
.browse-widget.key-bindings .list>.drop-list .text:first-child {
|
.browse-widget.key-bindings .list>.drop-list .text:first-child {
|
||||||
|
|||||||
@ -210,6 +210,8 @@
|
|||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
|
/*border: solid 1px rgba(255,255,255, 0.3);*/
|
||||||
}
|
}
|
||||||
.browse-widget .list .button:hover {
|
.browse-widget .list .button:hover {
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
|
|||||||
@ -1951,13 +1951,11 @@ var BrowserPrototype = {
|
|||||||
|
|
||||||
// text marker...
|
// text marker...
|
||||||
if(item_shortcut_marker){
|
if(item_shortcut_marker){
|
||||||
var did_register = false
|
|
||||||
var _replace = function(){
|
var _replace = function(){
|
||||||
// get the last group...
|
// get the last group...
|
||||||
var key = [].slice.call(arguments).slice(-3)[0]
|
var key = [].slice.call(arguments).slice(-3)[0]
|
||||||
!item_shortcuts[key]
|
!item_shortcuts[key]
|
||||||
// NOTE: this is a side-effect...
|
// NOTE: this is a side-effect...
|
||||||
&& (did_register = true)
|
|
||||||
&& that.keyboard.handler(
|
&& that.keyboard.handler(
|
||||||
'ItemShortcuts',
|
'ItemShortcuts',
|
||||||
key,
|
key,
|
||||||
@ -1967,14 +1965,16 @@ var BrowserPrototype = {
|
|||||||
|
|
||||||
txt = txt.replace(item_shortcut_marker, _replace)
|
txt = txt.replace(item_shortcut_marker, _replace)
|
||||||
|
|
||||||
|
var registered = []
|
||||||
p.filter('.text')
|
p.filter('.text')
|
||||||
.each(function(_, e){
|
.each(function(_, e){
|
||||||
e = $(e)
|
e = $(e)
|
||||||
e.html(e.html().replace(item_shortcut_marker,
|
e.html(e.html().replace(item_shortcut_marker,
|
||||||
function(){
|
function(){
|
||||||
did_register = false
|
|
||||||
var k = _replace.apply(this, arguments)
|
var k = _replace.apply(this, arguments)
|
||||||
return !did_register ?
|
var mark = !!(registered.indexOf(k) < 0
|
||||||
|
&& registered.push(k))
|
||||||
|
return mark ?
|
||||||
`<span class="keyboard-shortcut">${k}</span>`
|
`<span class="keyboard-shortcut">${k}</span>`
|
||||||
: k
|
: k
|
||||||
}))
|
}))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user