mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1052276 - Use Toast.jsm in place of NativeWindow.toast. r=margaret

This commit is contained in:
Wes Johnston 2014-08-14 13:53:44 -07:00
Родитель 89d12cd851
Коммит 0fd3ac2d22
7 изменённых файлов: 55 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
mobile/android/chrome/content/MasterPassword.js
Просмотреть файл

@ -3,6 +3,9 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
XPCOMUtils.defineLazyModuleGetter(this, "Toast",
"resource://gre/modules/Toast.jsm");
var MasterPassword = {
pref: "privacy.masterpassword.enabled",
_tokenName: "",
@ -61,7 +64,7 @@ var MasterPassword = {
} catch(e) {
dump("MasterPassword.removePassword: " + e + "\n");
}
NativeWindow.toast.show(Strings.browser.GetStringFromName("masterPassword.incorrect"), "short");
Toast.show(Strings.browser.GetStringFromName("masterPassword.incorrect"), Toast.SHORT);
return false;
}
};

5
mobile/android/chrome/content/SelectionHandler.js
Просмотреть файл

@ -4,6 +4,9 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
XPCOMUtils.defineLazyModuleGetter(this, "Toast",
"resource://gre/modules/Toast.jsm");
// Define elements that bound phone number containers.
const PHONE_NUMBER_CONTAINERS = "td,div";
@ -921,7 +924,7 @@ var SelectionHandler = {
if (selectedText.length) {
let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper);
clipboard.copyString(selectedText, this._contentWindow.document);
NativeWindow.toast.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), "short");
Toast.show(Strings.browser.GetStringFromName("selectionHelper.textCopied"), Toast.SHORT);
}
this._closeSelection();
},

5
mobile/android/chrome/content/aboutReader.js
Просмотреть файл

