Bug 697309 - Add support for the Open Web Apps API - part 2 : about:apps r=mbrubeck r=fabrice

This commit is contained in:
Mark Finkle 2012-03-30 00:50:48 -04:00
parent b3a504ce9f
commit 9d2916d9c8
12 changed files with 273 additions and 1 deletions

View File

@ -485,6 +485,7 @@ pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/beta/faq/");
pref("app.featuresURL", "http://www.mozilla.com/%LOCALE%/mobile/features/");
pref("app.faqURL", "http://www.mozilla.com/%LOCALE%/mobile/faq/");
#endif
pref("app.marketplaceURL", "https://marketplace.mozilla.org/");
// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
pref("security.alternate_certificate_error_page", "certerror");

View File

@ -0,0 +1,160 @@
/* ***** BEGIN LICENSE BLOCK *****
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/.
*
* ***** END LICENSE BLOCK ***** */
let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm")
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Webapps.jsm");
let gStrings = Services.strings.createBundle("chrome://browser/locale/aboutApps.properties");
XPCOMUtils.defineLazyGetter(window, "gChromeWin", function()
window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShellTreeItem)
.rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindow)
.QueryInterface(Ci.nsIDOMChromeWindow));
var AppsUI = {
uninstall: null,
shortcut: null
};
function onLoad(aEvent) {
try {
let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
let link = document.getElementById("marketplaceURL");
let url = formatter.formatURLPref(link.getAttribute("pref"));
link.setAttribute("href", url);
} catch (e) {}
navigator.mozApps.mgmt.oninstall = onInstall;
navigator.mozApps.mgmt.onuninstall = onUninstall;
updateList();
let contextmenus = gChromeWin.NativeWindow.contextmenus;
AppsUI.shortcut = contextmenus.add(gStrings.GetStringFromName("appsContext.shortcut"), contextmenus.SelectorContext("div[mozApp]"),
function(aTarget) {
let manifest = aTarget.manifest;
createShortcut(manifest.name, manifest.fullLaunchPath(), manifest.iconURLForSize("64"), "webapp");
});
AppsUI.uninstall = contextmenus.add(gStrings.GetStringFromName("appsContext.uninstall"), contextmenus.SelectorContext("div[mozApp]"),
function(aTarget) {
aTarget.app.uninstall();
});
}
function onUnload(aEvent) {
let contextmenus = gChromeWin.NativeWindow.contextmenus;
if (AppsUI.shortcut)
contextmenus.remove(AppsUI.shortcut);
if (AppsUI.uninstall)
contextmenus.remove(AppsUI.uninstall);
}
function updateList() {
let grid = document.getElementById("appgrid");
while (grid.lastChild) {
grid.removeChild(grid.lastChild);
}
let request = navigator.mozApps.mgmt.getAll();
request.onsuccess = function() {
for (let i = 0; i < request.result.length; i++)
addApplication(request.result[i]);
if (!request.result.length)
document.getElementById("noapps").className = "";
}
}
function addApplication(aApp) {
let list = document.getElementById("appgrid");
let manifest = new DOMApplicationManifest(aApp.manifest, aApp.origin);
let container = document.createElement("div");
container.className = "app";
container.setAttribute("id", "app-" + aApp.origin);
container.setAttribute("mozApp", aApp.origin);
container.setAttribute("title", manifest.name);
let img = document.createElement("img");
img.src = manifest.iconURLForSize("64");
img.setAttribute("title", manifest.name);
let title = document.createElement("div");
title.appendChild(document.createTextNode(manifest.name));
container.appendChild(img);
container.appendChild(title);
list.appendChild(container);
container.addEventListener("click", function(aEvent) {
aApp.launch();
}, false);
container.app = aApp;
container.manifest = manifest;
}
function onInstall(aEvent) {
let node = document.getElementById("app-" + aEvent.application.origin);
if (node)
return;
addApplication(aEvent.application);
document.getElementById("noapps").className = "hidden";
}
function onUninstall(aEvent) {
let node = document.getElementById("app-" + aEvent.application.origin);
if (node) {
let parent = node.parentNode;
parent.removeChild(node);
if (!parent.firstChild)
document.getElementById("noapps").className = "";
}
}
function createShortcut(aTitle, aURL, aIconURL, aType) {
// The background images are 72px, but Android will resize as needed.
// Bigger is better than too small.
const kIconSize = 72;
const kOverlaySize = 32;
const kOffset = 20;
let canvas = document.createElement("canvas");
function _createShortcut() {
let icon = canvas.toDataURL("image/png", "");
canvas = null;
try {
let shell = Cc["@mozilla.org/browser/shell-service;1"].createInstance(Ci.nsIShellService);
shell.createShortcut(aTitle, aURL, icon, aType);
} catch(e) {
Cu.reportError(e);
}
}
canvas.width = canvas.height = kIconSize;
let ctx = canvas.getContext("2d");
let favicon = new Image();
favicon.onload = function() {
// Center the favicon and overlay it on the background
ctx.drawImage(favicon, kOffset, kOffset, kOverlaySize, kOverlaySize);
_createShortcut();
}
favicon.onerror = function() {
Cu.reportError("CreateShortcut: favicon image load error");
}
favicon.src = aIconURL;
}

