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 580870 - Alias gBrowser to the tabcandy context to remove getCurrentWindow

Browse Source 
Add aliases for gWindow, gBrowser, gTabDeck, gTabFrame for the tabcandy chrome context. Update uses and simplify some code like removing Navbar.
This commit is contained in:
Edward Lee 2010-07-22 12:34:13 -07:00
parent 4d059c1a7b
commit b3a2d799b2
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
browser/base/content/tabview/modules/utils.jsm
View File

@ -46,6 +46,29 @@ const Ci = Components.interfaces;
const Cu = Components.utils;
const Cr = Components.results;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyGetter(this, "gWindow", function() {
let windows = Services.wm.getEnumerator("navigator:browser");
while (windows.hasMoreElements()) {
let browser = windows.getNext();
let tabCandyFrame = browser.document.getElementById("tab-candy");
if (tabCandyFrame.contentWindow == window)
return browser;
}
});
XPCOMUtils.defineLazyGetter(this, "gBrowser", function() gWindow.gBrowser);
XPCOMUtils.defineLazyGetter(this, "gTabDeck", function() {
return gWindow.document.getElementById("tab-candy-deck");
});
XPCOMUtils.defineLazyGetter(this, "gTabFrame", function() {
return gWindow.document.getElementById("tab-candy");
});
var consoleService = Cc["@mozilla.org/consoleservice;1"]
.getService(Components.interfaces.nsIConsoleService);
@ -507,10 +530,9 @@ var Utils = {
// The <Tabs> tab that represents the active tab in the active window.
get activeTab(){
try {
var tabBrowser = this.getCurrentWindow().gBrowser;
Utils.assert('tabBrowser', tabBrowser);
Utils.assert('tabBrowser', gBrowser);
var rawTab = tabBrowser.selectedTab;
var rawTab = gBrowser.selectedTab;
for ( var i=0; i<Tabs.length; i++){
if (Tabs[i].raw == rawTab)
return Tabs[i];
@ -522,26 +544,6 @@ var Utils = {
return null;
},
// ----------
// Function: getCurrentWindow
// Returns the nsIDOMWindowInternal for the currently active window,
// i.e. the window belonging to the active page's DOM "window" object.
getCurrentWindow: function() {
var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
.getService(Ci.nsIWindowMediator);
var browserEnumerator = wm.getEnumerator("navigator:browser");
while (browserEnumerator.hasMoreElements()) {
var browserWin = browserEnumerator.getNext();
var tabbrowser = browserWin.gBrowser;
var tabCandyContainer = browserWin.document.getElementById("tab-candy");
if (tabCandyContainer && tabCandyContainer.contentWindow == window) {
return browserWin;
}
}
return null;
},
// ___ Logging
// ----------