Bug 68174 - "remove event handlers from within <template>" ((Fv1a-SM) <FilterListDialog.*> (+ NNTP server fix)) [p=sgautherie.bz@free.fr (Serge Gautherie) r+sr=Neil]

git-svn-id: svn://10.0.0.236/trunk@244800 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
reed%reedloden.com
2008-02-02 23:18:47 +00:00
parent 79bbbd5910
commit 92bdca22ac
2 changed files with 11 additions and 9 deletions

View File

@@ -164,9 +164,9 @@ function onCancel()
function onFilterServerClick(selection)
{
var itemURI = selection.getAttribute('id');
var itemURI = selection.getAttribute('itemUri');
if (!itemURI || itemURI == gCurrentServerURI)
if (itemURI == gCurrentServerURI)
return;
// Save the current filters to disk before switching because

View File

@@ -75,20 +75,21 @@
datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
sortDirection="ascending"
ref="msgaccounts:/">
ref="msgaccounts:/"
oncommand="onFilterServerClick(event.target);">
<template>
<rule iscontainer="true" isempty="false" nc:ServerType="nntp">
<menupopup>
<menu uri="..."
oncommand="onFilterServerClick(event.target)"
class="folderMenuItem menu-iconic"
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
label="rdf:http://home.netscape.com/NC-rdf#Name">
label="rdf:http://home.netscape.com/NC-rdf#Name"
itemUri="rdf:*">
<menupopup class="menulist-menupopup">
<menuitem label="&choosethisnewsserver.label;"
oncommand="onFilterServerClick(event.target.parentNode.parentNode)"/>
itemUri="rdf:*"/>
<menuseparator/>
</menupopup>
</menu>
@@ -101,18 +102,19 @@
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
label="rdf:http://home.netscape.com/NC-rdf#Name"/>
label="rdf:http://home.netscape.com/NC-rdf#Name"
itemUri="rdf:*"/>
</menupopup>
</rule>
<rule nc:SupportsFilters="true">
<menupopup>
<menuitem uri="..." value="..."
oncommand="onFilterServerClick(event.target)"
class="folderMenuItem menuitem-iconic"
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
label="rdf:http://home.netscape.com/NC-rdf#Name"/>
label="rdf:http://home.netscape.com/NC-rdf#Name"
itemUri="rdf:*"/>
</menupopup>
</rule>
</template>