stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't show full tooltip if TST's tooltip is disabled by user preference (#268)

Browse Source
This commit is contained in:
SHIMODA Hiroshi 2012-04-09 21:28:48 +09:00
parent 7a0a8661fd
commit 3792c8a239
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/fullTooltip.js
View File

@ -305,11 +305,12 @@ FullTooltipManager.prototype = {
} }
} }
var shouldShowTree = mode != this.kTOOLTIP_MODE_DEFAULT && (collapsed || mode == this.kTOOLTIP_MODE_ALWAYS);
if ('mOverCloseButton' in tab && tab.mOverCloseButton) { if ('mOverCloseButton' in tab && tab.mOverCloseButton) {
if (descendant.length && if (descendant.length &&
(collapsed || this.getTreePref('closeParentBehavior') == this.kCLOSE_PARENT_BEHAVIOR_CLOSE_ALL_CHILDREN)) { (collapsed || this.getTreePref('closeParentBehavior') == this.kCLOSE_PARENT_BEHAVIOR_CLOSE_ALL_CHILDREN)) {
label = tree || tab.getAttribute('label'); label = tree || tab.getAttribute('label');
label = label ? label = label && shouldShowTree ?
this.treeBundle.getFormattedString('tooltip.closeTree.labeled', [label]) : this.treeBundle.getFormattedString('tooltip.closeTree.labeled', [label]) :
this.treeBundle.getString('tooltip.closeTree') ; this.treeBundle.getString('tooltip.closeTree') ;
fullTooltipExtraLabel = this.treeBundle.getFormattedString('tooltip.closeTree.labeled', ['%TREE%']).split(/\s*%TREE%\s*/); fullTooltipExtraLabel = this.treeBundle.getFormattedString('tooltip.closeTree.labeled', ['%TREE%']).split(/\s*%TREE%\s*/);
@ -320,12 +321,12 @@ FullTooltipManager.prototype = {
'tooltip.expandSubtree' : 'tooltip.expandSubtree' :
'tooltip.collapseSubtree' ; 'tooltip.collapseSubtree' ;
label = tree || tab.getAttribute('label'); label = tree || tab.getAttribute('label');
label = label ? label = label && shouldShowTree ?
this.treeBundle.getFormattedString(key+'.labeled', [label]) : this.treeBundle.getFormattedString(key+'.labeled', [label]) :
this.treeBundle.getString(key) ; this.treeBundle.getString(key) ;
fullTooltipExtraLabel = this.treeBundle.getFormattedString(key+'.labeled', ['%TREE%']).split(/\s*%TREE%\s*/); fullTooltipExtraLabel = this.treeBundle.getFormattedString(key+'.labeled', ['%TREE%']).split(/\s*%TREE%\s*/);
} }
else if (collapsed || mode == this.kTOOLTIP_MODE_ALWAYS) { else if (shouldShowTree) {
label = tree; label = tree;
} }
@ -335,7 +336,8 @@ FullTooltipManager.prototype = {
aEvent.target.setAttribute('label', label); aEvent.target.setAttribute('label', label);
aEvent.stopPropagation(); aEvent.stopPropagation();
this.setup(aEvent.target, tab, fullTooltipExtraLabel); if (shouldShowTree)
this.setup(aEvent.target, tab, fullTooltipExtraLabel);
}, },