[Pkg-mozext-commits] [tabmixplus] 12/20: Follow up bug 1409784 - Remove mStringBundle from tabbrowser binding and expose gTabBrowserBundle instead
David Prévot
taffit at moszumanska.debian.org
Thu Nov 16 18:58:53 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 53d3064a29d3f09b6cfb81a18ed8566cf5da47ea
Author: onemen <tabmix.onemen at gmail.com>
Date: Fri Oct 20 20:46:49 2017 +0300
Follow up bug 1409784 - Remove mStringBundle from tabbrowser binding and expose gTabBrowserBundle instead
---
chrome/content/click/click.js | 2 +-
chrome/content/minit/tablib.js | 34 ++++++++++++++++++++++++----------
chrome/content/session/session.js | 2 +-
chrome/content/session/sessionStore.js | 4 ++--
chrome/content/tabmix.js | 2 +-
modules/RenameTab.jsm | 2 +-
6 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index 521b240..61c1830 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -522,7 +522,7 @@ var TabmixContext = {
let browser = gBrowser.getBrowserForTab(aTab);
let url = browser.currentURI.spec;
let docTitle = TMP_Places.getTitleFromBookmark(url, browser.contentTitle, null, aTab);
- if (!docTitle || docTitle == gBrowser.mStringBundle.getString("tabs.emptyTabTitle"))
+ if (!docTitle || docTitle == Tabmix.getString("tabs.emptyTabTitle"))
titleNotReady = true;
}
Tabmix.setItem("tm-renameTab", "disabled", titleNotReady);
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index ab0f28f..3f78a6e 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1708,16 +1708,16 @@ Tabmix.tablib = {
// default to true: if it were false, we wouldn't get this far
var warnOnClose = {value: true};
- var bundle = this.mStringBundle;
var message, chkBoxLabel;
if (shouldPrompt == 1 || numProtected === 0) {
- if (Tabmix.isVersion(290))
- message = PluralForm.get(tabsToClose, bundle.getString("tabs.closeWarningMultiple"))
+ if (Tabmix.isVersion(290)) {
+ message = PluralForm.get(tabsToClose, Tabmix.getString("tabs.closeWarningMultiple"))
.replace("#1", tabsToClose);
- else
- message = bundle.getFormattedString("tabs.closeWarningMultipleTabs", [tabsToClose]);
- chkBoxLabel = shouldPrompt == 1 ? bundle.getString("tabs.closeWarningPromptMe") :
+ } else {
+ message = Tabmix.getFormattedString("tabs.closeWarningMultipleTabs", [tabsToClose]);
+ }
+ chkBoxLabel = shouldPrompt == 1 ? Tabmix.getString("tabs.closeWarningPromptMe") :
TabmixSvc.getString("window.closeWarning.2");
} else {
let messageKey = "protectedtabs.closeWarning.";
@@ -1727,13 +1727,13 @@ Tabmix.tablib = {
chkBoxLabel = TabmixSvc.getString(chkBoxKey);
}
- var buttonLabel = shouldPrompt == 1 ? bundle.getString("tabs.closeButtonMultiple") :
+ var buttonLabel = shouldPrompt == 1 ? Tabmix.getString("tabs.closeButtonMultiple") :
TabmixSvc.getString("closeWindow.label");
window.focus();
var promptService = Services.prompt;
var buttonPressed = promptService.confirmEx(window,
- bundle.getString("tabs.closeWarningTitle"),
+ Tabmix.getString("tabs.closeWarningTitle"),
message,
(promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0) +
(promptService.BUTTON_TITLE_CANCEL * promptService.BUTTON_POS_1),
@@ -1823,10 +1823,10 @@ Tabmix.tablib = {
get labels() {
delete this.labels;
this.labels = [
- gBrowser.mStringBundle.getString("tabs.emptyTabTitle"),
+ Tabmix.getString("tabs.emptyTabTitle"),
];
if (!Tabmix.isVersion(550)) {
- this.labels.push(gBrowser.mStringBundle.getString("tabs.connecting"));
+ this.labels.push(Tabmix.getString("tabs.connecting"));
}
return this.labels;
},
@@ -2038,6 +2038,20 @@ Tabmix.tablib = {
}; // end Tabmix.tablib
+// Firefox 58 - Bug 1409784 - Remove mStringBundle from tabbrowser binding
+// and expose gTabBrowserBundle instead
+XPCOMUtils.defineLazyGetter(Tabmix, "getString", () => {
+ return typeof gTabBrowserBundle == "object" ?
+ gTabBrowserBundle.GetStringFromName.bind(gTabBrowserBundle) :
+ gBrowser.mStringBundle.getString.bind(gBrowser.mStringBundle);
+});
+
+XPCOMUtils.defineLazyGetter(Tabmix, "getFormattedString", () => {
+ return typeof gTabBrowserBundle == "object" ?
+ gTabBrowserBundle.formatStringFromName.bind(gTabBrowserBundle) :
+ gBrowser.mStringBundle.getFormattedString.bind(gBrowser.mStringBundle);
+});
+
Tabmix.isNewTabUrls = function Tabmix_isNewTabUrls(aUrl) {
return this.newTabUrls.indexOf(aUrl) > -1;
};
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index 5b47837..5e5a5bb 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -2721,7 +2721,7 @@ TabmixSessionManager = {
var label = _tab.label;
if (!Tabmix.isVersion(550)) {
// replace "Loading..." with the document title (with minimal side-effects)
- let tabLoadingTitle = gBrowser.mStringBundle.getString("tabs.connecting");
+ let tabLoadingTitle = Tabmix.getString("tabs.connecting");
if (label == tabLoadingTitle) {
gBrowser.setTabTitle(_tab);
[label, _tab.label] = [_tab.label, label];
diff --git a/chrome/content/session/sessionStore.js b/chrome/content/session/sessionStore.js
index 820ce62..62486f9 100644
--- a/chrome/content/session/sessionStore.js
+++ b/chrome/content/session/sessionStore.js
@@ -23,7 +23,7 @@ var TMP_SessionStore = {
else {
aUndoItem.title = TMP_Places.getTitleFromBookmark(tabData.url, aUndoItem.title || tabData.title || tabData.url);
if (aUndoItem.title == TabmixSvc.aboutBlank)
- aUndoItem.title = gBrowser.mStringBundle.getString("tabs.emptyTabTitle");
+ aUndoItem.title = Tabmix.getString("tabs.emptyTabTitle");
}
},
@@ -39,7 +39,7 @@ var TMP_SessionStore = {
let tabData = TabmixSvc.JSON.parse(TabmixSvc.ss.getTabState(aTab));
let data = this.getActiveEntryData(tabData);
if (data.url == TabmixSvc.aboutBlank) {
- return gBrowser.mStringBundle.getString("tabs.emptyTabTitle");
+ return Tabmix.getString("tabs.emptyTabTitle");
}
return data.title || null;
},
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index e916a04..11d5765 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -817,7 +817,7 @@ var TMP_eventListener = {
if (aTab.__SS_lazyData) {
this.onSSTabRestoring(aTab);
if (aTab.label == "about:blank") {
- aTab.label = gBrowser.mStringBundle.getString("tabs.emptyTabTitle");
+ aTab.label = Tabmix.getString("tabs.emptyTabTitle");
gBrowser._tabAttrModified(aTab, ["label"]);
}
}
diff --git a/modules/RenameTab.jsm b/modules/RenameTab.jsm
index a2836a4..72e3506 100644
--- a/modules/RenameTab.jsm
+++ b/modules/RenameTab.jsm
@@ -35,7 +35,7 @@ this.RenameTab = {
docTitle, null, aTab);
if (!this.data.docTitle)
this.data.docTitle = this.window.isBlankPageURL(this.data.url) ?
- gBrowser.mStringBundle.getString("tabs.emptyTabTitle") : this.data.url;
+ this.window.Tabmix.getString("tabs.emptyTabTitle") : this.data.url;
this.data.modified = aTab.getAttribute("label-uri") || null;
if (this.data.modified == this.data.url || this.data.modified == "*")
this.data.value = aTab.getAttribute("fixed-label");
--
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