[Pkg-mozext-commits] [tabmixplus] 104/147: Follow up bug 1334156 - Replace ownerDocument.defaultView with ownerGlobal
David Prévot
taffit at moszumanska.debian.org
Sat Aug 5 15:27:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 33c553a390a289b722c6db4fb8d57dcff52ebb71
Author: onemen <tabmix.onemen at gmail.com>
Date: Mon Jan 30 16:02:12 2017 +0200
Follow up bug 1334156 - Replace ownerDocument.defaultView with ownerGlobal
---
chrome/content/minit/minit.js | 2 +-
chrome/content/minit/tablib.js | 4 ++--
chrome/content/places/places.js | 2 +-
chrome/content/tab/tab.js | 2 +-
modules/AutoReload.jsm | 18 +++++++++---------
modules/ContentClick.jsm | 8 ++++----
modules/DocShellCapabilities.jsm | 2 +-
modules/DownloadLastDir.jsm | 2 +-
modules/MergeWindows.jsm | 4 ++--
modules/Places.jsm | 2 +-
modules/RenameTab.jsm | 2 +-
modules/Shortcuts.jsm | 2 +-
modules/TabRestoreQueue.jsm | 2 +-
modules/TabmixSvc.jsm | 2 +-
modules/Utils.jsm | 8 ++++----
15 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index cf53333..8afb852 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -792,7 +792,7 @@ var TMP_tabDNDObserver = {
if (aSourceNode && aSourceNode instanceof XULElement && aSourceNode.localName == "tab") {
if (aSourceNode.parentNode == gBrowser.tabContainer)
return this.DRAG_TAB_IN_SAME_WINDOW; // 2
- if (aSourceNode.ownerDocument.defaultView instanceof ChromeWindow &&
+ if (aSourceNode.ownerGlobal instanceof ChromeWindow &&
aSourceNode.ownerDocument.documentElement.getAttribute("windowtype") == "navigator:browser")
return this.DRAG_TAB_TO_NEW_WINDOW; // 1
}
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 7dbaba4..f3fbf98 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -967,7 +967,7 @@ var tablib = { // eslint-disable-line
aTab = this.mCurrentTab;
var newTab = null;
- let copyToNewWindow = window != aTab.ownerDocument.defaultView;
+ let copyToNewWindow = window != aTab.ownerGlobal;
let openDuplicateNext = !disallowSelect && !copyToNewWindow && Tabmix.prefs.getBoolPref("openDuplicateNext");
TMP_extensionsCompatibility.treeStyleTab.openNewTabNext(aTab, openDuplicateNext);
@@ -1713,7 +1713,7 @@ var tablib = { // eslint-disable-line
// Do not allow transferring a private tab to a non-private window
// and vice versa.
if (PrivateBrowsingUtils.isWindowPrivate(window) !=
- PrivateBrowsingUtils.isWindowPrivate(aOtherTab.ownerDocument.defaultView)) {
+ PrivateBrowsingUtils.isWindowPrivate(aOtherTab.ownerGlobal)) {
return;
}
diff --git a/chrome/content/places/places.js b/chrome/content/places/places.js
index f7f9af9..a9740f1 100644
--- a/chrome/content/places/places.js
+++ b/chrome/content/places/places.js
@@ -892,6 +892,6 @@ Tabmix.onContentLoaded = {
/** DEPRECATED **/
TMP_Places.getTabFixedTitle = function(aBrowser, aUri) {
- let win = aBrowser.ownerDocument.defaultView;
+ let win = aBrowser.ownerGlobal;
return win.TMP_Places.getTabTitle(win.gBrowser.getTabForBrowser(aBrowser), aUri.spec);
};
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 43664ae..cff8b58 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -2763,7 +2763,7 @@ TabmixProgressListener = {
this.mTabBrowser.hideTab(tab);
TabmixTabbar.updateScrollStatus();
// let to unknownContentType dialog or nsIFilePicker time to open
- tab._tabmix_downloadingTimeout = tab.ownerDocument.defaultView.setTimeout(() => {
+ tab._tabmix_downloadingTimeout = tab.ownerGlobal.setTimeout(() => {
tab._tabmix_downloadingTimeout = null;
if (this && this.mTabBrowser && tab && tab.parentNode)
this.mTabBrowser.removeTab(tab, {animate: false});
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index d1b8ec2..49f6720 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -26,7 +26,7 @@ this.AutoReload = {
* Popup command
*/
addClonePopup(aPopup, aTab) {
- var win = aTab.ownerDocument.defaultView;
+ var win = aTab.ownerGlobal;
let popup = win.document.getElementById("autoreload_popup");
let parent = aPopup.parentNode;
win.Tabmix.setItem(aPopup, "onpopuphidden", "this._tab = null;");
@@ -103,7 +103,7 @@ this.AutoReload = {
return newList;
}
- let doc = aPopup.ownerDocument.defaultView.document;
+ let doc = aPopup.ownerGlobal.document;
getList().sort((a, b) => parseInt(a) > parseInt(b)).forEach(val => {
let mi = doc.createElement("menuitem");
this.setLabel(mi, val);
@@ -139,7 +139,7 @@ this.AutoReload = {
if (aTab.localName != "tab")
aTab = this._currentTab(aTab);
let result = {ok: false};
- var win = aTab.ownerDocument.defaultView;
+ var win = aTab.ownerGlobal;
win.openDialog('chrome://tabmixplus/content/overlay/autoReload.xul', '_blank', 'chrome,modal,centerscreen', result);
if (result.ok) {
aTab.autoReloadTime = TabmixSvc.prefBranch.getIntPref("reload_time");
@@ -188,7 +188,7 @@ this.AutoReload = {
aTab.autoReloadEnabled = true;
_setItem(aTab, "_reload", true);
aTab.autoReloadURI = url;
- var win = aTab.ownerDocument.defaultView;
+ var win = aTab.ownerGlobal;
_clearTimeout(aTab, win);
aTab.autoReloadTimerID = win.setTimeout(_reloadTab, aTab.autoReloadTime * 1000, aTab);
this._update(aTab, aTab.autoReloadURI + " " + aTab.autoReloadTime);
@@ -205,7 +205,7 @@ this.AutoReload = {
_update(aTab, aValue) {
_setItem(aTab, "reload-data", aValue);
- let win = aTab.ownerDocument.defaultView;
+ let win = aTab.ownerGlobal;
TabmixSvc.saveTabAttributes(aTab, "reload-data");
win.TabmixSessionManager.updateTabProp(aTab);
},
@@ -226,7 +226,7 @@ this.AutoReload = {
* for pending tabs
*/
onTabReloaded(aTab, aBrowser) {
- var win = aTab.ownerDocument.defaultView;
+ var win = aTab.ownerGlobal;
if (aTab.autoReloadTimerID)
_clearTimeout(aTab, win);
@@ -271,7 +271,7 @@ this.AutoReload = {
},
reloadRemoteTab(browser, data) {
- var window = browser.ownerDocument.defaultView;
+ var window = browser.ownerGlobal;
let tab = window.gBrowser.getTabForBrowser(browser);
// RemoteWebNavigation accepting postdata or headers only from Firefox 42.
if (data.isPostData && !this.confirm(window, tab, !TabmixSvc.version(420)))
@@ -297,7 +297,7 @@ function _reloadTab(aTab) {
}
var data = {};
- var window = aTab.ownerDocument.defaultView;
+ var window = aTab.ownerGlobal;
try {
let sh = browser.webNavigation.sessionHistory;
@@ -365,7 +365,7 @@ function _observe(aSubject, aTopic) {
function _clearTimeout(aTab, aWindow) {
if (aTab.autoReloadTimerID) {
if (!aWindow)
- aWindow = aTab.ownerDocument.defaultView;
+ aWindow = aTab.ownerGlobal;
aWindow.clearTimeout(aTab.autoReloadTimerID);
}
}
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index b1ce2c2..69f0ff1 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -119,7 +119,7 @@ ContentClickInternal = {
return;
}
- let window = browser.ownerDocument.defaultView;
+ let window = browser.ownerGlobal;
var where = window.whereToOpenLink(json);
if (where != "current") {
return;
@@ -191,7 +191,7 @@ ContentClickInternal = {
return false;
}
- let win = browser.ownerDocument.defaultView;
+ let win = browser.ownerGlobal;
win.openLinkIn(href, result.where, {
referrerURI: browser.documentURI,
referrerPolicy: event.referrerPolicy,
@@ -212,7 +212,7 @@ ContentClickInternal = {
_getParamsForLink(event, wrappedNode, href, browser, clean, wrappedOnClickNode) {
this._browser = browser;
- this._window = browser.ownerDocument.defaultView;
+ this._window = browser.ownerGlobal;
let [where, suppressTabsOnFileDownload] =
this.whereToOpen(event, href, wrappedNode, wrappedOnClickNode);
@@ -1044,7 +1044,7 @@ ContentClickInternal = {
deleteEpoch(this.epoch);
},
result(browser, data) {
- let window = browser.ownerDocument.defaultView;
+ let window = browser.ownerGlobal;
let tab = window.gBrowser.getTabForBrowser(browser);
if (data.result) {
this.stop();
diff --git a/modules/DocShellCapabilities.jsm b/modules/DocShellCapabilities.jsm
index acf21df..c00b6a0 100644
--- a/modules/DocShellCapabilities.jsm
+++ b/modules/DocShellCapabilities.jsm
@@ -34,7 +34,7 @@ this.DocShellCapabilities = {
return this.caps.filter(cap => !browser.docShell["allow" + cap]);
}
- let window = tab.ownerDocument.defaultView;
+ let window = tab.ownerGlobal;
if (window && window.__SSi) {
let tabState = TabState.collect(tab);
return tabState.disallow || "";
diff --git a/modules/DownloadLastDir.jsm b/modules/DownloadLastDir.jsm
index 1e93e65..b60b30a 100644
--- a/modules/DownloadLastDir.jsm
+++ b/modules/DownloadLastDir.jsm
@@ -28,7 +28,7 @@ this.TabmixDownloadLastDir = {
this._window.QueryInterface(Ci.nsIInterfaceRequestor);
} catch (ex) {
let win = Services.wm.getMostRecentWindow("navigator:browser");
- return win ? win.gBrowser.selectedTab.ownerDocument.defaultView : null;
+ return win ? win.gBrowser.selectedTab.ownerGlobal : null;
}
}
return this._window;
diff --git a/modules/MergeWindows.jsm b/modules/MergeWindows.jsm
index e693991..d3a7121 100644
--- a/modules/MergeWindows.jsm
+++ b/modules/MergeWindows.jsm
@@ -126,7 +126,7 @@ this.MergeWindows = {
if (!newTab) {
newTab = aTab.__tabmixNewTab;
delete aTab.__tabmixNewTab;
- tabbrowser = newTab.ownerDocument.defaultView.gBrowser;
+ tabbrowser = newTab.ownerGlobal.gBrowser;
}
let index = tabbrowser.tabs.length - 1;
if (openerWindow) {
@@ -162,7 +162,7 @@ this.MergeWindows = {
this.prefs.setBoolPref("openTabNextInverse", true);
for (let i = 0; i < tabs.length; i++) {
let tab = tabs[i];
- let isPopup = !tab.ownerDocument.defaultView.toolbar.visible;
+ let isPopup = !tab.ownerGlobal.toolbar.visible;
let params = {dontMove: isPopup};
if (TabmixSvc.version(470)) {
params = {eventDetail: {adoptedTab: tab}};
diff --git a/modules/Places.jsm b/modules/Places.jsm
index 75611b5..d53ff0a 100644
--- a/modules/Places.jsm
+++ b/modules/Places.jsm
@@ -258,7 +258,7 @@ PlacesUtilsInternal = {
// setItem check if aTab exist and remove the attribute if
// oID.value is null
if (aTab) {
- let win = aTab.ownerDocument.defaultView;
+ let win = aTab.ownerGlobal;
win.Tabmix.setItem(aTab, "tabmix_bookmarkId", oID.value);
}
diff --git a/modules/RenameTab.jsm b/modules/RenameTab.jsm
index 13646cc..4747853 100644
--- a/modules/RenameTab.jsm
+++ b/modules/RenameTab.jsm
@@ -22,7 +22,7 @@ this.RenameTab = {
if (this.panel && this.panel.state != "closed")
this.hidePopup();
- this.window = aTab.ownerDocument.defaultView;
+ this.window = aTab.ownerGlobal;
var gBrowser = this.window.gBrowser;
this.data.tab = aTab = aTab.localName == "tab" ? aTab : gBrowser.mCurrentTab;
diff --git a/modules/Shortcuts.jsm b/modules/Shortcuts.jsm
index 47e9cea..a3f031d 100644
--- a/modules/Shortcuts.jsm
+++ b/modules/Shortcuts.jsm
@@ -185,7 +185,7 @@ this.Shortcuts = {
onCommand: function TMP_SC_onCommand(aKey) {
try {
- let win = aKey.ownerDocument.defaultView;
+ let win = aKey.ownerGlobal;
let command = this.keys[aKey._id].command;
if (typeof command == "function") {
command.apply(win, [win.gBrowser.selectedTab]);
diff --git a/modules/TabRestoreQueue.jsm b/modules/TabRestoreQueue.jsm
index 4e8b178..0dc4fe3 100644
--- a/modules/TabRestoreQueue.jsm
+++ b/modules/TabRestoreQueue.jsm
@@ -17,7 +17,7 @@ let internal = {
}
const tab = tabToRestoreSoon || visible[0];
- const win = tab.ownerDocument.defaultView;
+ const win = tab.ownerGlobal;
const {restoringTabs, bookmarksOnDemand} = win.TMP_Places;
const index = restoringTabs.indexOf(tab);
if (index > -1) {
diff --git a/modules/TabmixSvc.jsm b/modules/TabmixSvc.jsm
index 8d5aeec..e7f3800 100644
--- a/modules/TabmixSvc.jsm
+++ b/modules/TabmixSvc.jsm
@@ -380,7 +380,7 @@ tabStateCache = {
// force Sessionstore to save our persisted tab attributes
if (save) {
- TabmixSvc.SessionStore.saveStateDelayed(tab.ownerDocument.defaultView);
+ TabmixSvc.SessionStore.saveStateDelayed(tab.ownerGlobal);
}
// After bug 1166757 - Remove browser.__SS_data, we have nothing more to do.
diff --git a/modules/Utils.jsm b/modules/Utils.jsm
index 23190bd..719cd16 100644
--- a/modules/Utils.jsm
+++ b/modules/Utils.jsm
@@ -63,7 +63,7 @@ this.TabmixUtils = {
DocShellCapabilities.update(browser, message.data);
break;
case "Tabmix:updateScrollPosition":
- win = browser.ownerDocument.defaultView;
+ win = browser.ownerGlobal;
tab = win.gBrowser.getTabForBrowser(browser);
win.TabmixSessionManager.updateScrollPosition(tab, message.data.scroll);
break;
@@ -75,14 +75,14 @@ this.TabmixUtils = {
break;
}
case "Tabmix:getOpener":
- win = browser.ownerDocument.defaultView;
+ win = browser.ownerGlobal;
tab = win.gBrowser.getTabForBrowser(browser);
MergeWindows.moveTabsFromPopups(null, tab, message.objects.opener);
break;
case "Tabmix:contentDrop": {
const {json, links, name} = message.data;
const url = links[0].url;
- win = browser.ownerDocument.defaultView;
+ win = browser.ownerGlobal;
const where = win.tablib.whereToOpenDrop(json, url);
if (where == "tab") {
if (TabmixSvc.version(520)) {
@@ -101,7 +101,7 @@ this.TabmixUtils = {
return false;
}
case "Tabmix:contextmenu": {
- win = browser.ownerDocument.defaultView;
+ win = browser.ownerGlobal;
let links = message.data.links;
win.Tabmix.contextMenuLinks = links && links.split("\n") || [];
break;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list