Bug 605499: Add-ons manager doesn't display EULA for available add-ons that have one. r=Unfocused, a=blocks-beta7

--HG--
extra : transplant_source : %22%A3%C0%FC%B8%F1z%21%81%B67%E2%7F%C9%D0%FAXD%11z
This commit is contained in:
Dave Townsend 2010-10-19 14:12:29 -07:00
parent 4d88945bcb
commit 939678671e
3 changed files with 19 additions and 0 deletions

View File

@ -186,3 +186,8 @@
<!ENTITY addon.errorLoadingReleaseNotes.label "Sorry, but there was an error loading the release notes.">
<!ENTITY addon.createdBy.label "By ">
<!ENTITY eula.title "End-User License Agreement">
<!ENTITY eula.width "560px">
<!ENTITY eula.height "400px">
<!ENTITY eula.accept "Accept and Install…">

View File

@ -101,3 +101,5 @@ addon.purchase.tooltip=Visit the add-ons gallery to purchase this add-on
# view, %S is the price of the add-on including currency symbol
cmd.purchaseAddon.label=Purchase for %S…
cmd.purchaseAddon.accesskey=u
eulaHeader=%S requires that you accept the following End User License Agreement before installation can proceed:

View File

@ -601,6 +601,18 @@
if (this.mControl.getAttribute("remote") != "true")
return;
if (this.mControl.mAddon.eula) {
var eula = {
name: this.mControl.mAddon.name,
text: this.mControl.mAddon.eula,
accepted: false
};
window.openDialog("chrome://mozapps/content/extensions/eula.xul", "_blank",
"chrome,dialog,modal,centerscreen,resizable=no", eula);
if (!eula.accepted)
return;
}
delete this.mControl.mAddon;
this.mControl.mInstall = this.mInstall;
this.mControl.setAttribute("status", "installing");