Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 18:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1369407 - make showMainView only switch views if the main view isn't current, dispatch ViewHiding, and fix view child assumptions, r=mikedeboer

Browse Source 
MozReview-Commit-ID: JWKr8pBd58m

--HG--
extra : rebase_source : 5c7fe081b914be2274bbf83799cfa15f43144a9a
This commit is contained in:
Gijs Kruitbosch 2017-06-02 11:13:33 +01:00
parent 2902c3f037
commit f4827a11b6
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
browser/components/customizableui/PanelMultiView.jsm
View File

@ -381,21 +381,23 @@ this.PanelMultiView = class {
}
showMainView() {
if (this.panelViews) {
this.showSubView(this._mainViewId);
} else {
if (this.showingSubView) {
let viewNode = this._currentSubView;
let evt = new this.window.CustomEvent("ViewHiding", { bubbles: true, cancelable: true });
viewNode.dispatchEvent(evt);
if (this.showingSubView) {
let viewNode = this._currentSubView;
let evt = new this.window.CustomEvent("ViewHiding", { bubbles: true, cancelable: true });
viewNode.dispatchEvent(evt);
if (this.panelViews) {
viewNode.removeAttribute("current");
this.showSubView(this._mainViewId);
} else {
this._transitionHeight(() => {
viewNode.removeAttribute("current");
this._currentSubView = null;
this.node.setAttribute("viewtype", "main");
});
}
}
if (!this.panelViews) {
this._shiftMainView();
}
}
@ -433,8 +435,8 @@ this.PanelMultiView = class {
// of the main view, i.e. 'forever', during the instance lifetime.
if (!this._mainViewWidth) {
this._mainViewWidth = previousRect.width;
let top = dwu.getBoundsWithoutFlushing(previousViewNode.firstChild).top;
let bottom = dwu.getBoundsWithoutFlushing(previousViewNode.lastChild).bottom;
let top = dwu.getBoundsWithoutFlushing(previousViewNode.firstChild || previousViewNode).top;
let bottom = dwu.getBoundsWithoutFlushing(previousViewNode.lastChild || previousViewNode).bottom;
this._viewVerticalPadding = previousRect.height - (bottom - top);
}
// Here go the measures that have the same caching lifetime as the height
@ -642,7 +644,7 @@ this.PanelMultiView = class {
});
this._shiftMainView(aAnchor);
}
})();
})().catch(e => Cu.reportError(e));
}
/**