limit search of adjacent button to current toolbar

This commit is contained in:
gorhill 2015-10-18 13:41:33 -04:00
parent 7e125b3b67
commit e152db7004

View file

@ -2424,7 +2424,7 @@ vAPI.toolbarButton = {
toolbarButtonPanel.addEventListener('popuphiding', tbb.onViewHiding); toolbarButtonPanel.addEventListener('popuphiding', tbb.onViewHiding);
toolbarButton.appendChild(toolbarButtonPanel); toolbarButton.appendChild(toolbarButtonPanel);
if ( palette !== null ) { if ( palette !== null && palette.querySelector('#' + tbb.id) === null ) {
palette.appendChild(toolbarButton); palette.appendChild(toolbarButton);
} }
@ -2453,7 +2453,7 @@ vAPI.toolbarButton = {
// Found our button on this toolbar - but where on it? // Found our button on this toolbar - but where on it?
var before = null; var before = null;
for ( var i = index + 1; i < currentset.length; i++ ) { for ( var i = index + 1; i < currentset.length; i++ ) {
before = document.getElementById(currentset[i]); before = toolbar.querySelector('[id="' + currentset[i] + '"]');
if ( before !== null ) { if ( before !== null ) {
break; break;
} }