mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 14:22:01 +00:00
Fix merge in 60ebef177e6d
This commit is contained in:
parent
7640cb963c
commit
19c2ee8e00
@ -922,9 +922,6 @@ var BrowserApp = {
|
||||
} else if (aTopic == "Viewport:Change") {
|
||||
if (this.isBrowserContentDocumentDisplayed())
|
||||
this.selectedTab.setViewport(JSON.parse(aData));
|
||||
|
||||
// this.selectedTab.viewport = JSON.parse(aData);
|
||||
// ViewportHandler.onResize();
|
||||
} else if (aTopic == "SearchEngines:Get") {
|
||||
this.getSearchEngines();
|
||||
} else if (aTopic == "Passwords:Init") {
|
||||
@ -2208,7 +2205,7 @@ Tab.prototype = {
|
||||
},
|
||||
|
||||
get scale() {
|
||||
return this.viewport.zoom;
|
||||
return this._zoom;
|
||||
},
|
||||
|
||||
QueryInterface: XPCOMUtils.generateQI([
|
||||
|
Loading…
Reference in New Issue
Block a user