зеркало из https://github.com/mozilla/gecko-dev.git
use proper newlines in alerts/prompts for profile manager
This commit is contained in:
Родитель
498ad145a0
Коммит
1da5c3ae3c
|
@ -56,7 +56,9 @@ function RenameProfile()
|
||||||
var selected = profileTree.selectedItems[0];
|
var selected = profileTree.selectedItems[0];
|
||||||
if( selected.getAttribute("rowMigrate") == "true" ) {
|
if( selected.getAttribute("rowMigrate") == "true" ) {
|
||||||
// auto migrate if the user wants to
|
// auto migrate if the user wants to
|
||||||
if( confirm( bundle.GetStringFromName("migratebeforerename") ) )
|
var lString = bundle.GetStringFromName("migratebeforerename");
|
||||||
|
lString = lString.replace(/\s*<html:br\/>/g,"\n");
|
||||||
|
if( confirm( lString ) )
|
||||||
profile.migrateProfile( profilename, true );
|
profile.migrateProfile( profilename, true );
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
@ -76,7 +78,9 @@ function RenameProfile()
|
||||||
selected.setAttribute( "profile_name", newName );
|
selected.setAttribute( "profile_name", newName );
|
||||||
}
|
}
|
||||||
catch (ex) {
|
catch (ex) {
|
||||||
alert( bundle.GetStringFromName("renamefailed") );
|
var lString = bundle.GetStringFromName("renamefailed");
|
||||||
|
lString = lString.replace(/\s*<html:br\/>/g,"\n");
|
||||||
|
alert( lString );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -105,7 +109,9 @@ function ConfirmDelete()
|
||||||
|
|
||||||
if( selected.getAttribute("rowMigrate") == "true" ) {
|
if( selected.getAttribute("rowMigrate") == "true" ) {
|
||||||
// auto migrate if the user wants to. THIS IS REALLY REALLY DUMB PLEASE FIX THE BACK END.
|
// auto migrate if the user wants to. THIS IS REALLY REALLY DUMB PLEASE FIX THE BACK END.
|
||||||
if( confirm( bundle.GetStringFromName("migratebeforedelete") ) )
|
var lString = bundle.GetStringFromName("migratebeforedelete");
|
||||||
|
lString = lString.replace(/\s*<html:br\/>/g,"\n");
|
||||||
|
if( confirm( lString ) )
|
||||||
profile.migrateProfile( profilename, true );
|
profile.migrateProfile( profilename, true );
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
@ -127,7 +133,9 @@ function DeleteProfile( deleteFiles )
|
||||||
profileKids.removeChild( selected );
|
profileKids.removeChild( selected );
|
||||||
}
|
}
|
||||||
catch (ex) {
|
catch (ex) {
|
||||||
alert( bundle.GetStringFromName("deletefailed") );
|
var lString = bundle.GetStringFromName("deletefailed");
|
||||||
|
lString = lString.replace(/\s*<html:br\/>/g,"\n");
|
||||||
|
alert( lString );
|
||||||
}
|
}
|
||||||
// set the button state
|
// set the button state
|
||||||
DoEnabling();
|
DoEnabling();
|
||||||
|
|
|
@ -115,7 +115,9 @@ function onStart()
|
||||||
|
|
||||||
var profilename = selected.getAttribute("profile_name");
|
var profilename = selected.getAttribute("profile_name");
|
||||||
if( selected.getAttribute("rowMigrate") == "true" ) {
|
if( selected.getAttribute("rowMigrate") == "true" ) {
|
||||||
if( confirm( bundle.GetStringFromName("migratebeforestart") ) )
|
var lString = bundle.GetStringFromName("migratebeforestart");
|
||||||
|
lString = lString.replace(/\s*<html:br\/>/g,"\n");
|
||||||
|
if( confirm( lString ) )
|
||||||
profile.migrateProfile( profilename, true );
|
profile.migrateProfile( profilename, true );
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче