[Pkg-mozext-commits] [tabmixplus] 127/147: Move tablib into Tabmix object
David Prévot
taffit at moszumanska.debian.org
Sat Aug 5 15:27:44 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 c503c4cf55f02dbaccd83bea0cc19fe2bf28aa94
Author: onemen <tabmix.onemen at gmail.com>
Date: Tue Apr 11 17:37:12 2017 +0300
Move tablib into Tabmix object
---
chrome/content/click/click.js | 4 +-
chrome/content/extensions/extensions.js | 6 +--
chrome/content/minit/tablib.js | 63 ++++++++++++++++---------------
chrome/content/overlay/tabContextMenu.xul | 2 +-
chrome/content/session/session.js | 6 +--
chrome/content/tab/tab.js | 4 +-
chrome/content/tabmix.js | 4 +-
chrome/content/tabmix.xul | 2 +-
modules/SingleWindowModeUtils.jsm | 2 +-
modules/Utils.jsm | 2 +-
10 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index d9ce1f8..d4286cc 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -170,7 +170,7 @@ var TabmixTabClickOptions = {
gBrowser.lockTab(aTab);
break;
case 7 :
- tablib.reloadTabs(gBrowser.visibleTabs);
+ Tabmix.tablib.reloadTabs(gBrowser.visibleTabs);
break;
case 8:
gBrowser.removeAllTabsBut(aTab);
@@ -658,7 +658,7 @@ var TabmixContext = {
onLink && (Tabmix.prefs.getBoolPref("openLinkHere") ||
Tabmix.prefs.getBoolPref("openInverseLink") ||
Tabmix.prefs.getBoolPref("linkWithHistory"))) {
- gContextMenu.tabmixLinkURL = tablib.getValidUrl();
+ gContextMenu.tabmixLinkURL = Tabmix.tablib.getValidUrl();
}
var freezeTabMenu = document.getElementById("tm-content-freezeTab");
diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index 96a2a15..4fa96a0 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -586,9 +586,9 @@ TMP_extensionsCompatibility.treeStyleTab = {
preInit() {
let tstHelper = TreeStyleTabWindowHelper;
if (typeof tstHelper.overrideExtensionsPreInit == "function") {
- // overrideExtensionsPreInit look for 'gBrowser.restoreTab' in tablib.init
- tablib._init = tablib.init;
- tablib.init = function() {
+ // overrideExtensionsPreInit look for 'gBrowser.restoreTab' in Tabmix.tablib.init
+ Tabmix.tablib._init = Tabmix.tablib.init;
+ Tabmix.tablib.init = function() {
this._init();
/*
var newTab = null
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index d94f8be..2d30f54 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1,10 +1,11 @@
"use strict";
-if (!window.tablib || window.tablib.version != "tabmixplus")
-var tablib = { // eslint-disable-line
+Tabmix.backwardCompatibilityGetter(window, "tablib", "Tabmix.tablib");
+
+Tabmix.tablib = {
version: "tabmixplus",
_inited: false,
- init: function TMP_tablib_init() {
+ init: function tabmix_tablib_init() {
if (this._inited)
return;
this._inited = true;
@@ -15,7 +16,7 @@ var tablib = { // eslint-disable-line
},
_loadURIWithFlagsInitialized: false,
- setLoadURIWithFlags: function tablib_setLoadURIWithFlags(aBrowser) {
+ setLoadURIWithFlags: function tabmix_tablib_setLoadURIWithFlags(aBrowser) {
// set init value according to lockallTabs state
// we update this value in TabmixProgressListener.listener.onStateChange
aBrowser.tabmix_allowLoad = !TabmixTabbar.lockallTabs;
@@ -41,7 +42,7 @@ var tablib = { // eslint-disable-line
}
// if we redirected the load request to a new tab return it
- const tabmixResult = tablib._loadURIWithFlags.apply(null, arg0.concat(args));
+ const tabmixResult = Tabmix.tablib._loadURIWithFlags.apply(null, arg0.concat(args));
if (tabmixResult) {
return tabmixResult;
}
@@ -55,7 +56,7 @@ var tablib = { // eslint-disable-line
},
_loadURIWithFlags(browser, uri, params) {
- if (tablib.allowLoad(browser, uri)) {
+ if (Tabmix.tablib.allowLoad(browser, uri)) {
return null;
}
// redirect load request to a new tab
@@ -267,7 +268,7 @@ var tablib = { // eslint-disable-line
Tabmix.changeCode(gBrowser, "gBrowser._endRemoveTab")._replace(
'this._blurTab(aTab);',
- 'tablib.onRemoveTab(aTab); \
+ 'Tabmix.tablib.onRemoveTab(aTab); \
if (Services.prefs.getBoolPref("browser.tabs.animate")) { \
TMP_eventListener.onTabClose_updateTabBar(aTab);\
} \
@@ -330,7 +331,7 @@ var tablib = { // eslint-disable-line
Tabmix.changeCode(obj, "gBrowser." + fnName)._replace(
'var title = browser.contentTitle;',
'$&\
- var urlTitle, title = tablib.getTabTitle(aTab, browser.currentURI.spec, title);'
+ var urlTitle, title = Tabmix.tablib.getTabTitle(aTab, browser.currentURI.spec, title);'
)._replace(
'title = textToSubURI.unEscapeNonAsciiURI(characterSet, title);',
'$&\
@@ -343,14 +344,14 @@ var tablib = { // eslint-disable-line
if (aTab.hasAttribute("tabmix_changed_label")) {\
aTab.removeAttribute("tabmix_changed_label");\
if (noChange)\
- tablib.onTabTitleChanged(aTab, browser, title == urlTitle);\
+ Tabmix.tablib.onTabTitleChanged(aTab, browser, title == urlTitle);\
}\
else if (noChange)\
TMP_Places.currentTab = null;\
$&'
)._replace(
'this._tabAttrModified',
- `tablib.onTabTitleChanged(aTab, browser, title == urlTitle);
+ `Tabmix.tablib.onTabTitleChanged(aTab, browser, title == urlTitle);
$&`
).toCode();
@@ -570,10 +571,10 @@ var tablib = { // eslint-disable-line
Tabmix.changeCode(window, "handleDroppedLink")._replace(
'loadURI(uri, null, postData.value, false);',
- 'tablib.contentAreaOnDrop(event, url, postData.value);', {check: TabmixSvc.isPaleMoon}
+ 'Tabmix.tablib.contentAreaOnDrop(event, url, postData.value);', {check: TabmixSvc.isPaleMoon}
)._replace(
'loadURI(data.url, null, data.postData, false);',
- 'tablib.contentAreaOnDrop(event, data.url, data.postData);',
+ 'Tabmix.tablib.contentAreaOnDrop(event, data.url, data.postData);',
{check: !Tabmix.isVersion(520) && !TabmixSvc.isPaleMoon}
)._replace(
'let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;',
@@ -582,7 +583,7 @@ var tablib = { // eslint-disable-line
{check: Tabmix.isVersion(520) && !TabmixSvc.isPaleMoon}
)._replace(
'replace: true',
- 'replace: (tabmixContentDrop || tablib.whereToOpenDrop(event, urls[0])) != "tab"',
+ 'replace: (tabmixContentDrop || Tabmix.tablib.whereToOpenDrop(event, urls[0])) != "tab"',
{check: Tabmix.isVersion(520) && !TabmixSvc.isPaleMoon}
).toCode();
// update current browser
@@ -628,10 +629,10 @@ var tablib = { // eslint-disable-line
Tabmix.changeCode(window, "BrowserCloseTabOrWindow")._replace(
'closeWindow(true);', // Mac
- 'tablib.closeLastTab();', {check: TabmixSvc.isMac, flags: "g"}
+ 'Tabmix.tablib.closeLastTab();', {check: TabmixSvc.isMac, flags: "g"}
)._replace(
'gBrowser.removeCurrentTab({animate: true})',
- 'tablib.closeLastTab();'
+ 'Tabmix.tablib.closeLastTab();'
).toCode();
// hide open link in window in single window mode
@@ -688,7 +689,7 @@ var tablib = { // eslint-disable-line
$&'
)._replace(
'win.BrowserOpenTab()',
- 'if (currentIsBlank) tablib.setURLBarFocus(); \
+ 'if (currentIsBlank) Tabmix.tablib.setURLBarFocus(); \
else $&'
)._replace(
'"browser.tabs.loadDivertedInBackground"',
@@ -806,10 +807,10 @@ var tablib = { // eslint-disable-line
Tabmix.changeCode(window, "warnAboutClosingWindow")._replace(
'gBrowser.warnAboutClosingTabs(gBrowser.closingTabsEnum.ALL)',
- 'tablib.closeWindow(true)', {flags: "g"}
+ 'Tabmix.tablib.closeWindow(true)', {flags: "g"}
)._replace(
'os.notifyObservers(null, "browser-lastwindow-close-granted", null);',
- 'if (!TabmixSvc.isMac && !tablib.closeWindow(true)) return false;\
+ 'if (!TabmixSvc.isMac && !Tabmix.tablib.closeWindow(true)) return false;\
$&'
).toCode();
@@ -820,7 +821,7 @@ var tablib = { // eslint-disable-line
'if (!closeWindow(false, warnAboutClosingWindow))',
'var reallyClose = closeWindow(false, warnAboutClosingWindow);\
if (reallyClose && !Tabmix._warnedBeforeClosing)\
- reallyClose = tablib.closeWindow();\
+ reallyClose = Tabmix.tablib.closeWindow();\
if (!reallyClose)'
).toCode();
@@ -885,7 +886,7 @@ var tablib = { // eslint-disable-line
' document.getElementById(arguments[0]);'
)._replace(
/(})(\)?)$/,
- ' tablib.populateUndoWindowSubmenu(undoPopup);\n' +
+ ' Tabmix.tablib.populateUndoWindowSubmenu(undoPopup);\n' +
'$1$2'
).toCode();
@@ -1104,7 +1105,7 @@ var tablib = { // eslint-disable-line
};
gBrowser.openLinkWithHistory = function() {
- var url = tablib.getValidUrl();
+ var url = Tabmix.tablib.getValidUrl();
if (!url)
return;
@@ -1124,7 +1125,7 @@ var tablib = { // eslint-disable-line
};
gBrowser.openInverseLink = function(event) {
- var url = tablib.getValidUrl();
+ var url = Tabmix.tablib.getValidUrl();
if (!url)
return;
@@ -1134,8 +1135,8 @@ var tablib = { // eslint-disable-line
Tabmix.originalFunctions.openInverseLink.call(gContextMenu, event);
};
- tablib.openLinkInCurrent = function() {
- var url = tablib.getValidUrl();
+ Tabmix.tablib.openLinkInCurrent = function() {
+ var url = Tabmix.tablib.getValidUrl();
if (!url)
return;
@@ -1144,7 +1145,7 @@ var tablib = { // eslint-disable-line
gContextMenu.openLinkInCurrent();
};
- tablib.getValidUrl = function() {
+ Tabmix.tablib.getValidUrl = function() {
if (!gContextMenu) {
return null;
}
@@ -1307,7 +1308,7 @@ var tablib = { // eslint-disable-line
if (aTab._tPos > this.mCurrentTab._tPos)
this.selectedTab = aTab;
let tabPos = childNodes.indexOf(aTab);
- tablib.reloadTabs(childNodes.slice(0, tabPos).reverse());
+ Tabmix.tablib.reloadTabs(childNodes.slice(0, tabPos).reverse());
};
gBrowser.reloadRightTabs = function(aTab) {
@@ -1317,7 +1318,7 @@ var tablib = { // eslint-disable-line
if (aTab._tPos < this.mCurrentTab._tPos)
this.selectedTab = aTab;
let tabPos = childNodes.indexOf(aTab);
- tablib.reloadTabs(childNodes.slice(tabPos + 1));
+ Tabmix.tablib.reloadTabs(childNodes.slice(tabPos + 1));
};
gBrowser.reloadAllTabsBut = function(aTab) {
@@ -1325,7 +1326,7 @@ var tablib = { // eslint-disable-line
aTab = this.mCurrentTab;
else
this.selectedTab = aTab;
- tablib.reloadTabs(this.visibleTabs, aTab);
+ Tabmix.tablib.reloadTabs(this.visibleTabs, aTab);
};
gBrowser.lockTab = function(aTab) {
@@ -1523,7 +1524,7 @@ var tablib = { // eslint-disable-line
{value: {ALL: 0, OTHER: 1, TO_END: 2, ALL_ONEXIT: 3, TO_START: 4, GROUP: 5}, writable: false});
let warnAboutClosingTabs = function(whatToClose, aTab, aDomain) {
- // see tablib.closeWindow comment
+ // see Tabmix.tablib.closeWindow comment
if (Tabmix.callerTrace("BG__onQuitRequest")) {
return true;
}
@@ -1705,7 +1706,7 @@ var tablib = { // eslint-disable-line
aTab.owner = this.selectedTab;
this.selectedTab = aTab;
if (aUrl && Tabmix.isNewTabUrls(aUrl))
- tablib.setURLBarFocus();
+ Tabmix.tablib.setURLBarFocus();
}
};
@@ -1974,7 +1975,7 @@ var tablib = { // eslint-disable-line
}
}
-}; // end tablib
+}; // end Tabmix.tablib
Tabmix.isNewTabUrls = function Tabmix_isNewTabUrls(aUrl) {
return this.newTabUrls.indexOf(aUrl) > -1;
diff --git a/chrome/content/overlay/tabContextMenu.xul b/chrome/content/overlay/tabContextMenu.xul
index 81eb87e..f83fbc9 100644
--- a/chrome/content/overlay/tabContextMenu.xul
+++ b/chrome/content/overlay/tabContextMenu.xul
@@ -53,7 +53,7 @@
<!--
replace "context_reloadAllTabs" oncommand
-->
- <menuitem id="context_reloadAllTabs" oncommand="tablib.reloadTabs(gBrowser.visibleTabs);" />
+ <menuitem id="context_reloadAllTabs" oncommand="Tabmix.tablib.reloadTabs(gBrowser.visibleTabs);" />
<menuitem id="tm-reloadOther" insertafter="context_reloadAllTabs"
label="&reloadother.label;" accesskey="&reloadother.accesskey;"
oncommand="gBrowser.reloadAllTabsBut(TabContextMenu.contextTab);" />
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 7eeb1e9..b83c378 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -310,10 +310,10 @@ TabmixSessionManager = {
XPCOMUtils.defineLazyModuleGetter(this, "TabmixGroupsMigrator",
"resource://tabmixplus/TabGroupsMigrator.jsm");
- // just in case tablib isn't init yet
+ // just in case Tabmix.tablib isn't init yet
// when Webmail Notifier extension installed and user have master password
// we can get here before the browser window is loaded
- tablib.init();
+ Tabmix.tablib.init();
var _afterTabduplicated = "_afterTabduplicated" in Tabmix && Tabmix._afterTabduplicated;
var isFirstWindow = (Tabmix.isFirstWindow || this.firstNonPrivateWindow) && !_afterTabduplicated;
@@ -484,7 +484,7 @@ TabmixSessionManager = {
focusAndSelectUrlBar();
},
- // calls from: tablib.closeWindow, this.onWindowClose and this.canQuitApplication
+ // calls from: Tabmix.tablib.closeWindow, this.onWindowClose and this.canQuitApplication
deinit: function SM_deinit(aLastWindow, askBeforeSave, aPopUp) {
// When Exit Firefox:
// pref "extensions.tabmix.sessions.onClose"
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index c652f46..74ab81b 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -681,7 +681,7 @@ Tabmix.tabsUtils = {
tab.tabmix_allowLoad = false;
}
if ("linkedBrowser" in tab)
- tablib.setLoadURIWithFlags(tab.linkedBrowser);
+ Tabmix.tablib.setLoadURIWithFlags(tab.linkedBrowser);
Tabmix.initialization.run("beforeStartup", tabbrowser, this.tabBar);
},
@@ -2803,7 +2803,7 @@ TabmixProgressListener = {
TabmixSessionManager.tabLoaded(tab);
// we need to remove width from tabs with url label from here
if (tab.hasAttribute("width")) {
- tablib.onTabTitleChanged(tab, aBrowser);
+ Tabmix.tablib.onTabTitleChanged(tab, aBrowser);
}
}
}
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 8ef18e5..4296488 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -429,7 +429,7 @@ var TMP_eventListener = {
Tabmix.assert(ex);
}
try {
- tablib.init();
+ Tabmix.tablib.init();
} catch (ex) {
Tabmix.assert(ex);
}
@@ -776,7 +776,7 @@ var TMP_eventListener = {
this.setTabAttribute(tab);
TMP_LastTab.tabs = null;
TMP_LastTab.attachTab(tab);
- tablib.setLoadURIWithFlags(tab.linkedBrowser);
+ Tabmix.tablib.setLoadURIWithFlags(tab.linkedBrowser);
if (TabmixTabbar.lockallTabs) {
tab.setAttribute("locked", "true");
tab.tabmix_allowLoad = false;
diff --git a/chrome/content/tabmix.xul b/chrome/content/tabmix.xul
index 78f177a..c5ae857 100644
--- a/chrome/content/tabmix.xul
+++ b/chrome/content/tabmix.xul
@@ -108,7 +108,7 @@
<popup id="contentAreaContextMenu">
<menuitem id="context-openlinkincurrent" label="&linkhere.label;" accesskey="&linkhere.accesskey;"
- oncommand="tablib.openLinkInCurrent();"/>
+ oncommand="Tabmix.tablib.openLinkInCurrent();"/>
<menuitem id="tm-openinverselink" label="" fglabel="&linkForegroundTab.label;" bglabel="&linkBackgroundTab.label;"
fgaccesskey="&linkForegroundTab.accesskey;" bgaccesskey="&linkBackgroundTab.accesskey;"
insertafter="context-openlinkintab"
diff --git a/modules/SingleWindowModeUtils.jsm b/modules/SingleWindowModeUtils.jsm
index b8b044c..e225b4c 100644
--- a/modules/SingleWindowModeUtils.jsm
+++ b/modules/SingleWindowModeUtils.jsm
@@ -118,7 +118,7 @@ this.SingleWindowModeUtils = {
}
var existingBrowser = existingWindow.gBrowser;
- existingWindow.tablib.init(); // just in case tablib isn't init yet
+ existingWindow.Tabmix.tablib.init(); // just in case Tabmix.tablib isn't init yet
var uriToLoad = args[0];
var urls = [];
diff --git a/modules/Utils.jsm b/modules/Utils.jsm
index 719cd16..46e89bb 100644
--- a/modules/Utils.jsm
+++ b/modules/Utils.jsm
@@ -83,7 +83,7 @@ this.TabmixUtils = {
const {json, links, name} = message.data;
const url = links[0].url;
win = browser.ownerGlobal;
- const where = win.tablib.whereToOpenDrop(json, url);
+ const where = win.Tabmix.tablib.whereToOpenDrop(json, url);
if (where == "tab") {
if (TabmixSvc.version(520)) {
links[0].tabmixContentDrop = "tab";
--
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