diff --git a/ui (gen4)/features/app.js b/ui (gen4)/features/app.js index 80675235..d07ad8cd 100755 --- a/ui (gen4)/features/app.js +++ b/ui (gen4)/features/app.js @@ -559,7 +559,7 @@ var AppButtonsActions = actions.Actions({ { '_': ['minimize', 'minimize -- Minimize'], - '↙': ['fullscreen', + '↙': ['fullscreen allways-shown', 'toggleFullScreen -- Toggle fullscreen'], '×': ['close', 'close -- Quit'], diff --git a/ui (gen4)/features/ui-status.js b/ui (gen4)/features/ui-status.js index 885e1cb2..d2b8ad21 100755 --- a/ui (gen4)/features/ui-status.js +++ b/ui (gen4)/features/ui-status.js @@ -443,7 +443,7 @@ var StatusBarActions = actions.Actions({ if(typeof(item) == typeof('str')){ var type = item item = $('') - .addClass(type + 'ed '+ type) + .addClass(type + 'ed') .attr('info', 'Image ' +(type == 'mark' ? 'selection' : 'bookmark') +' status (click to toggle)') @@ -662,7 +662,7 @@ var StatusBarActions = actions.Actions({ } var gid = this.current - var item = this.dom.find(`.state-indicator-container.global-info .${type}`) + var item = this.dom.find(`.state-indicator-container.global-info [type=${type}]`) // blink the indicator... item diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index b45ceebf..de27176c 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -1942,7 +1942,6 @@ module.ContextActionMenu = core.ImageGridFeatures.Feature({ .focusImage(gid) .browseActions('/Image/') }], - // XXX FireFox: get actual event... ['imageOuterBlockMenu.pre', function(gid){ // only show image menu in ribbon mode... @@ -2039,7 +2038,7 @@ var ButtonsActions = actions.Actions({ }, 'app-buttons': { - [SETTINGS_ICON]: ['ui-settings', [ + [SETTINGS_ICON]: ['ui-settings allways-shown', [ 'browseActions: "Interface/" -- Interface settings...', 'toggleSideButtons -- Toggle touch controls', ]],