Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 295418 simplify returning boolean to show tree tooltip (remove gShowTooltip, checkTooltip).

Browse Source 
patch by gekacheka@yahoo.com, r=mvl.
This commit is contained in:
mvl%exedo.nl 2005-06-01 11:53:59 +00:00
parent f43a58ead4
commit b7070e6334
5 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/resources/content/calendar.xul
View File

@ -480,11 +480,11 @@
<!-- tooltips to show cropped text behave as a titletip: don't hide until mouse moved away -->
<tooltip id="eventTreeTooltip"
onpopupshowing="changeToolTipTextForEvent( event );return( checkTooltip( event ) );"
onpopupshowing="return changeToolTipTextForEvent( event );"
noautohide="true"/>
<tooltip id="taskTreeTooltip"
onpopupshowing="changeToolTipTextForToDo( event );return( checkTooltip( event ) );"
onpopupshowing="return changeToolTipTextForToDo( event );"
noautohide="true"/>
<tooltip id="gridOccurrenceTooltip"

17
calendar/resources/content/mouseoverPreviews.js
View File

@ -49,17 +49,6 @@
some of it duplicated.)
**/
// Whether to show event details on mouseover (set to true or false by code)
var gShowTooltip = true;
/*
** A function to check if the tooltip should be shown.
*/
function checkTooltip( event )
{
return( gShowTooltip );
}
/**
* Called when a user hovers over a todo element and the text for the mouse over is changed.
*/
@ -68,8 +57,6 @@ function getPreviewForTask( toDoItem )
{
if( toDoItem )
{
gShowTooltip = true; //needed to show the tooltip.
const vbox = document.createElement( "vbox" );
boxInitializeHeaderGrid(vbox);
@ -140,7 +127,6 @@ function getPreviewForTask( toDoItem )
}
else
{
gShowTooltip = false; //Don't show the tooltip
return null;
}
}
@ -190,8 +176,6 @@ function getPreviewForEvent( event, instStartDate, instEndDate )
if (event)
{
gShowTooltip = true;
if (event.title)
{
boxAppendLabeledText(vbox, "tooltipTitle", event.title);
@ -260,7 +244,6 @@ function getPreviewForEvent( event, instStartDate, instEndDate )
}
else
{
gShowTooltip = false; //Don't show the tooltip
return null;
}
}

6
calendar/resources/content/unifinder.js
View File

@ -756,7 +756,11 @@ function changeToolTipTextForEvent( event )
toolTip.removeChild( toolTip.firstChild );
}
var holderBox = getPreviewForEvent( thisEvent );
if (holderBox)
if (holderBox) {
toolTip.appendChild( holderBox );
return true;
} else {
return false;
}
}

6
calendar/resources/content/unifinderToDo.js
View File

@ -613,8 +613,12 @@ function changeToolTipTextForToDo( event )
toolTip.removeChild( toolTip.firstChild );
}
var holderBox = getPreviewForTask( toDoItem );
if( holderBox )
if( holderBox ) {
toolTip.appendChild( holderBox );
return true;
} else {
return false;
}
}
function changeContextMenuForToDo( event )

14
calendar/sunbird/base/content/calendar.xul
View File

@ -406,15 +406,15 @@
</toolbox>
<!-- tooltips to show cropped text behave as a titletip: don't hide until mouse moved away -->
<tooltip id="eventTreeListTooltip"
onpopupshowing="changeToolTipTextForEvent( event );return( checkTooltip( event ) );"
<tooltip id="eventTreeTooltip"
onpopupshowing="return changeToolTipTextForEvent( event );"
noautohide="true"/>
<tooltip id="eventTooltip"
<tooltip id="taskTreeTooltip"
onpopupshowing="return changeToolTipTextForToDo( event );"
noautohide="true"/>
<tooltip id="taskTooltip"
onpopupshowing="changeToolTipTextForToDo( event );return( checkTooltip( event ) );"
<tooltip id="gridOccurrenceTooltip"
noautohide="true"/>
<!-- V I S I B L E C O N T E N T -->
@ -542,7 +542,7 @@
label="&calendar.unifinder.tree.calendarname.label;"/>
</treecols>
<treechildren tooltip="taskTooltip"
<treechildren tooltip="taskTreeTooltip"
onmousedown="unifinderMouseDownToDo( event )"/>
</tree>
</vbox>
@ -635,7 +635,7 @@
</treecols>
<!-- on mousedown here happens before onclick above -->
<treechildren tooltip="eventTreeListTooltip"
<treechildren tooltip="eventTreeTooltip"
onkeypress="if (event.keyCode == 13) unifinderEditCommand();"
ondragover="return( false );"
ondblclick="unifinderDoubleClickEvent( event )"