mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 01:48:05 +00:00
Bug #254133 --> in the feed properties dialog, list the account name (which is used when you want a new folder for the feed)
in the folder destination drop down.
This commit is contained in:
parent
3fca7f6a78
commit
2de2afc5ec
@ -40,6 +40,9 @@ function onLoad()
|
||||
document.getElementById('selectFolder').setAttribute('ref', window.arguments[0].serverURI);
|
||||
|
||||
SetFolderPicker(window.arguments[0].folderURI ? window.arguments[0].folderURI : window.arguments[0].serverURI, 'selectFolder');
|
||||
|
||||
document.getElementById('rssAccountMenuItem').label = window.arguments[0].serverPrettyName;
|
||||
document.getElementById('rssAccountMenuItem').value = window.arguments[0].serverURI;
|
||||
}
|
||||
|
||||
function onOk()
|
||||
|
@ -73,8 +73,12 @@
|
||||
sortDirection="ascending"
|
||||
datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
|
||||
ref="...">
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem id="rssAccountMenuItem"/>
|
||||
<menuseparator/>
|
||||
</menupopup>
|
||||
|
||||
<template>
|
||||
<!-- cheat and use the CanRename property to make sure we don't list the Trash folder as a possible feed folder -->
|
||||
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false" nc:CanRename="true">
|
||||
<menupopup>
|
||||
|
@ -117,7 +117,7 @@ var feedDownloadCallback = {
|
||||
|
||||
function doAdd() {
|
||||
var userAddedFeed = false;
|
||||
var feedProperties = { feedName: "", feedLocation: "", serverURI: gRSSServer.serverURI, folderURI: "", result: userAddedFeed};
|
||||
var feedProperties = { feedName: "", feedLocation: "", serverURI: gRSSServer.serverURI, serverPrettyName: gRSSServer.prettyName, folderURI: "", result: userAddedFeed};
|
||||
|
||||
feedProperties = openFeedEditor(feedProperties);
|
||||
|
||||
@ -171,7 +171,7 @@ function doEdit() {
|
||||
currentFolder = rdf.GetResource(currentFolderURI).QueryInterface(Components.interfaces.nsIMsgFolder);
|
||||
|
||||
var userModifiedFeed = false;
|
||||
var feedProperties = { feedLocation: old_url, serverURI: gRSSServer.serverURI, folderURI: currentFolderURI, result: userModifiedFeed};
|
||||
var feedProperties = { feedLocation: old_url, serverURI: gRSSServer.serverURI, serverPrettyName: gRSSServer.prettyName, folderURI: currentFolderURI, result: userModifiedFeed};
|
||||
|
||||
feedProperties = openFeedEditor(feedProperties);
|
||||
if (!feedProperties.result) // did the user cancel?
|
||||
|
Loading…
Reference in New Issue
Block a user