Bug 770297. Call to isLaunchable needs to use the app origin, and not the install origin. r=fabrice

This commit is contained in:
Felipe Gomes 2012-07-02 20:45:00 -07:00
Родитель fa9c462002
Коммит 809da8f2ae
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -301,7 +301,7 @@ let DOMApplicationRegistry = {
let tmp = []; let tmp = [];
let id = this._appId(aData.origin); let id = this._appId(aData.origin);
if (id && this._isLaunchable(aData.origin)) { if (id && this._isLaunchable(this.webapps[id].origin)) {
let app = this._cloneAppObject(this.webapps[id]); let app = this._cloneAppObject(this.webapps[id]);
aData.apps.push(app); aData.apps.push(app);
tmp.push({ id: id }); tmp.push({ id: id });
@ -320,7 +320,7 @@ let DOMApplicationRegistry = {
for (let id in this.webapps) { for (let id in this.webapps) {
if (this.webapps[id].installOrigin == aData.origin && if (this.webapps[id].installOrigin == aData.origin &&
this._isLaunchable(aData.origin)) { this._isLaunchable(this.webapps[id].origin)) {
aData.apps.push(this._cloneAppObject(this.webapps[id])); aData.apps.push(this._cloneAppObject(this.webapps[id]));
tmp.push({ id: id }); tmp.push({ id: id });
} }
@ -339,7 +339,7 @@ let DOMApplicationRegistry = {
for (let id in this.webapps) { for (let id in this.webapps) {
if (this.webapps[id].installOrigin == aData.origin && if (this.webapps[id].installOrigin == aData.origin &&
!this._isLaunchable(aData.origin)) { !this._isLaunchable(this.webapps[id].origin)) {
aData.apps.push(this._cloneAppObject(this.webapps[id])); aData.apps.push(this._cloneAppObject(this.webapps[id]));
tmp.push({ id: id }); tmp.push({ id: id });
} }
@ -358,7 +358,7 @@ let DOMApplicationRegistry = {
for (let id in this.webapps) { for (let id in this.webapps) {
let app = this._cloneAppObject(this.webapps[id]); let app = this._cloneAppObject(this.webapps[id]);
if (!this._isLaunchable(app.installOrigin)) if (!this._isLaunchable(app.origin))
continue; continue;
aData.apps.push(app); aData.apps.push(app);