wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-01 09:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Make tools disable correctly"

Browse source
This commit is contained in:
jenkins-bot 2013-11-13 00:54:38 +00:00 committed by Gerrit Code Review
parent d2165ad8fb 22287cd3d3
commit f61227fc3c
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/oojs-ui/OO.ui.ToolGroup.js
View file

@ -186,11 +186,14 @@ OO.ui.ToolGroup.prototype.onMouseOut = function ( e ) {
* @returns {OO.ui.Tool|null} Tool, `null` if none was found
*/
OO.ui.ToolGroup.prototype.getTargetTool = function ( e ) {
var $item = this.$( e.target ).closest( '.oo-ui-tool-link' );
var tool,
$item = this.$( e.target ).closest( '.oo-ui-tool-link' );
if ( $item.length ) {
return $item.parent().data( 'oo-ui-tool' );
tool = $item.parent().data( 'oo-ui-tool' );
}
return null;
return tool && !tool.isDisabled() ? tool : null;
};
/**

6
modules/oojs-ui/styles/OO.ui.ToolGroup.css
View file

@ -236,10 +236,14 @@
border-color: rgba(0,0,0,0.2);
}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled {
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link {
cursor: default;
}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-labeledElement-label {
color: #ccc;
}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconedElement-icon {
opacity: 0.2;
}