wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-29 00:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update list tool updateState method so that if you have nodes not

Browse source 
contained by a list node the button is off.  Button is now only toggled on
if all nodes in selection have a parent list node.
Patchset 2 - cleanup whitespace
Change-Id: Ia9adc39c0d5c75e2e96580f0e172f5b602540ac3
This commit is contained in:
Rob Moen 2012-06-20 15:01:18 -07:00
parent 5ff4aa4c2d
commit 8178237c27
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/ve/ui/tools/ve.ui.ListButtonTool.js
View file

@ -138,24 +138,32 @@ ve.ui.ListButtonTool.prototype.onClick = function() {
};
ve.ui.ListButtonTool.prototype.updateState = function( annotations, nodes ) {
var surfaceView = this.toolbar.getSurfaceView(),
surfaceModel = surfaceView.getModel(),
doc = surfaceView.getDocument(),
selection = surfaceModel.getSelection(),
leaves = doc.selectNodes( selection, 'leaves' );
function areListItemsOfStyle( nodes, style ){
function areListItemsOfStyle( leaves, style ){
var listNode = null;
for ( var i=0; i < nodes.length; i++ ) {
listNode = nodes[i];
for ( var i=0; i < leaves.length; i++ ) {
listNode = leaves[i].node;
// Get the list node
while( listNode && listNode.getType() !== 'list' ) {
listNode = listNode.getParent();
if ( listNode === null ) {
return false;
}
}
if( listNode && listNode.getAttribute('style') === style ) {
return true;
if( listNode.getModel().getAttribute('style') !== style ) {
return false;
}
}
return false;
return true;
}
if ( areListItemsOfStyle( nodes, this.name ) ) {
if ( areListItemsOfStyle( leaves, this.name ) ) {
this.$.addClass( 'es-toolbarButtonTool-down' );
} else {
this.$.removeClass( 'es-toolbarButtonTool-down' );
@ -167,13 +175,13 @@ ve.ui.ListButtonTool.prototype.updateState = function( annotations, nodes ) {
ve.ui.Tool.tools.number = {
'constructor': ve.ui.ListButtonTool,
'name': 'number',
'title': ve.msg( 'visualeditor-listbutton-number-tooltip' ),
'title': ve.msg( 'visualeditor-listbutton-number-tooltip' )
};
ve.ui.Tool.tools.bullet = {
'constructor': ve.ui.ListButtonTool,
'name': 'bullet',
'title': ve.msg( 'visualeditor-listbutton-bullet-tooltip' ),
'title': ve.msg( 'visualeditor-listbutton-bullet-tooltip' )
};
/* Inheritance */