mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 983481 open a post activation landing page, r=markh

This commit is contained in:
Shane Caraveo 2014-04-30 12:08:23 -07:00
Родитель 7d5d7cf33b
Коммит bfbf27d0ac
6 изменённых файлов: 36 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/base/content/browser-social.js
Просмотреть файл

@ -233,6 +233,9 @@ SocialUI = {
if (provider.sidebarURL) { if (provider.sidebarURL) {
SocialSidebar.show(provider.origin); SocialSidebar.show(provider.origin);
} }
if (provider.postActivationURL) {
openUILinkIn(provider.postActivationURL, "tab");
}
}); });
}); });
}, },

1
browser/base/content/test/social/browser.ini
Просмотреть файл

@ -17,6 +17,7 @@ support-files =
social_flyout.html social_flyout.html
social_mark.html social_mark.html
social_panel.html social_panel.html
social_postActivation.html
social_sidebar.html social_sidebar.html
social_sidebar_empty.html social_sidebar_empty.html
social_window.html social_window.html

8
browser/base/content/test/social/browser_social_activation.js
Просмотреть файл

@ -90,9 +90,12 @@ function waitForProviderLoad(cb) {
waitForCondition(function() { waitForCondition(function() {
let sbrowser = document.getElementById("social-sidebar-browser"); let sbrowser = document.getElementById("social-sidebar-browser");
let provider = SocialSidebar.provider; let provider = SocialSidebar.provider;
let postActivation = provider && gBrowser.contentDocument.location.href == provider.origin + "/browser/browser/base/content/test/social/social_postActivation.html";
return provider && return provider &&
provider.profile && provider.profile &&
provider.profile.displayName && provider.profile.displayName &&
postActivation &&
sbrowser.docShellIsActive; sbrowser.docShellIsActive;
}, function() { }, function() {
// executeSoon to let the browser UI observers run first // executeSoon to let the browser UI observers run first
@ -290,6 +293,9 @@ var tests = {
let prefname = addBuiltinManifest(gProviders[0]); let prefname = addBuiltinManifest(gProviders[0]);
activateOneProvider(gProviders[0], true, function() { activateOneProvider(gProviders[0], true, function() {
info("first activation completed"); info("first activation completed");
is(gBrowser.contentDocument.location.href, gProviders[0].origin + "/browser/browser/base/content/test/social/social_postActivation.html");
gBrowser.removeTab(gBrowser.selectedTab);
is(gBrowser.contentDocument.location.href, gProviders[0].origin + "/browser/browser/base/content/test/social/social_activate.html");
gBrowser.removeTab(gBrowser.selectedTab); gBrowser.removeTab(gBrowser.selectedTab);
tabsToRemove.pop(); tabsToRemove.pop();
// uninstall the provider // uninstall the provider
@ -297,6 +303,8 @@ var tests = {
checkSocialUI(); checkSocialUI();
activateOneProvider(gProviders[0], true, function() { activateOneProvider(gProviders[0], true, function() {
info("second activation completed"); info("second activation completed");
is(gBrowser.contentDocument.location.href, gProviders[0].origin + "/browser/browser/base/content/test/social/social_postActivation.html");
gBrowser.removeTab(gBrowser.selectedTab);
// after closing the addons tab, verify provider is still installed // after closing the addons tab, verify provider is still installed
gBrowser.tabContainer.addEventListener("TabClose", function onTabClose() { gBrowser.tabContainer.addEventListener("TabClose", function onTabClose() {

1
browser/base/content/test/social/social_activate.html
Просмотреть файл

@ -15,6 +15,7 @@ var data = {
"sidebarURL": "/browser/browser/base/content/test/social/social_sidebar.html", "sidebarURL": "/browser/browser/base/content/test/social/social_sidebar.html",
"workerURL": "/browser/browser/base/content/test/social/social_worker.js", "workerURL": "/browser/browser/base/content/test/social/social_worker.js",
"statusURL": "/browser/browser/base/content/test/social/social_panel.html", "statusURL": "/browser/browser/base/content/test/social/social_panel.html",
"postActivationURL": "/browser/browser/base/content/test/social/social_postActivation.html",
// should be available for display purposes // should be available for display purposes
"description": "A short paragraph about this provider", "description": "A short paragraph about this provider",

11
browser/base/content/test/social/social_postActivation.html Normal file
Просмотреть файл

@ -0,0 +1,11 @@
<html>
<head>
<title>Post-Activation test</title>
</head>
<body>
Post Activation landing page
</body>
</html>

18
toolkit/components/social/SocialService.jsm
Просмотреть файл

@ -501,7 +501,8 @@ this.SocialService = {
}, },
_manifestFromData: function(type, data, principal) { _manifestFromData: function(type, data, principal) {
let sameOriginRequired = ['workerURL', 'sidebarURL', 'shareURL', 'statusURL', 'markURL']; let featureURLs = ['workerURL', 'sidebarURL', 'shareURL', 'statusURL', 'markURL'];
let resolveURLs = featureURLs.concat(['postActivationURL']);
if (type == 'directory') { if (type == 'directory') {
// directory provided manifests must have origin in manifest, use that // directory provided manifests must have origin in manifest, use that
@ -515,11 +516,10 @@ this.SocialService = {
// force/fixup origin // force/fixup origin
data.origin = principal.origin; data.origin = principal.origin;
// workerURL, sidebarURL is required and must be same-origin
// iconURL and name are required // iconURL and name are required
// iconURL may be a different origin (CDN or data url support) if this is // iconURL may be a different origin (CDN or data url support) if this is
// a whitelisted or directory listed provider // a whitelisted or directory listed provider
let providerHasFeatures = [url for (url of sameOriginRequired) if (data[url])].length > 0; let providerHasFeatures = [url for (url of featureURLs) if (data[url])].length > 0;
if (!providerHasFeatures) { if (!providerHasFeatures) {
Cu.reportError("SocialService.manifestFromData manifest missing required urls."); Cu.reportError("SocialService.manifestFromData manifest missing required urls.");
return null; return null;
@ -528,12 +528,17 @@ this.SocialService = {
Cu.reportError("SocialService.manifestFromData manifest missing name or iconURL."); Cu.reportError("SocialService.manifestFromData manifest missing name or iconURL.");
return null; return null;
} }
for (let url of sameOriginRequired) { for (let url of resolveURLs) {
if (data[url]) { if (data[url]) {
try { try {
data[url] = Services.io.newURI(principal.URI.resolve(data[url]), null, null).spec; let resolved = Services.io.newURI(principal.URI.resolve(data[url]), null, null);
if (!(resolved.schemeIs("http") || resolved.schemeIs("https"))) {
Cu.reportError("SocialService.manifestFromData unsupported scheme '" + resolved.scheme + "' for " + principal.origin);
return null;
}
data[url] = resolved.spec;
} catch(e) { } catch(e) {
Cu.reportError("SocialService.manifestFromData same-origin missmatch in manifest for " + principal.origin); Cu.reportError("SocialService.manifestFromData unable to resolve '" + url + "' for " + principal.origin);
return null; return null;
} }
} }
@ -737,6 +742,7 @@ function SocialProvider(input) {
this.markURL = input.markURL; this.markURL = input.markURL;
this.markedIcon = input.markedIcon; this.markedIcon = input.markedIcon;
this.unmarkedIcon = input.unmarkedIcon; this.unmarkedIcon = input.unmarkedIcon;
this.postActivationURL = input.postActivationURL;
this.origin = input.origin; this.origin = input.origin;
let originUri = Services.io.newURI(input.origin, null, null); let originUri = Services.io.newURI(input.origin, null, null);
this.principal = Services.scriptSecurityManager.getNoAppCodebasePrincipal(originUri); this.principal = Services.scriptSecurityManager.getNoAppCodebasePrincipal(originUri);