Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-24 11:27:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Opening the "Advanced" dialog and cancelling it should not change the

Browse Source 
helper app dialog contents.  Bug 124723, r=law, sr=jag
This commit is contained in:
bzbarsky%mit.edu 2002-02-12 03:52:03 +00:00
parent 3125ae9530
commit 073e999f03
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
View File

@ -62,6 +62,7 @@ function nsHelperAppDialog() {
this.givenDefaultApp = false;
this.strings = new Array;
this.elements = new Array;
this.updateSelf = true;
}
nsHelperAppDialog.prototype = {
@ -502,14 +503,17 @@ nsHelperAppDialog.prototype = {
}
// Open whichever dialog is appropriate, passing this dialog object as argument.
this.updateSelf = false; // dialog will reset to true onOK
this.mDialog.openDialog( dlgUrl,
"_blank",
"chrome,modal=yes,resizable=no",
this );
// Refresh dialog with updated info about the default action.
this.initIntro();
this.initAppAndSaveToDiskValues();
if (this.updateSelf) {
// Refresh dialog with updated info about the default action.
this.initIntro();
this.initAppAndSaveToDiskValues();
}
},
// updateMIMEInfo: This is called from the pref-applications-edit dialog when the user

3
xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
View File

@ -282,6 +282,9 @@
} else {
info.preferredAction = Components.interfaces.nsIMIMEInfo.handleInternally;
}
// tell the helper app dialog to update itself
gHelperAppDlg.updateSelf = true;
}
window.opener.gUpdateTypeRV = true;

6
xpfe/components/prefwindow/resources/content/pref-applications-new.js
View File

@ -45,7 +45,8 @@ function Startup()
gDescriptionField.value = info.Description;
gExtensionField.value = info.primaryExtension;
gMIMEField.value = info.MIMEType;
var app = info.preferredApplicationHandler;
// an app may have been selected in the opening dialog but not in the mimeinfo
var app = info.preferredApplicationHandler || window.arguments[0].chosenApp;
if ( app ) {
gAppPath.value = app.unicodePath;
}
@ -169,6 +170,9 @@ function onOK()
info.Description = gDescriptionField.value;
info.preferredApplicationHandler = file;
info.applicationDescription = handlerInfo.appDisplayName;
// Tell the nsIHelperAppLauncherDialog to update to the changes
window.arguments[0].updateSelf = true;
}
window.opener.gNewTypeRV = gMIMEField.value;