@ -10,6 +10,9 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "UITelemetry",
"resource://gre/modules/UITelemetry.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Toast",
"resource://gre/modules/Toast.jsm");
XPCOMUtils.defineLazyGetter(window, "gChromeWin", function ()
window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
@ -511,7 +514,7 @@ AboutReader.prototype = {
if (!visible && !this._hasUsedToolbar) {
this._hasUsedToolbar = Services.prefs.getBoolPref("reader.has_used_toolbar");
if (!this._hasUsedToolbar) {
gChromeWin.NativeWindow.toast.show(gStrings.GetStringFromName("aboutReader.toolbarTip"), "short");
Toast.show(gStrings.GetStringFromName("aboutReader.toolbarTip"), Toast.SHORT);
Services.prefs.setBoolPref("reader.has_used_toolbar", true);
this._hasUsedToolbar = true;

31
mobile/android/chrome/content/browser.js
Просмотреть файл

@ -89,6 +89,12 @@ XPCOMUtils.defineLazyModuleGetter(this, "CharsetMenu",
XPCOMUtils.defineLazyModuleGetter(this, "NetErrorHelper",
"resource://gre/modules/NetErrorHelper.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Toast",
"resource://gre/modules/Toast.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "PageActions",
"resource://gre/modules/PageActions.jsm");
// Lazily-loaded browser scripts:
[
["SelectHelper", "chrome://browser/content/SelectHelper.js"],
@ -361,7 +367,7 @@ var BrowserApp = {
Services.obs.addObserver(this, "sessionstore-state-purge-complete", false);
function showFullScreenWarning() {
NativeWindow.toast.show(Strings.browser.GetStringFromName("alertFullScreenToast"), "short");
Toast.show(Strings.browser.GetStringFromName("alertFullScreenToast"), Toast.SHORT);
}
window.addEventListener("fullscreen", function() {
@ -511,7 +517,7 @@ var BrowserApp = {
let newtabStrings = Strings.browser.GetStringFromName("newtabpopup.opened");
let label = PluralForm.get(1, newtabStrings).replace("#1", 1);
let buttonLabel = Strings.browser.GetStringFromName("newtabpopup.switch");
NativeWindow.toast.show(label, "long", {
Toast.show(label, Toast.LONG, {
button: {
icon: "drawable://switch_button_icon",
label: buttonLabel,
@ -533,7 +539,7 @@ var BrowserApp = {
let newtabStrings = Strings.browser.GetStringFromName("newprivatetabpopup.opened");
let label = PluralForm.get(1, newtabStrings).replace("#1", 1);
let buttonLabel = Strings.browser.GetStringFromName("newtabpopup.switch");
NativeWindow.toast.show(label, "long", {
Toast.show(label, Toast.LONG, {
button: {
icon: "drawable://switch_button_icon",
label: buttonLabel,
@ -1046,7 +1052,7 @@ var BrowserApp = {
message = Strings.browser.GetStringFromName("undoCloseToast.messageDefault");
}
NativeWindow.toast.show(message, "short", {
Toast.show(message, Toast.SHORT, {
button: {
icon: "drawable://undo_button_icon",
label: Strings.browser.GetStringFromName("undoCloseToast.action2"),
@ -2668,9 +2674,6 @@ var NativeWindow = {
}
};
XPCOMUtils.defineLazyModuleGetter(this, "PageActions",
"resource://gre/modules/PageActions.jsm");
// These alias to the old, deprecated NativeWindow interfaces
[
["pageactions", "resource://gre/modules/PageActions.jsm", "PageActions"],
@ -5990,7 +5993,7 @@ var XPInstallObserver = {
observe: function xpi_observer(aSubject, aTopic, aData) {
switch (aTopic) {
case "addon-install-started":
NativeWindow.toast.show(Strings.browser.GetStringFromName("alertAddonsDownloading"), "short");
Toast.show(Strings.browser.GetStringFromName("alertAddonsDownloading"), Toast.SHORT);
break;
case "addon-install-blocked":
let installInfo = aSubject.QueryInterface(Ci.amIWebInstallInfo);
@ -6075,13 +6078,13 @@ var XPInstallObserver = {
// Display completion message for new installs or updates not done Automatically
if (!aInstall.existingAddon || !AddonManager.shouldAutoUpdate(aInstall.existingAddon)) {
let message = Strings.browser.GetStringFromName("alertAddonsInstalledNoRestart");
NativeWindow.toast.show(message, "short");
Toast.show(message, Toast.SHORT);
}
}
},
onInstallFailed: function(aInstall) {
NativeWindow.toast.show(Strings.browser.GetStringFromName("alertAddonsFail"), "short");
Toast.show(Strings.browser.GetStringFromName("alertAddonsFail"), Toast.SHORT);
},
onDownloadProgress: function xpidm_onDownloadProgress(aInstall) {},
@ -6113,7 +6116,7 @@ var XPInstallObserver = {
msg = msg.replace("#3", Strings.brand.GetStringFromName("brandShortName"));
msg = msg.replace("#4", Services.appinfo.version);
NativeWindow.toast.show(msg, "short");
Toast.show(msg, Toast.SHORT);
},
showRestartPrompt: function() {
@ -7043,7 +7046,7 @@ var SearchEngines = {
Services.search.addEngine(engine.url, Ci.nsISearchEngine.DATA_XML, engine.iconURL, false, {
onSuccess: function() {
// Display a toast confirming addition of new search engine.
NativeWindow.toast.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [engine.title], 1), "long");
Toast.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [engine.title], 1), Toast.LONG);
},
onError: function(aCode) {
@ -7057,7 +7060,7 @@ var SearchEngines = {
errorMessage = "alertSearchEngineErrorToast";
}
NativeWindow.toast.show(Strings.browser.formatStringFromName(errorMessage, [engine.title], 1), "long");
Toast.show(Strings.browser.formatStringFromName(errorMessage, [engine.title], 1), Toast.LONG);
}
});
},
@ -7138,7 +7141,7 @@ var SearchEngines = {
name = title.value + " " + i;
Services.search.addEngineWithDetails(name, favicon, null, null, method, formURL);
NativeWindow.toast.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [name], 1), "long");
Toast.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [name], 1), Toast.LONG);
let engine = Services.search.getEngineByName(name);
engine.wrappedJSObject._queryCharset = charset;
for (let i = 0; i < formData.length; ++i) {

8
mobile/android/chrome/content/downloads.js
Просмотреть файл

@ -8,6 +8,9 @@
let Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Toast",
"resource://gre/modules/Toast.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Notifications",
"resource://gre/modules/Notifications.jsm");
@ -258,10 +261,11 @@ AlertDownloadProgressListener.prototype = {
case Ci.nsIDownloadManager.DOWNLOAD_QUEUED: {
if (BrowserApp.isGuest) {
aDownload.cancel();
NativeWindow.toast.show(Strings.browser.GetStringFromName("downloads.disabledInGuest"), "long");
Toast.show(Strings.browser.GetStringFromName("downloads.disabledInGuest"), Toast.LONG);
return;
}
NativeWindow.toast.show(Strings.browser.GetStringFromName("alertDownloadsToast"), "long");
Toast.show(Strings.browser.GetStringFromName("alertDownloadsToast"), Toast.LONG);
Downloads.createNotification(aDownload, new DownloadNotifOptions(aDownload,
Strings.browser.GetStringFromName("alertDownloadsStart2"),
aDownload.displayName));

34
mobile/android/components/ContentDispatchChooser.js
Просмотреть файл

@ -10,6 +10,9 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Messaging.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "Toast",
"resource://gre/modules/Toast.jsm");
function ContentDispatchChooser() {}
ContentDispatchChooser.prototype =
@ -49,26 +52,23 @@ ContentDispatchChooser.prototype =
if (aHandler.possibleApplicationHandlers.length > 1) {
aHandler.launchWithURI(aURI, aWindowContext);
} else {
let win = this._getChromeWin();
if (win && win.NativeWindow) {
let bundle = Services.strings.createBundle("chrome://browser/locale/handling.properties");
let failedText = bundle.GetStringFromName("protocol.failed");
let searchText = bundle.GetStringFromName("protocol.toast.search");
let bundle = Services.strings.createBundle("chrome://browser/locale/handling.properties");
let failedText = bundle.GetStringFromName("protocol.failed");
let searchText = bundle.GetStringFromName("protocol.toast.search");
win.NativeWindow.toast.show(failedText, "long", {
button: {
label: searchText,
callback: function() {
let message = {
type: "Intent:Open",
url: "market://search?q=" + aURI.scheme,
};
Toast.show(failedText, Toast.LONG, {
button: {
label: searchText,
callback: function() {
let message = {
type: "Intent:Open",
url: "market://search?q=" + aURI.scheme,
};
sendMessageToJava(message);
}
sendMessageToJava(message);
}
});
}
}
});
}
},
};

3
mobile/android/modules/Toast.jsm
Просмотреть файл

@ -29,6 +29,9 @@ function resolveGeckoURI(uri) {
}
var Toast = {
LONG: "long",
SHORT: "short",
show: function(message, duration, options) {
let msg = {
type: "Toast:Show",