moparisthebest
/
FireTray
mirror of https://github.com/moparisthebest/FireTray
1
0
Fork 0
Code Issues Releases Wiki Activity

use filePicker.open() instead of deprecated show() - see Bug 731307

This commit is contained in:
foudfou 2012-11-09 13:26:48 +01:00
parent 4ff8e81d90
commit d17bcf9721
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/chrome/content/options.js
View File

@ -316,18 +316,22 @@ var firetrayUIOptions = {
},
_chooseIconFile: function(elementId, prefpaneId) {
const nsIFilePicker = Ci.nsIFilePicker;
var filePicker = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
filePicker.init(window, "Select Icon", nsIFilePicker.modeOpen); // FIXME: i18n
filePicker.appendFilters(nsIFilePicker.filterImages);
const nsIFilePicker = Ci.nsIFilePicker;
var filePicker = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
var rv = filePicker.show();
if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
let filenameElt = document.getElementById(elementId);
filenameElt.value = filePicker.file.path;
let prefpane = this.getAncestorPrefpane(filenameElt);
prefpane.userChangedValue(filenameElt);
}
let fpCallback = function fpCallback_done(aResult) {
if (aResult == nsIFilePicker.returnOK ||
aResult == nsIFilePicker.returnReplace) {
let filenameElt = document.getElementById(elementId);
filenameElt.value = filePicker.file.path;
let prefpane = firetrayUIOptions.getAncestorPrefpane(filenameElt);
prefpane.userChangedValue(filenameElt);
}
};
filePicker.init(window, "Select Icon", nsIFilePicker.modeOpen); // FIXME: i18n
filePicker.appendFilters(nsIFilePicker.filterImages);
filePicker.open(fpCallback);
},
getAncestorPrefpane: function(elt) {