Skip to content

Don't call top-nav button's run function if disabled #8084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ycombinator merged 6 commits into from
Aug 25, 2016
Merged

Don't call top-nav button's run function if disabled #8084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e7a89e
Disable button using ng-disabled
ycombinator Aug 24, 2016
2663338
Only call the click function if the item is not disabled
ycombinator Aug 25, 2016
3b0ccfb
Do not show outline when disabled buttons are focussed
ycombinator Aug 25, 2016
a5206b2
Removing outline rule and focus selector because focus is orthogonal …
ycombinator Aug 25, 2016
4002bd0
Encapsulating click logic in handleClick helper method
ycombinator Aug 25, 2016
71f8bca
Make disableButton, hideButton, and tooltip responsive to model changes
ycombinator Aug 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ui/public/kbn_top_nav/kbn_top_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
aria-label="{{::menuItem.description}}"
aria-haspopup="{{!menuItem.hasFunction}}"
aria-expanded="{{kbnTopNav.isCurrent(menuItem.key)}}"
ng-class="{active: kbnTopNav.isCurrent(menuItem.key), 'is-kbn-top-nav-button-disabled': menuItem.disableButton}"
ng-click="menuItem.run(menuItem, kbnTopNav)"
ng-class="{active: kbnTopNav.isCurrent(menuItem.key), 'is-kbn-top-nav-button-disabled': menuItem.disableButton()}"
ng-click="kbnTopNav.handleClick(menuItem)"
ng-bind="menuItem.label"
tooltip="{{menuItem.tooltip}}"
tooltip="{{menuItem.tooltip()}}"
tooltip-placement="bottom"
tooltip-popup-delay="400"
tooltip-append-to-body="1"
Expand Down
19 changes: 12 additions & 7 deletions src/ui/public/kbn_top_nav/kbn_top_nav_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { capitalize, isArray, isFunction, result } from 'lodash';
import { capitalize, isArray, isFunction } from 'lodash';

import uiModules from 'ui/modules';
import filterTemplate from 'ui/chrome/config/filter.html';
Expand Down Expand Up @@ -29,7 +29,7 @@ export default function ($compile) {
const opt = this._applyOptDefault(rawOpt);
if (!opt.key) throw new TypeError('KbnTopNav: menu items must have a key');
this.opts.push(opt);
if (!opt.hideButton) this.menuItems.push(opt);
if (!opt.hideButton()) this.menuItems.push(opt);
if (opt.template) this.templates[opt.key] = opt.template;
});
}
Expand All @@ -50,19 +50,24 @@ export default function ($compile) {
open(key) { this.setCurrent(key); }
close(key) { (!key || this.isCurrent(key)) && this.setCurrent(null); }
toggle(key) { this.setCurrent(this.isCurrent(key) ? null : key); }

handleClick(menuItem) {
if (menuItem.disableButton()) {
return false;
}
menuItem.run(menuItem, this);
}
// apply the defaults to individual options
_applyOptDefault(opt = {}) {
const defaultedOpt = Object.assign({
label: capitalize(opt.key),
hasFunction: !!opt.run,
description: opt.run ? opt.key : `Toggle ${opt.key} view`,
run: (item) => !item.disableButton && this.toggle(item.key)
run: (item) => this.toggle(item.key)
}, opt);

defaultedOpt.hideButton = result(opt, 'hideButton', false);
defaultedOpt.disableButton = result(opt, 'disableButton', false);
defaultedOpt.tooltip = result(opt, 'tooltip', '');
defaultedOpt.hideButton = isFunction(opt.hideButton) ? opt.hideButton : () => opt.hideButton;
defaultedOpt.disableButton = isFunction(opt.disableButton) ? opt.disableButton : () => opt.disableButton;
defaultedOpt.tooltip = isFunction(opt.tooltip) ? opt.tooltip : () => opt.tooltip;

return defaultedOpt;
}
Expand Down