Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=274271, blocked install notification bar does not appear when clicking on InstallTrigger link; patch from moz_bugzilla@exchangecode.com, r+sr=dveditz,a=asa

Browse Source
This commit is contained in:
vladimir%pobox.com 2005-05-24 04:32:41 +00:00
parent 2f16a8de39
commit 38286037f8
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xpinstall/src/nsJSInstallTriggerGlobal.cpp
View File

@ -256,7 +256,16 @@ InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *arg
PRBool enabled = PR_FALSE;
nativeThis->UpdateEnabled(globalObject, XPI_WHITELIST, &enabled);
if (!enabled || !globalObject)
return JS_TRUE;
{
nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
if (os)
{
os->NotifyObservers(globalObject->GetDocShell(),
"xpinstall-install-blocked",
NS_LITERAL_STRING("install").get());
}
return JS_TRUE;
}
// get window.location to construct relative URLs
@ -418,7 +427,16 @@ InstallTriggerGlobalInstallChrome(JSContext *cx, JSObject *obj, uintN argc, jsva
PRBool useWhitelist = ( chromeType != CHROME_SKIN );
nativeThis->UpdateEnabled(globalObject, useWhitelist, &enabled);
if (!enabled || !globalObject)
return JS_TRUE;
{
nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
if (os)
{
os->NotifyObservers(globalObject->GetDocShell(),
"xpinstall-install-blocked",
NS_LITERAL_STRING("install").get());
}
return JS_TRUE;
}
// get window.location to construct relative URLs
@ -497,7 +515,16 @@ InstallTriggerGlobalStartSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc
PRBool enabled = PR_FALSE;
nativeThis->UpdateEnabled(globalObject, XPI_WHITELIST, &enabled);
if (!enabled || !globalObject)
return JS_TRUE;
{
nsCOMPtr<nsIObserverService> os(do_GetService("@mozilla.org/observer-service;1"));
if (os)
{
os->NotifyObservers(globalObject->GetDocShell(),
"xpinstall-install-blocked",
NS_LITERAL_STRING("install").get());
}
return JS_TRUE;
}
// get window.location to construct relative URLs
nsCOMPtr<nsIURI> baseURL;