Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 08:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checking in patch from BlakeR1234@aol.com for

Browse Source 
bug #41283: Incorrect Dialog for 'New' category in Customize search window

    mozilla/xpfe/components/search/resources/search-editor.js
    mozilla/xpfe/components/search/resources/locale/en-US/search-editor.properties

r=ben@netscape.com a=waterson@mozilla.org
This commit is contained in:
kin%netscape.com 2006-07-27 14:52:47 +00:00
parent 57cb8e1d86
commit 627a558c21
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
suite/common/search/search-editor.js
View File

@ -21,12 +21,15 @@
* Robert John Churchill <rjc@netscape.com>
*
* Contributor(s):
* Blake Ross <BlakeR1234@aol.com>
*/
// global(s)
var bundle = srGetStrBundle("chrome://communicator/locale/search/search-editor.properties");
var commonDialogsService = Components.classes["component://netscape/appshell/commonDialogs"].getService();
commonDialogsService = commonDialogsService.QueryInterface(Components.interfaces.nsICommonDialogs);
var pref = null;
var RDF = null;
var RDFC = null;
@ -421,10 +424,12 @@ function MoveDelta(delta)
function NewCategory()
{
var promptStr = bundle.GetStringFromName("NewCategoryPrompt");
var name = prompt(promptStr, "");
if ((!name) || (name == "")) return(false);
var newTitle = bundle.GetStringFromName("NewCategoryTitle");
var result = {value:0};
var name = commonDialogsService.Prompt(window, newTitle, promptStr,"",result);
if ((!result.value) || result.value == "") return(false);
var newName = RDF.GetLiteral(name);
var newName = RDF.GetLiteral(result.value);
if (!newName) return(false);
var categoryRes = RDF.GetResource("NC:SearchCategoryRoot");
@ -471,8 +476,10 @@ function RenameCategory()
var categoryList = document.getElementById( "categoryList" );
var currentName = categoryList.selectedItem.getAttribute("value");
var promptStr = bundle.GetStringFromName("RenameCategoryPrompt");
var name = prompt(promptStr, currentName);
if ((!name) || (name == "") || (name == currentName)) return(false);
var renameTitle = bundle.GetStringFromName("RenameCategoryTitle");
var result = {value:0};
var name = commonDialogsService.Prompt(window,renameTitle,promptStr,currentName,result);
if ((!result.value) || (result.value == "") || result.value == currentName) return(false);
var currentCatID = categoryList.selectedItem.getAttribute("id");
var currentCatRes = RDF.GetResource(currentCatID);
@ -481,7 +488,7 @@ function RenameCategory()
var titleRes = RDF.GetResource("http://home.netscape.com/NC-rdf#title");
if (!titleRes) return(false);
var newName = RDF.GetLiteral(name);
var newName = RDF.GetLiteral(result.value);
if (!newName) return(false);
var oldName = catDS.GetTarget(currentCatRes, titleRes, true);

2
suite/locales/en-US/chrome/common/search/search-editor.properties
View File

@ -1,5 +1,7 @@
NewCategoryPrompt=Enter the new category name:
NewCategoryTitle=New Category
RenameCategoryPrompt=Enter the new category name:
RenameCategoryTitle=Rename Category
RemoveCategoryPrompt=Delete this category?
AddEnginePrompt=Add the selected search engine(s) into this category?
RemoveEnginePrompt=Remove the selected search engine(s) from this category?