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

Bug 1254523 - Convert modal.Dialog to a class; r=automatedtester a=test-only

Browse Source 
MozReview-Commit-ID: DmC472jSsdi
This commit is contained in:
Andreas Tolfsen 2016-03-08 14:10:32 +00:00
parent 15f1c9bf0b
commit b94edebe20
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
testing/marionette/modal.js
View File

@ -77,24 +77,24 @@ modal.removeHandler = function(toRemove) {
* Represents the current modal dialogue.
*
* @param {function(): BrowserObj} curBrowserFn
* Function that returns the current BrowserObj.
* @param {?nsIWeakReference} winRef
* A weak reference to the current ChromeWindow.
* Function that returns the current |BrowserObj|.
* @param {nsIWeakReference=} winRef
* A weak reference to the current |ChromeWindow|.
*/
modal.Dialog = function(curBrowserFn, winRef=null) {
Object.defineProperty(this, "curBrowser", {
get() { return curBrowserFn(); }
});
this.win_ = winRef;
};
modal.Dialog = class {
constructor(curBrowserFn, winRef = undefined) {
this.curBrowserFn_ = curBrowserFn;
this.win_ = winRef;
}
/**
* Returns the ChromeWindow associated with an open dialog window if it
* is currently attached to the DOM.
*/
Object.defineProperty(modal.Dialog.prototype, "window", {
get() {
if (this.win_ !== null) {
get curBrowser_() { return this.curBrowserFn_(); }
/**
* Returns the ChromeWindow associated with an open dialog window if
* it is currently attached to the DOM.
*/
get window() {
if (this.win_) {
let win = this.win_.get();
if (win && win.parent) {
return win;
@ -102,14 +102,12 @@ Object.defineProperty(modal.Dialog.prototype, "window", {
}
return null;
}
});
Object.defineProperty(modal.Dialog.prototype, "ui", {
get() {
get ui() {
let win = this.window;
if (win) {
return win.Dialog.ui;
}
return this.curBrowser.getTabModalUI();
return this.curBrowser_.getTabModalUI();
}
});
};