wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge b2g-inbound to m-c

Browse Source
This commit is contained in:
Wes Kocher 2013-10-14 18:15:19 -07:00
commit 20d928deb6
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
b2g/chrome/content/shell.js
View File

@ -529,6 +529,14 @@ var shell = {
content.dispatchEvent(event);
},
sendCustomEvent: function shell_sendCustomEvent(type, details) {
let content = getContentWindow();
let event = content.document.createEvent('CustomEvent');
let payload = details ? ObjectWrapper.wrap(details, content) : {};
event.initCustomEvent(type, true, true, payload);
content.dispatchEvent(event);
},
sendChromeEvent: function shell_sendChromeEvent(details) {
if (!this.isHomeLoaded) {
if (!('pendingChromeEvents' in this)) {
@ -545,8 +553,7 @@ var shell = {
openAppForSystemMessage: function shell_openAppForSystemMessage(msg) {
let origin = Services.io.newURI(msg.manifest, null, null).prePath;
this.sendChromeEvent({
type: 'open-app',
let payload = {
url: msg.uri,
manifestURL: msg.manifest,
isActivity: (msg.type == 'activity'),
@ -555,7 +562,11 @@ var shell = {
target: msg.target,
expectingSystemMessage: true,
extra: msg.extra
});
}
this.sendCustomEvent('open-app', payload);
// XXX Remove once the gaia part of bug 924032 has landed.
payload.type = 'open-app';
this.sendChromeEvent(payload);
},
receiveMessage: function shell_receiveMessage(message) {
@ -947,12 +958,21 @@ var WebappsHelper = {
return;
let manifest = new ManifestHelper(aManifest, json.origin);
shell.sendChromeEvent({
"type": "webapps-launch",
"timestamp": json.timestamp,
"url": manifest.fullLaunchPath(json.startPoint),
"manifestURL": json.manifestURL
});
let payload = {
__exposedProps__: {
timestamp: "r",
url: "r",
manifestURL: "r"
},
timestamp: json.timestamp,
url: manifest.fullLaunchPath(json.startPoint),
manifestURL: json.manifestURL
}
shell.sendEvent(getContentWindow(), "webapps-launch", payload);
// XXX Remove once the gaia side of bug 924032 lands.
payload.type = "webapps-launch";
delete payload.__exposedProps__;
shell.sendChromeEvent(payload);
});
break;
case "webapps-ask-install":
@ -964,10 +984,14 @@ var WebappsHelper = {
});
break;
case "webapps-close":
shell.sendChromeEvent({
"type": "webapps-close",
"manifestURL": json.manifestURL
});
shell.sendEvent(shell.getContentWindow(), "webapps-close",
{
__exposedProps__: { "manifestURL": "r" },
"manifestURL": json.manifestURL
});
// XXX Remove once the gaia side of bug 924032 lands.
shell.sendChromeEvent({ type: "webapps-close",
"manifestURL": json.manifestURL });
break;
}
}

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "4cdfe9307db3882da00e49361aa2f6788c9efe54",
"revision": "4a8dcbcad9433e7cb0b619d80b041219e5946130",
"repo_path": "/integration/gaia-central"
}