View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
# ***** BEGIN LICENSE BLOCK *****
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
#
# ***** END LICENSE BLOCK *****
<!DOCTYPE html [
<!ENTITY % htmlDTD
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"DTD/xhtml1-strict.dtd">
%htmlDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%globalDTD;
<!ENTITY % aboutAppsDTD SYSTEM "chrome://browser/locale/aboutApps.dtd">
%aboutAppsDTD;
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
%browserDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>&aboutApps.title;</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
<link rel="stylesheet" type="text/css" href="chrome://browser/skin/aboutApps.css" media="all" />
<script type="text/javascript;version=1.8" src="chrome://browser/content/aboutApps.js"></script>
</head>
<body dir="&locale.dir;" onload="onLoad(event)" onunload="onUnload(event)">
<div id="main-container">
<div>&aboutApps.title;</div>
<div id="noapps" class="hidden">
&aboutApps.noApps.pre;<a id="marketplaceURL" pref="app.marketplaceURL">&aboutApps.noApps.middle;</a>&aboutApps.noApps.post;
</div>
<div>
<div class="spacer" id="spacer1"> </div>
<div id="appgrid"/>
<div class="spacer" id="spacer1"> </div>
</div>
</div>
</body>
</html>

View File

@ -1263,7 +1263,9 @@ var NativeWindow = {
let popupNode = aEvent.originalTarget;
let title = "";
if ((popupNode instanceof Ci.nsIDOMHTMLAnchorElement && popupNode.href) ||
if (popupNode.hasAttribute("title")) {
title = popupNode.getAttribute("title")
} else if ((popupNode instanceof Ci.nsIDOMHTMLAnchorElement && popupNode.href) ||
(popupNode instanceof Ci.nsIDOMHTMLAreaElement && popupNode.href)) {
title = this._getLinkURL(popupNode);
} else if (popupNode instanceof Ci.nsIImageLoadingContent && popupNode.currentURI) {

View File

@ -10,6 +10,8 @@ chrome.jar:
content/aboutCertError.xhtml (content/aboutCertError.xhtml)
content/aboutHome.xhtml (content/aboutHome.xhtml)
* content/aboutRights.xhtml (content/aboutRights.xhtml)
* content/aboutApps.xhtml (content/aboutApps.xhtml)
content/aboutApps.js (content/aboutApps.js)
content/blockedSite.xhtml (content/blockedSite.xhtml)
content/languages.properties (content/languages.properties)
* content/browser.xul (content/browser.xul)

View File

@ -85,6 +85,10 @@ let modules = {
home: {
uri: "chrome://browser/content/aboutHome.xhtml",
privileged: true
},
apps: {
uri: "chrome://browser/content/aboutApps.xhtml",
privileged: true
}
}

View File

@ -7,6 +7,7 @@ contract @mozilla.org/network/protocol/about;1?what=empty {322ba47e-7047-4f71-ae
contract @mozilla.org/network/protocol/about;1?what=rights {322ba47e-7047-4f71-aebf-cb7d69325cd9}
contract @mozilla.org/network/protocol/about;1?what=certerror {322ba47e-7047-4f71-aebf-cb7d69325cd9}
contract @mozilla.org/network/protocol/about;1?what=home {322ba47e-7047-4f71-aebf-cb7d69325cd9}
contract @mozilla.org/network/protocol/about;1?what=apps {322ba47e-7047-4f71-aebf-cb7d69325cd9}
#ifdef MOZ_SAFE_BROWSING
contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-aebf-cb7d69325cd9}
#endif

View File

@ -0,0 +1,8 @@
<!ENTITY aboutApps.title "Your Apps">
<!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
<!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
<!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
<!ENTITY aboutApps.noApps.pre "No web apps installed. Get some from the ">
<!ENTITY aboutApps.noApps.middle "app store">
<!ENTITY aboutApps.noApps.post ".">

View File

@ -0,0 +1,2 @@
appsContext.uninstall=Uninstall
appsContext.shortcut=Add to Home Screen

View File

@ -5,6 +5,8 @@
locale/@AB_CD@/browser/about.dtd (%chrome/about.dtd)
locale/@AB_CD@/browser/aboutAddons.dtd (%chrome/aboutAddons.dtd)
locale/@AB_CD@/browser/aboutAddons.properties (%chrome/aboutAddons.properties)
locale/@AB_CD@/browser/aboutApps.dtd (%chrome/aboutApps.dtd)
locale/@AB_CD@/browser/aboutApps.properties (%chrome/aboutApps.properties)
locale/@AB_CD@/browser/aboutCertError.dtd (%chrome/aboutCertError.dtd)
locale/@AB_CD@/browser/browser.properties (%chrome/browser.properties)
locale/@AB_CD@/browser/config.dtd (%chrome/config.dtd)

View File

@ -0,0 +1,43 @@
html {
font-family: "Droid Sans",helvetica,arial,clean,sans-serif;
font-size: 18px;
background-image: url("chrome://browser/skin/images/about-bg-lightblue.png");
-moz-text-size-adjust: none;
}
#main-container {
margin: 1em;
padding: 1em;
border-radius: 10px;
border: 1px solid grey;
background-color: white;
}
.spacer {
clear: both;
}
.app {
float: left;
cursor: pointer;
text-align: center;
margin: 1em;
width: 70px;
height: 85px;
font-size: 10px;
}
.app img {
width: 64px;
height: 64px;
}
#noapps {
padding: 1em;
text-align: center;
}
.hidden {
display: none;
}

View File

@ -5,6 +5,7 @@ chrome.jar:
skin/aboutPage.css (aboutPage.css)
skin/about.css (about.css)
skin/aboutAddons.css (aboutAddons.css)
skin/aboutApps.css (aboutApps.css)
* skin/browser.css (browser.css)
* skin/content.css (content.css)
skin/config.css (config.css)