--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -91,17 +91,17 @@
document.getElementById("certificateErrorReporting").style.display = "block";
}
function showPrefChangeContainer() {
const panel = document.getElementById("prefChangeContainer");
panel.style.display = "block";
document.getElementById("netErrorButtonContainer").style.display = "none";
document.getElementById("prefResetButton").addEventListener("click", function resetPreferences(e) {
- const event = new CustomEvent("AboutNetErrorResetPreferences", {bubbles:true});
+ const event = new CustomEvent("AboutNetErrorResetPreferences", {bubbles: true});
document.dispatchEvent(event);
});
addAutofocus("prefResetButton", "beforeend");
}
function setupAdvancedButton() {
// Get the hostname and add it to the panel
var panel = document.getElementById("badCertAdvancedPanel");
@@ -122,17 +122,17 @@
// information panel is hidden as well, since it's opened by the
// error code link in the advanced panel.
var div = document.getElementById("certificateErrorDebugInformation");
div.style.display = "none";
}
if (panel.style.display == "block") {
// send event to trigger telemetry ping
- var event = new CustomEvent("AboutNetErrorUIExpanded", {bubbles:true});
+ var event = new CustomEvent("AboutNetErrorUIExpanded", {bubbles: true});
document.dispatchEvent(event);
}
});
if (!gIsCertError) {
return;
}
@@ -287,17 +287,17 @@
showPrefChangeContainer();
}
}
if (getErrorCode() == "sslv3Used") {
setupAdvancedButton();
}
}, true, true);
- var event = new CustomEvent("AboutNetErrorLoad", {bubbles:true});
+ var event = new CustomEvent("AboutNetErrorLoad", {bubbles: true});
document.dispatchEvent(event);
if (err == "inadequateSecurityError") {
// Remove the "Try again" button for HTTP/2 inadequate security as it
// is useless.
document.getElementById("errorTryAgain").style.display = "none";
var container = document.getElementById("errorLongDesc");
@@ -310,17 +310,17 @@
}
function initPageCaptivePortal() {
document.body.className = "captiveportal";
document.title = document.getElementById("captivePortalPageTitle").textContent;
document.getElementById("openPortalLoginPageButton")
.addEventListener("click", () => {
- let event = new CustomEvent("AboutNetErrorOpenCaptivePortal", {bubbles:true});
+ let event = new CustomEvent("AboutNetErrorOpenCaptivePortal", {bubbles: true});
document.dispatchEvent(event);
});
addAutofocus("openPortalLoginPageButton");
setupAdvancedButton();
addDomainErrorLinks();
@@ -357,17 +357,17 @@
// Display error reporting UI
document.getElementById("certificateErrorReporting").style.display = "block";
// set the checkbox
checkbox.checked = !!options.automatic;
}
}, true, true);
- let event = new CustomEvent("AboutNetErrorLoad", {bubbles:true});
+ let event = new CustomEvent("AboutNetErrorLoad", {bubbles: true});
document.getElementById("advancedButton").dispatchEvent(event);
addDomainErrorLinks();
}
/* Only do autofocus if we're the toplevel frame; otherwise we
don't want to call attention to ourselves! The key part is
that autofocus happens on insertion into the tree, so we
--- a/browser/base/content/aboutTabCrashed.js
+++ b/browser/base/content/aboutTabCrashed.js
@@ -100,17 +100,17 @@ var AboutTabCrashed = {
let el = document.getElementById(targetID);
el.addEventListener("click", this);
});
// For setting "emailMe" checkbox automatically on email value change.
document.getElementById("email").addEventListener("input", this);
// Error pages are loaded as LOAD_BACKGROUND, so they don't get load events.
- let event = new CustomEvent("AboutTabCrashedLoad", {bubbles:true});
+ let event = new CustomEvent("AboutTabCrashedLoad", {bubbles: true});
document.dispatchEvent(event);
sendAsyncMessage("Load");
},
onClick(event) {
switch (event.target.id) {
case "closeTab": {
@@ -197,17 +197,17 @@ var AboutTabCrashed = {
} else {
this.showCrashReportUI(false);
}
if (data.requestAutoSubmit) {
document.getElementById("requestAutoSubmit").hidden = false;
}
- let event = new CustomEvent("AboutTabCrashedReady", {bubbles:true});
+ let event = new CustomEvent("AboutTabCrashedReady", {bubbles: true});
document.dispatchEvent(event);
},
/**
* Handler for when the parent reports that the crash report associated
* with this about:tabcrashed page has been sent.
*/
onCrashReportSent() {
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/abouthome/aboutHome.js
@@ -48,17 +48,17 @@ window.addEventListener("pageshow", func
// later and may use asynchronous getters.
window.gObserver.observe(document.documentElement, { attributes: true });
window.gObserver.observe(document.getElementById("launcher"), { attributes: true });
fitToWidth();
setupSearch();
window.addEventListener("resize", fitToWidth);
// Ask chrome to update snippets.
- var event = new CustomEvent("AboutHomeLoad", {bubbles:true});
+ var event = new CustomEvent("AboutHomeLoad", {bubbles: true});
document.dispatchEvent(event);
});
window.addEventListener("pagehide", function() {
window.gObserver.disconnect();
window.removeEventListener("resize", fitToWidth);
});
@@ -236,30 +236,30 @@ function setupSearch() {
"abouthome", "homepage");
}
}
/**
* Inform the test harness that we're done loading the page.
*/
function loadCompleted() {
- var event = new CustomEvent("AboutHomeLoadSnippetsCompleted", {bubbles:true});
+ var event = new CustomEvent("AboutHomeLoadSnippetsCompleted", {bubbles: true});
document.dispatchEvent(event);
}
/**
* Update the local snippets from the remote storage, then show them through
* showSnippets.
*/
function loadSnippets() {
if (!gSnippetsMap)
throw new Error("Snippets map has not properly been initialized");
// Allow tests to modify the snippets map before using it.
- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true});
+ var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles: true});
document.dispatchEvent(event);
// Check cached snippets version.
let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0;
let currentVersion = document.documentElement.getAttribute("snippetsVersion");
if (cachedVersion < currentVersion) {
// The cached snippets are old and unsupported, restart from scratch.
gSnippetsMap.clear();
--- a/browser/base/content/blockedSite.xhtml
+++ b/browser/base/content/blockedSite.xhtml
@@ -130,17 +130,17 @@
if (!getOverride()) {
var btn = document.getElementById("ignoreWarningButton");
if (btn) {
btn.remove();
}
}
// Inform the test harness that we're done loading the page
- var event = new CustomEvent("AboutBlockedLoaded", {bubbles:true});
+ var event = new CustomEvent("AboutBlockedLoaded", {bubbles: true});
document.dispatchEvent(event);
}
]]></script>
</head>
<body dir="&locale.dir;">
<div id="errorPageContainer" class="container">
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -793,23 +793,23 @@ var gPopupBlockerObserver = {
// For host-less URIs like file://, prePath would effectively allow
// popups everywhere on file://. Use the full spec:
prefillValue = principalURI.spec;
}
}
} catch (e) { }
var bundlePreferences = document.getElementById("bundle_preferences");
- var params = { blockVisible : false,
- sessionVisible : false,
- allowVisible : true,
- prefilledHost : prefillValue,
- permissionType : "popup",
- windowTitle : bundlePreferences.getString("popuppermissionstitle"),
- introText : bundlePreferences.getString("popuppermissionstext") };
+ var params = { blockVisible: false,
+ sessionVisible: false,
+ allowVisible: true,
+ prefilledHost: prefillValue,
+ permissionType: "popup",
+ windowTitle: bundlePreferences.getString("popuppermissionstitle"),
+ introText: bundlePreferences.getString("popuppermissionstext") };
var existingWindow = Services.wm.getMostRecentWindow("Browser:Permissions");
if (existingWindow) {
existingWindow.initWithParams(params);
existingWindow.focus();
} else
window.openDialog("chrome://browser/content/preferences/permissions.xul",
"_blank", "resizable,dialog=no,centerscreen", params);
},
@@ -3051,17 +3051,17 @@ var BrowserOnClick = {
case "exceptionDialogButton":
if (isTopFrame) {
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_BAD_CERT_TOP_CLICK_ADD_EXCEPTION);
}
securityInfo = getSecurityInfo(securityInfoAsString);
let sslStatus = securityInfo.QueryInterface(Ci.nsISSLStatusProvider)
.SSLStatus;
- let params = { exceptionAdded : false,
+ let params = { exceptionAdded: false,
sslStatus };
try {
switch (Services.prefs.getIntPref("browser.ssl_override_behavior")) {
case 2 : // Pre-fetch & pre-populate
params.prefetchCert = true;
case 1 : // Pre-populate
params.location = location;
@@ -3606,17 +3606,17 @@ function openHomeDialog(aURL) {
if (aURL.includes("|")) {
promptMsg = gNavigatorBundle.getString("droponhomemsgMultiple");
} else {
promptMsg = gNavigatorBundle.getString("droponhomemsg");
}
var pressedVal = Services.prompt.confirmEx(window, promptTitle, promptMsg,
Services.prompt.STD_YES_NO_BUTTONS,
- null, null, null, null, {value:0});
+ null, null, null, null, {value: 0});
if (pressedVal == 0) {
try {
gPrefService.setStringPref("browser.startup.homepage", aURL);
} catch (ex) {
dump("Failed to set the home page.\n" + ex + "\n");
}
}
@@ -6227,17 +6227,17 @@ var OfflineApps = {
}
}];
let message = gNavigatorBundle.getFormattedString("offlineApps.available2",
[host]);
let anchorID = "indexedDB-notification-icon";
let options = {
persistent: true,
hideClose: true,
- controlledItems : [[Cu.getWeakReference(browser), docId, uri]]
+ controlledItems: [[Cu.getWeakReference(browser), docId, uri]]
};
notification = PopupNotifications.show(browser, notificationID, message,
anchorID, mainAction,
secondaryActions, options);
}
},
disallowSite(uri) {
--- a/browser/base/content/pageinfo/security.js
+++ b/browser/base/content/pageinfo/security.js
@@ -50,25 +50,25 @@ var security = {
if (!isInsecure && status) {
status.QueryInterface(nsISSLStatus);
var cert = status.serverCert;
var issuerName =
this.mapIssuerOrganization(cert.issuerOrganization) || cert.issuerName;
var retval = {
hostName,
- cAName : issuerName,
- encryptionAlgorithm : undefined,
- encryptionStrength : undefined,
+ cAName: issuerName,
+ encryptionAlgorithm: undefined,
+ encryptionStrength: undefined,
version: undefined,
isBroken,
isMixed,
isEV,
cert,
- certificateTransparency : undefined
+ certificateTransparency: undefined
};
var version;
try {
retval.encryptionAlgorithm = status.cipherName;
retval.encryptionStrength = status.secretKeyLength;
version = status.protocolVersion;
} catch (e) {
@@ -106,25 +106,25 @@ var security = {
retval.certificateTransparency = "Compliant";
break;
}
return retval;
}
return {
hostName,
- cAName : "",
- encryptionAlgorithm : "",
- encryptionStrength : 0,
+ cAName: "",
+ encryptionAlgorithm: "",
+ encryptionStrength: 0,
version: "",
isBroken,
isMixed,
isEV,
- cert : null,
- certificateTransparency : null
+ cert: null,
+ certificateTransparency: null
};
},
// Find the secureBrowserUI object (if present)
_getSecurityUI() {
if (window.opener.gBrowser)
return window.opener.gBrowser.securityUI;
return null;
@@ -160,27 +160,27 @@ var security = {
eTLD = this.uri.asciiHost;
}
if (win) {
win.gCookiesWindow.setFilter(eTLD);
win.focus();
} else
window.openDialog("chrome://browser/content/preferences/cookies.xul",
- "Browser:Cookies", "", {filterString : eTLD});
+ "Browser:Cookies", "", {filterString: eTLD});
},
/**
* Open the login manager window
*/
viewPasswords() {
LoginHelper.openPasswordManager(window, this._getSecurityInfo().hostName);
},
- _cert : null
+ _cert: null
};
function securityOnLoad(uri, windowInfo) {
security.init(uri, windowInfo);
var info = security._getSecurityInfo();
if (!info) {
document.getElementById("securityTab").hidden = true;
--- a/browser/base/content/sanitize.js
+++ b/browser/base/content/sanitize.js
@@ -184,18 +184,18 @@ Sanitizer.prototype = {
}
}),
// Time span only makes sense in certain cases. Consumers who want
// to only clear some private data can opt in by setting this to false,
// and can optionally specify a specific range. If timespan is not ignored,
// and range is not set, sanitize() will use the value of the timespan
// pref to determine a range
- ignoreTimespan : true,
- range : null,
+ ignoreTimespan: true,
+ range: null,
items: {
cache: {
clear: Task.async(function* (range) {
let seenException;
let refObj = {};
TelemetryStopwatch.start("FX_SANITIZE_CACHE", refObj);
--- a/browser/base/content/test/general/browser_addKeywordSearch.js
+++ b/browser/base/content/test/general/browser_addKeywordSearch.js
@@ -41,17 +41,17 @@ add_task(function*() {
let element = doc.createElement("input");
element.setAttribute("type", "text");
element.setAttribute("name", args.param);
form.appendChild(element);
doc.body.appendChild(form);
});
yield BrowserTestUtils.synthesizeMouseAtCenter(`#${id} > input`,
- { type : "contextmenu", button : 2 },
+ { type: "contextmenu", button: 2 },
tab.linkedBrowser);
let target = yield contextMenuPromise;
yield new Promise(resolve => {
let url = action || tab.linkedBrowser.currentURI.spec;
let mm = tab.linkedBrowser.messageManager;
let onMessage = (message) => {
mm.removeMessageListener("ContextMenu:SearchFieldBookmarkData:Result", onMessage);
--- a/browser/base/content/test/general/browser_bug561636.js
+++ b/browser/base/content/test/general/browser_bug561636.js
@@ -8,17 +8,17 @@ function checkPopupShow() {
}
function checkPopupHide() {
ok(gInvalidFormPopup.state != "showing" && gInvalidFormPopup.state != "open",
"[Test " + testId + "] The invalid form popup should not be shown");
}
var gObserver = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver]),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver]),
notifyInvalidSubmit(aFormElement, aInvalidElements) {
}
};
var testId = 0;
function incrementTest() {
--- a/browser/base/content/test/general/browser_contextmenu_childprocess.js
+++ b/browser/base/content/test/general/browser_contextmenu_childprocess.js
@@ -6,17 +6,17 @@ const gBaseURL = "https://example.com/br
add_task(function *() {
let tab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, gBaseURL + "subtst_contextmenu.html");
let contextMenu = document.getElementById("contentAreaContextMenu");
// Get the point of the element with the page menu (test-pagemenu) and
// synthesize a right mouse click there.
let popupShownPromise = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
- yield BrowserTestUtils.synthesizeMouse("#test-pagemenu", 5, 5, { type : "contextmenu", button : 2 }, tab.linkedBrowser);
+ yield BrowserTestUtils.synthesizeMouse("#test-pagemenu", 5, 5, { type: "contextmenu", button: 2 }, tab.linkedBrowser);
yield popupShownPromise;
checkMenu(contextMenu);
let popupHiddenPromise = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
contextMenu.hidePopup();
yield popupHiddenPromise;
--- a/browser/base/content/test/general/browser_documentnavigation.js
+++ b/browser/base/content/test/general/browser_documentnavigation.js
@@ -41,17 +41,17 @@ function* expectFocusOnF6(backward, expe
}
}
} else if (contentExpectedElement.localName == "html") {
contentExpectedElement = contentExpectedElement.ownerDocument;
}
if (!contentExpectedElement) {
sendSyncMessage("BrowserTest:FocusChanged",
- { details : "expected element " + arg.expectedElementId + " not found" });
+ { details: "expected element " + arg.expectedElementId + " not found" });
return;
}
contentExpectedElement.addEventListener("focus", function() {
const contentFM = Components.classes["@mozilla.org/focus-manager;1"].
getService(Components.interfaces.nsIFocusManager);
let details = contentFM.focusedWindow.document.documentElement.id;
if (contentFM.focusedElement) {
--- a/browser/base/content/test/general/browser_drag.js
+++ b/browser/base/content/test/general/browser_drag.js
@@ -6,24 +6,24 @@ function test() {
let EventUtils = {};
scriptLoader.loadSubScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", EventUtils);
// ---- Test dragging the proxy icon ---
var value = content.location.href;
var urlString = value + "\n" + content.document.title;
var htmlString = "<a href=\"" + value + "\">" + value + "</a>";
var expected = [ [
- { type : "text/x-moz-url",
- data : urlString },
- { type : "text/uri-list",
- data : value },
- { type : "text/plain",
- data : value },
- { type : "text/html",
- data : htmlString }
+ { type: "text/x-moz-url",
+ data: urlString },
+ { type: "text/uri-list",
+ data: value },
+ { type: "text/plain",
+ data: value },
+ { type: "text/html",
+ data: htmlString }
] ];
// set the valid attribute so dropping is allowed
var oldstate = gURLBar.getAttribute("pageproxystate");
gURLBar.setAttribute("pageproxystate", "valid");
var dt = EventUtils.synthesizeDragStart(document.getElementById("identity-box"), expected);
is(dt, null, "drag on proxy icon");
gURLBar.setAttribute("pageproxystate", oldstate);
// Now, the identity information panel is opened by the proxy icon click.
--- a/browser/base/content/test/general/browser_sanitize-timespans.js
+++ b/browser/base/content/test/general/browser_sanitize-timespans.js
@@ -514,51 +514,51 @@ function* setupFormHistory() {
}
// Make sure we've got a clean DB to start with, then add the entries we'll be testing.
yield update(
[{
op: "remove"
},
{
- op : "add",
- fieldname : "10minutes",
- value : "10m"
+ op: "add",
+ fieldname: "10minutes",
+ value: "10m"
}, {
- op : "add",
- fieldname : "1hour",
- value : "1h"
+ op: "add",
+ fieldname: "1hour",
+ value: "1h"
}, {
- op : "add",
- fieldname : "1hour10minutes",
- value : "1h10m"
+ op: "add",
+ fieldname: "1hour10minutes",
+ value: "1h10m"
}, {
- op : "add",
- fieldname : "2hour",
- value : "2h"
+ op: "add",
+ fieldname: "2hour",
+ value: "2h"
}, {
- op : "add",
- fieldname : "2hour10minutes",
- value : "2h10m"
+ op: "add",
+ fieldname: "2hour10minutes",
+ value: "2h10m"
}, {
- op : "add",
- fieldname : "4hour",
- value : "4h"
+ op: "add",
+ fieldname: "4hour",
+ value: "4h"
}, {
- op : "add",
- fieldname : "4hour10minutes",
- value : "4h10m"
+ op: "add",
+ fieldname: "4hour10minutes",
+ value: "4h10m"
}, {
- op : "add",
- fieldname : "today",
- value : "1d"
+ op: "add",
+ fieldname: "today",
+ value: "1d"
}, {
- op : "add",
- fieldname : "b4today",
- value : "1y"
+ op: "add",
+ fieldname: "b4today",
+ value: "1y"
}]);
// Artifically age the entries to the proper vintage.
let timestamp = now_uSec - 10 * kUsecPerMin;
let results = yield searchEntries(["guid"], { fieldname: "10minutes" });
yield update({ op: "update", firstUsed: timestamp, guid: results[0].guid });
timestamp = now_uSec - 45 * kUsecPerMin;
--- a/browser/base/content/test/general/browser_tabfocus.js
+++ b/browser/base/content/test/general/browser_tabfocus.js
@@ -73,17 +73,17 @@ function focusInChild() {
function eventListener(event) {
var id;
if (event.target instanceof Components.interfaces.nsIDOMWindow)
id = getWindowDocId(event.originalTarget) + "-window";
else if (event.target instanceof Components.interfaces.nsIDOMDocument)
id = getWindowDocId(event.originalTarget) + "-document";
else
id = event.originalTarget.id;
- sendSyncMessage("Browser:FocusChanged", { details : event.type + ": " + id });
+ sendSyncMessage("Browser:FocusChanged", { details: event.type + ": " + id });
}
addEventListener("focus", eventListener, true);
addEventListener("blur", eventListener, true);
addMessageListener("Browser:ChangeFocus", function changeFocus(message) {
content.document.getElementById(message.data.id)[message.data.type]();
});
--- a/browser/base/content/test/general/contextmenu_common.js
+++ b/browser/base/content/test/general/contextmenu_common.js
@@ -7,17 +7,17 @@ function openContextMenuFor(element, shi
if (lastElement)
lastElement.blur();
element.focus();
// Some elements need time to focus and spellcheck before any tests are
// run on them.
function actuallyOpenContextMenuFor() {
lastElement = element;
- var eventDetails = { type : "contextmenu", button : 2, shiftKey : shiftkey };
+ var eventDetails = { type: "contextmenu", button: 2, shiftKey: shiftkey };
synthesizeMouse(element, 2, 2, eventDetails, element.ownerGlobal);
}
if (waitForSpellCheck) {
var { onSpellCheck } = SpecialPowers.Cu.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm", {});
onSpellCheck(element, actuallyOpenContextMenuFor);
} else {
actuallyOpenContextMenuFor();
--- a/browser/base/content/test/social/browser_share.js
+++ b/browser/base/content/test/social/browser_share.js
@@ -72,17 +72,17 @@ var corpus = [
// og:description
description: "A test corpus file for open graph tags we care about",
// medium: this.getPageMedium(),
// source: this.getSourceURL(),
// og:url
url: "https://www.mozilla.org/",
// shortUrl: this.getShortURL(),
// og:image
- previews:["https://www.mozilla.org/favicon.png"],
+ previews: ["https://www.mozilla.org/favicon.png"],
// og:site_name
siteName: ">My simple test page<"
}
},
{
// tests that og:url doesn't override the page url if it is bad
url: baseURL + "opengraph/og_invalid_url.html",
options: {
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -785,17 +785,17 @@ function openPreferences(paneID, extraAr
if (paneID) {
browser.contentWindow.gotoPref(paneID);
}
switchToAdvancedSubPane(browser.contentDocument);
}
}
function openAdvancedPreferences(tabID) {
- openPreferences("paneAdvanced", { "advancedTab" : tabID });
+ openPreferences("paneAdvanced", { "advancedTab": tabID });
}
/**
* Opens the troubleshooting information (about:support) page for this version
* of the application.
*/
function openTroubleshootingPage() {
openUILinkIn("about:support", "tab");
--- a/browser/components/migration/tests/unit/test_fx_telemetry.js
+++ b/browser/components/migration/tests/unit/test_fx_telemetry.js
@@ -217,17 +217,17 @@ add_task(function* test_datareporting_ma
writeToFile(subDir, "session-state.json", shouldBeCopied);
writeToFile(subDir, "something.else", "should not");
createSubDir(subDir, "emptyDir");
let ok = yield promiseTelemetryMigrator(srcDir, targetDir);
Assert.ok(ok, "callback should have been true");
checkDirectoryContains(targetDir, {
- "datareporting" : {
+ "datareporting": {
"state.json": shouldBeCopied,
"session-state.json": shouldBeCopied,
}
});
});
add_task(function* test_no_session_state() {
let [srcDir, targetDir] = getTestDirs();
@@ -236,17 +236,17 @@ add_task(function* test_no_session_state
let subDir = createSubDir(srcDir, "datareporting");
let stateContent = "abcd984";
writeToFile(subDir, "state.json", stateContent);
let ok = yield promiseTelemetryMigrator(srcDir, targetDir);
Assert.ok(ok, "callback should have been true");
checkDirectoryContains(targetDir, {
- "datareporting" : {
+ "datareporting": {
"state.json": stateContent,
}
});
});
add_task(function* test_no_state() {
let [srcDir, targetDir] = getTestDirs();
@@ -254,17 +254,17 @@ add_task(function* test_no_state() {
let subDir = createSubDir(srcDir, "datareporting");
let sessionStateContent = "abcd512";
writeToFile(subDir, "session-state.json", sessionStateContent);
let ok = yield promiseTelemetryMigrator(srcDir, targetDir);
Assert.ok(ok, "callback should have been true");
checkDirectoryContains(targetDir, {
- "datareporting" : {
+ "datareporting": {
"session-state.json": sessionStateContent,
}
});
});
add_task(function* test_times_migration() {
let [srcDir, targetDir] = getTestDirs();
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -278,36 +278,36 @@ nsBrowserContentHandler.prototype = {
if (outer)
throw Components.results.NS_ERROR_NO_AGGREGATION;
return gBrowserContentHandler.QueryInterface(iid);
}
},
/* helper functions */
- mChromeURL : null,
+ mChromeURL: null,
get chromeURL() {
if (this.mChromeURL) {
return this.mChromeURL;
}
this.mChromeURL = Services.prefs.getCharPref("browser.chromeURL");
return this.mChromeURL;
},
/* nsISupports */
- QueryInterface : XPCOMUtils.generateQI([nsICommandLineHandler,
- nsIBrowserHandler,
- nsIContentHandler,
- nsICommandLineValidator]),
+ QueryInterface: XPCOMUtils.generateQI([nsICommandLineHandler,
+ nsIBrowserHandler,
+ nsIContentHandler,
+ nsICommandLineValidator]),
/* nsICommandLineHandler */
- handle : function bch_handle(cmdLine) {
+ handle: function bch_handle(cmdLine) {
if (cmdLine.handleFlag("browser", false)) {
// Passing defaultArgs, so use NO_EXTERNAL_URIS
openWindow(null, this.chromeURL, "_blank",
"chrome,dialog=no,all" + this.getFeatures(cmdLine),
this.defaultArgs, NO_EXTERNAL_URIS);
cmdLine.preventDefault = true;
}
@@ -553,19 +553,19 @@ nsBrowserContentHandler.prototype = {
if (!uri) {
Services.prefs.clearUserPref("browser.startup.homepage");
uri = Services.prefs.getComplexValue("browser.startup.homepage",
nsIPrefLocalizedString).data;
}
return uri;
},
- mFeatures : null,
+ mFeatures: null,
- getFeatures : function bch_features(cmdLine) {
+ getFeatures: function bch_features(cmdLine) {
if (this.mFeatures === null) {
this.mFeatures = "";
try {
var width = cmdLine.handleFlagWithParam("width", false);
var height = cmdLine.handleFlagWithParam("height", false);
if (width)
@@ -582,17 +582,17 @@ nsBrowserContentHandler.prototype = {
}
}
return this.mFeatures;
},
/* nsIContentHandler */
- handleContent : function bch_handleContent(contentType, context, request) {
+ handleContent: function bch_handleContent(contentType, context, request) {
try {
var webNavInfo = Components.classes["@mozilla.org/webnavigation-info;1"]
.getService(nsIWebNavigationInfo);
if (!webNavInfo.isTypeSupported(contentType, null)) {
throw NS_ERROR_WONT_HANDLE_CONTENT;
}
} catch (e) {
throw NS_ERROR_WONT_HANDLE_CONTENT;
@@ -600,17 +600,17 @@ nsBrowserContentHandler.prototype = {
request.QueryInterface(nsIChannel);
handURIToExistingBrowser(request.URI,
nsIBrowserDOMWindow.OPEN_DEFAULTWINDOW, null);
request.cancel(NS_BINDING_ABORTED);
},
/* nsICommandLineValidator */
- validate : function bch_validate(cmdLine) {
+ validate: function bch_validate(cmdLine) {
// Other handlers may use osint so only handle the osint flag if the url
// flag is also present and the command line is valid.
var osintFlagIdx = cmdLine.findFlag("osint", false);
var urlFlagIdx = cmdLine.findFlag("url", false);
if (urlFlagIdx > -1 && (osintFlagIdx > -1 ||
cmdLine.state == nsICommandLine.STATE_REMOTE_EXPLICIT)) {
var urlParam = cmdLine.getArgument(urlFlagIdx + 1);
if (cmdLine.length != urlFlagIdx + 2 || /firefoxurl:/.test(urlParam))
@@ -664,28 +664,28 @@ function handURIToExistingBrowser(uri, l
function nsDefaultCommandLineHandler() {
}
nsDefaultCommandLineHandler.prototype = {
classID: Components.ID("{47cd0651-b1be-4a0f-b5c4-10e5a573ef71}"),
/* nsISupports */
- QueryInterface : function dch_QI(iid) {
+ QueryInterface: function dch_QI(iid) {
if (!iid.equals(nsISupports) &&
!iid.equals(nsICommandLineHandler))
throw Components.results.NS_ERROR_NO_INTERFACE;
return this;
},
_haveProfile: false,
/* nsICommandLineHandler */
- handle : function dch_handle(cmdLine) {
+ handle: function dch_handle(cmdLine) {
var urilist = [];
if (AppConstants.platform == "win") {
// If we don't have a profile selected yet (e.g. the Profile Manager is
// displayed) we will crash if we open an url and then select a profile. To
// prevent this handle all url command line flags and set the command line's
// preventDefault to true to prevent the display of the ui. The initial
// command line will be retained when nsAppRunner calls LaunchChild though
@@ -760,13 +760,13 @@ nsDefaultCommandLineHandler.prototype =
}
// Passing defaultArgs, so use NO_EXTERNAL_URIS
openWindow(null, gBrowserContentHandler.chromeURL, "_blank",
"chrome,dialog=no,all" + gBrowserContentHandler.getFeatures(cmdLine),
gBrowserContentHandler.defaultArgs, NO_EXTERNAL_URIS);
}
},
- helpInfo : "",
+ helpInfo: "",
};
var components = [nsBrowserContentHandler, nsDefaultCommandLineHandler];
this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
--- a/browser/components/places/content/bookmarkProperties.js
+++ b/browser/components/places/content/bookmarkProperties.js
@@ -507,28 +507,28 @@ var BookmarkPropertiesPanel = {
* various fields and opening arguments of the dialog.
*/
_getCreateNewBookmarkTransaction:
function BPP__getCreateNewBookmarkTransaction(aContainer, aIndex) {
var annotations = [];
var childTransactions = [];
if (this._description) {
- let annoObj = { name : PlacesUIUtils.DESCRIPTION_ANNO,
- type : Ci.nsIAnnotationService.TYPE_STRING,
- flags : 0,
- value : this._description,
+ let annoObj = { name: PlacesUIUtils.DESCRIPTION_ANNO,
+ type: Ci.nsIAnnotationService.TYPE_STRING,
+ flags: 0,
+ value: this._description,
expires: Ci.nsIAnnotationService.EXPIRE_NEVER };
let editItemTxn = new PlacesSetItemAnnotationTransaction(-1, annoObj);
childTransactions.push(editItemTxn);
}
if (this._loadInSidebar) {
- let annoObj = { name : PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO,
- value : true };
+ let annoObj = { name: PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO,
+ value: true };
let setLoadTxn = new PlacesSetItemAnnotationTransaction(-1, annoObj);
childTransactions.push(setLoadTxn);
}
// XXX TODO: this should be in a transaction!
if (this._charSet && !PrivateBrowsingUtils.isWindowPrivate(window))
PlacesUtils.setCharsetForURI(this._uri, this._charSet);
--- a/browser/components/places/content/editBookmarkOverlay.js
+++ b/browser/components/places/content/editBookmarkOverlay.js
@@ -666,17 +666,17 @@ var gEditItemOverlay = {
PlacesTransactions.EditKeyword({ guid, keyword, postData, oldKeyword })
.transact().catch(Components.utils.reportError);
},
onLoadInSidebarCheckboxCommand() {
if (!this.initialized || !this._paneInfo.isBookmark)
return;
- let annotation = { name : PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO };
+ let annotation = { name: PlacesUIUtils.LOAD_IN_SIDEBAR_ANNO };
if (this._loadInSidebarCheckbox.checked)
annotation.value = true;
if (!PlacesUIUtils.useAsyncTransactions) {
let itemId = this._paneInfo.itemId;
let txn = new PlacesSetItemAnnotationTransaction(itemId,
annotation);
PlacesUtils.transactionManager.doTransaction(txn);
--- a/browser/components/preferences/blocklists.js
+++ b/browser/components/preferences/blocklists.js
@@ -8,17 +8,17 @@ const CONTENT_LIST_ID = "content";
const TRACK_SUFFIX = "-track-digest256";
const TRACKING_TABLE_PREF = "urlclassifier.trackingTable";
const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists.";
const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime";
var gBlocklistManager = {
_type: "",
_blockLists: [],
- _brandShortName : null,
+ _brandShortName: null,
_bundle: null,
_tree: null,
_view: {
_rowCount: 0,
get rowCount() {
return this._rowCount;
},
--- a/browser/components/preferences/cookies.js
+++ b/browser/components/preferences/cookies.js
@@ -11,22 +11,22 @@ Components.utils.import("resource://gre/
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "SiteDataManager",
"resource:///modules/SiteDataManager.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
"resource://gre/modules/ContextualIdentityService.jsm");
var gCookiesWindow = {
- _cm : Components.classes["@mozilla.org/cookiemanager;1"]
- .getService(Components.interfaces.nsICookieManager),
- _hosts : {},
- _hostOrder : [],
- _tree : null,
- _bundle : null,
+ _cm: Components.classes["@mozilla.org/cookiemanager;1"]
+ .getService(Components.interfaces.nsICookieManager),
+ _hosts: {},
+ _hostOrder: [],
+ _tree: null,
+ _bundle: null,
init() {
var os = Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService);
os.addObserver(this, "cookie-changed", false);
os.addObserver(this, "perm-changed", false);
this._bundle = document.getElementById("bundlePreferences");
@@ -189,22 +189,22 @@ var gCookiesWindow = {
var oldRowCount = this._rowCount;
this._view._rowCount += rowCountImpact;
this._tree.treeBoxObject.rowCountChanged(oldRowCount - 1, rowCountImpact);
this._updateRemoveAllButton();
},
_view: {
- _filtered : false,
- _filterSet : [],
+ _filtered: false,
+ _filterSet: [],
_filterValue: "",
- _rowCount : 0,
- _cacheValid : 0,
- _cacheItems : [],
+ _rowCount: 0,
+ _cacheValid: 0,
+ _cacheItems: [],
get rowCount() {
return this._rowCount;
},
_getItemAtIndex(aIndex) {
if (this._filtered)
return this._filterSet[aIndex];
@@ -220,17 +220,17 @@ var gCookiesWindow = {
for (let i = start; i < gCookiesWindow._hostOrder.length; ++i) { // var host in gCookiesWindow._hosts) {
let currHost = gCookiesWindow._hosts[gCookiesWindow._hostOrder[i]];// gCookiesWindow._hosts[host];
if (!currHost) continue;
if (count == aIndex)
return currHost;
hostIndex = count;
- var cacheEntry = { "start" : i, "count" : count };
+ var cacheEntry = { "start": i, "count": count };
var cacheStart = count;
if (currHost.open) {
if (count < aIndex && aIndex <= (count + currHost.cookies.length)) {
// We are looking for an entry within this host's children,
// enumerate them looking for the index.
++count;
for (let cookie of currHost.cookies) {
@@ -441,40 +441,40 @@ var gCookiesWindow = {
_makeStrippedHost(aHost) {
var formattedHost = aHost.charAt(0) == "." ? aHost.substring(1, aHost.length) : aHost;
return formattedHost.substring(0, 4) == "www." ? formattedHost.substring(4, formattedHost.length) : formattedHost;
},
_addCookie(aStrippedHost, aCookie, aHostCount) {
if (!(aStrippedHost in this._hosts) || !this._hosts[aStrippedHost]) {
- this._hosts[aStrippedHost] = { cookies : [],
- rawHost : aStrippedHost,
- level : 0,
- open : false,
- container : true };
+ this._hosts[aStrippedHost] = { cookies: [],
+ rawHost: aStrippedHost,
+ level: 0,
+ open: false,
+ container: true };
this._hostOrder.push(aStrippedHost);
++aHostCount.value;
}
var c = this._makeCookieObject(aStrippedHost, aCookie);
this._hosts[aStrippedHost].cookies.push(c);
},
_makeCookieObject(aStrippedHost, aCookie) {
- var c = { name : aCookie.name,
- value : aCookie.value,
- isDomain : aCookie.isDomain,
- host : aCookie.host,
- rawHost : aStrippedHost,
- path : aCookie.path,
- isSecure : aCookie.isSecure,
- expires : aCookie.expires,
- level : 1,
- container : false,
+ var c = { name: aCookie.name,
+ value: aCookie.value,
+ isDomain: aCookie.isDomain,
+ host: aCookie.host,
+ rawHost: aStrippedHost,
+ path: aCookie.path,
+ isSecure: aCookie.isSecure,
+ expires: aCookie.expires,
+ level: 1,
+ container: false,
originAttributes: aCookie.originAttributes };
return c;
},
_loadCookies() {
var e = this._cm.enumerator;
var hostCount = { value: 0 };
this._hosts = {};
@@ -734,17 +734,17 @@ var gCookiesWindow = {
if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE) {
this.deleteCookie();
} else if (AppConstants.platform == "macosx" &&
aEvent.keyCode == KeyEvent.DOM_VK_BACK_SPACE) {
this.deleteCookie();
}
},
- _lastSortProperty : "",
+ _lastSortProperty: "",
_lastSortAscending: false,
sort(aProperty) {
var ascending = (aProperty == this._lastSortProperty) ? !this._lastSortAscending : true;
// Sort the Non-Filtered Host Collections
if (aProperty == "rawHost") {
function sortByHost(a, b) {
return a.toLowerCase().localeCompare(b.toLowerCase());
}
--- a/browser/components/preferences/in-content/advanced.js
+++ b/browser/components/preferences/in-content/advanced.js
@@ -507,24 +507,24 @@ var gAdvancedPane = {
var pref = document.getElementById("browser.offline-apps.notify");
var button = document.getElementById("offlineNotifyExceptions");
button.disabled = !pref.value;
return pref.value;
},
showOfflineExceptions() {
var bundlePreferences = document.getElementById("bundlePreferences");
- var params = { blockVisible : false,
- sessionVisible : false,
- allowVisible : false,
- prefilledHost : "",
- permissionType : "offline-app",
- manageCapability : Components.interfaces.nsIPermissionManager.DENY_ACTION,
- windowTitle : bundlePreferences.getString("offlinepermissionstitle"),
- introText : bundlePreferences.getString("offlinepermissionstext") };
+ var params = { blockVisible: false,
+ sessionVisible: false,
+ allowVisible: false,
+ prefilledHost: "",
+ permissionType: "offline-app",
+ manageCapability: Components.interfaces.nsIPermissionManager.DENY_ACTION,
+ windowTitle: bundlePreferences.getString("offlinepermissionstitle"),
+ introText: bundlePreferences.getString("offlinepermissionstext") };
gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
null, params);
},
// XXX: duplicated in browser.js
_getOfflineAppUsage(perm, groups) {
let cacheService = Cc["@mozilla.org/network/application-cache-service;1"].
getService(Ci.nsIApplicationCacheService);
--- a/browser/components/preferences/in-content/applications.js
+++ b/browser/components/preferences/in-content/applications.js
@@ -842,35 +842,35 @@ var gApplicationsPane = {
// with their types to distinguish duplicate descriptions from each other.
// A hash of integer counts, indexed by string description.
_visibleTypeDescriptionCount: {},
// Convenience & Performance Shortcuts
// These get defined by init().
- _brandShortName : null,
- _prefsBundle : null,
- _list : null,
- _filter : null,
+ _brandShortName: null,
+ _prefsBundle: null,
+ _list: null,
+ _filter: null,
- _prefSvc : Cc["@mozilla.org/preferences-service;1"].
- getService(Ci.nsIPrefBranch),
+ _prefSvc: Cc["@mozilla.org/preferences-service;1"].
+ getService(Ci.nsIPrefBranch),
- _mimeSvc : Cc["@mozilla.org/mime;1"].
- getService(Ci.nsIMIMEService),
+ _mimeSvc: Cc["@mozilla.org/mime;1"].
+ getService(Ci.nsIMIMEService),
- _helperAppSvc : Cc["@mozilla.org/uriloader/external-helper-app-service;1"].
- getService(Ci.nsIExternalHelperAppService),
+ _helperAppSvc: Cc["@mozilla.org/uriloader/external-helper-app-service;1"].
+ getService(Ci.nsIExternalHelperAppService),
- _handlerSvc : Cc["@mozilla.org/uriloader/handler-service;1"].
- getService(Ci.nsIHandlerService),
+ _handlerSvc: Cc["@mozilla.org/uriloader/handler-service;1"].
+ getService(Ci.nsIHandlerService),
- _ioSvc : Cc["@mozilla.org/network/io-service;1"].
- getService(Ci.nsIIOService),
+ _ioSvc: Cc["@mozilla.org/network/io-service;1"].
+ getService(Ci.nsIIOService),
// Initialization & Destruction
init() {
function setEventListener(aId, aEventType, aCallback) {
document.getElementById(aId)
.addEventListener(aEventType, aCallback.bind(gApplicationsPane));
--- a/browser/components/preferences/in-content/content.js
+++ b/browser/components/preferences/in-content/content.js
@@ -177,28 +177,28 @@ var gContentPane = {
_selectDefaultLanguageGroup(aLanguageGroup, aIsSerif) {
const kFontNameFmtSerif = "font.name.serif.%LANG%";
const kFontNameFmtSansSerif = "font.name.sans-serif.%LANG%";
const kFontNameListFmtSerif = "font.name-list.serif.%LANG%";
const kFontNameListFmtSansSerif = "font.name-list.sans-serif.%LANG%";
const kFontSizeFmtVariable = "font.size.variable.%LANG%";
var preferences = document.getElementById("contentPreferences");
- var prefs = [{ format : aIsSerif ? kFontNameFmtSerif : kFontNameFmtSansSerif,
- type : "fontname",
- element : "defaultFont",
- fonttype : aIsSerif ? "serif" : "sans-serif" },
- { format : aIsSerif ? kFontNameListFmtSerif : kFontNameListFmtSansSerif,
- type : "unichar",
- element : null,
- fonttype : aIsSerif ? "serif" : "sans-serif" },
- { format : kFontSizeFmtVariable,
- type : "int",
- element : "defaultFontSize",
- fonttype : null }];
+ var prefs = [{ format: aIsSerif ? kFontNameFmtSerif : kFontNameFmtSansSerif,
+ type: "fontname",
+ element: "defaultFont",
+ fonttype: aIsSerif ? "serif" : "sans-serif" },
+ { format: aIsSerif ? kFontNameListFmtSerif : kFontNameListFmtSansSerif,
+ type: "unichar",
+ element: null,
+ fonttype: aIsSerif ? "serif" : "sans-serif" },
+ { format: kFontSizeFmtVariable,
+ type: "int",
+ element: "defaultFontSize",
+ fonttype: null }];
for (var i = 0; i < prefs.length; ++i) {
var preference = document.getElementById(prefs[i].format.replace(/%LANG%/, aLanguageGroup));
if (!preference) {
preference = document.createElement("preference");
var name = prefs[i].format.replace(/%LANG%/, aLanguageGroup);
preference.id = name;
preference.setAttribute("name", name);
preference.setAttribute("type", prefs[i].type);
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -602,23 +602,23 @@ var gPrivacyPane = {
}
},
/**
* Displays fine-grained, per-site preferences for cookies.
*/
showCookieExceptions() {
var bundlePreferences = document.getElementById("bundlePreferences");
- var params = { blockVisible : true,
- sessionVisible : true,
- allowVisible : true,
- prefilledHost : "",
- permissionType : "cookie",
- windowTitle : bundlePreferences.getString("cookiepermissionstitle"),
- introText : bundlePreferences.getString("cookiepermissionstext") };
+ var params = { blockVisible: true,
+ sessionVisible: true,
+ allowVisible: true,
+ prefilledHost: "",
+ permissionType: "cookie",
+ windowTitle: bundlePreferences.getString("cookiepermissionstitle"),
+ introText: bundlePreferences.getString("cookiepermissionstext") };
gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
null, params);
},
/**
* Displays all the user's cookies in a dialog.
*/
showCookies(aCategory) {
--- a/browser/components/preferences/languages.js
+++ b/browser/components/preferences/languages.js
@@ -1,19 +1,19 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var gLanguagesDialog = {
- _availableLanguagesList : [],
- _acceptLanguages : { },
+ _availableLanguagesList: [],
+ _acceptLanguages: { },
- _selectedItemID : null,
+ _selectedItemID: null,
init() {
if (!this._availableLanguagesList.length)
this._loadAvailableLanguages();
},
// Ugly hack used to trigger extra reflow in order to work around XUL bug 1194844;
// see bug 1194346.
--- a/browser/components/preferences/permissions.js
+++ b/browser/components/preferences/permissions.js
@@ -16,23 +16,23 @@ const NOTIFICATION_FLUSH_PERMISSIONS = "
function Permission(principal, type, capability) {
this.principal = principal;
this.origin = principal.origin;
this.type = type;
this.capability = capability;
}
var gPermissionManager = {
- _type : "",
- _permissions : [],
- _permissionsToAdd : new Map(),
- _permissionsToDelete : new Map(),
- _bundle : null,
- _tree : null,
- _observerRemoved : false,
+ _type: "",
+ _permissions: [],
+ _permissionsToAdd: new Map(),
+ _permissionsToDelete: new Map(),
+ _bundle: null,
+ _tree: null,
+ _observerRemoved: false,
_view: {
_rowCount: 0,
get rowCount() {
return this._rowCount;
},
getCellText(aRow, aColumn) {
if (aColumn.id == "siteCol")
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.js
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.js
@@ -75,17 +75,17 @@ document.addEventListener("DOMContentLoa
// Update state that depends on preferences.
prefObserver.observe();
});
function openPrivateWindow() {
// Ask chrome to open a private window
document.dispatchEvent(
- new CustomEvent("AboutPrivateBrowsingOpenWindow", {bubbles:true}));
+ new CustomEvent("AboutPrivateBrowsingOpenWindow", {bubbles: true}));
}
function toggleTrackingProtection() {
// Ask chrome to enable tracking protection
document.dispatchEvent(
new CustomEvent("AboutPrivateBrowsingToggleTrackingProtection",
{bubbles: true}));
}
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
@@ -16,17 +16,17 @@ function test() {
var pbWin = OpenBrowserWindow({private: true});
pbWin.addEventListener("load", function() {
doTest();
}, {once: true});
// Test the certificate exceptions dialog
function doTest() {
let params = {
- exceptionAdded : false,
+ exceptionAdded: false,
location: INVALID_CERT_LOCATION,
prefetchCert: true,
};
function testCheckbox() {
win.removeEventListener("load", testCheckbox);
Services.obs.addObserver(function onCertUI(aSubject, aTopic, aData) {
Services.obs.removeObserver(onCertUI, "cert-exception-ui-ready");
ok(win.gCert, "The certificate information should be available now");
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_concurrent.js
@@ -26,17 +26,17 @@ add_task(function* test() {
// Step 1
let non_private_browser = gBrowser.selectedBrowser;
non_private_browser.loadURI(prefix + "?action=set&name=test&value=value&initial=true");
yield BrowserTestUtils.browserLoaded(non_private_browser);
// Step 2
- let private_window = yield BrowserTestUtils.openNewBrowserWindow({ private : true });
+ let private_window = yield BrowserTestUtils.openNewBrowserWindow({ private: true });
let private_browser = private_window.getBrowser().selectedBrowser;
private_browser.loadURI(prefix + "?action=set&name=test2&value=value2");
yield BrowserTestUtils.browserLoaded(private_browser);
// Step 3
non_private_browser.loadURI(prefix + "?action=get&name=test2");
yield BrowserTestUtils.browserLoaded(non_private_browser);
@@ -51,32 +51,32 @@ add_task(function* test() {
elts = yield getElts(private_browser);
isnot(elts[0], "value", "private window shouldn't see public storage");
is(elts[1], "1", "private window should only see private items");
// Reopen the private window again, without privateBrowsing, which should clear the
// the private storage.
private_window.close();
- private_window = yield BrowserTestUtils.openNewBrowserWindow({ private : false });
+ private_window = yield BrowserTestUtils.openNewBrowserWindow({ private: false });
private_browser = null;
yield new Promise(resolve => Cu.schedulePreciseGC(resolve));
private_browser = private_window.getBrowser().selectedBrowser;
private_browser.loadURI(prefix + "?action=get&name=test2");
yield BrowserTestUtils.browserLoaded(private_browser, false, prefix + "?action=get&name=test2");
elts = yield getElts(private_browser);
isnot(elts[0], "value2", "public window shouldn't see cleared private storage");
is(elts[1], "1", "public window should only see public items");
// Making it private again should clear the storage and it shouldn't
// be able to see the old private storage as well.
private_window.close();
- private_window = yield BrowserTestUtils.openNewBrowserWindow({ private : true });
+ private_window = yield BrowserTestUtils.openNewBrowserWindow({ private: true });
private_browser = null;
yield new Promise(resolve => Cu.schedulePreciseGC(resolve));
private_browser = private_window.getBrowser().selectedBrowser;
private_browser.loadURI(prefix + "?action=set&name=test3&value=value3");
yield BrowserTestUtils.browserLoaded(private_browser);
elts = yield getElts(private_browser);
is(elts[1], "1", "private window should only see new private items");
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_placesTitleNoUpdate.js
@@ -54,17 +54,17 @@ add_task(function* test() {
handleError: () => ok(false, "Unexpected error in adding visit."),
handleResult() { },
handleCompletion() {}
});
yield waitForTitleChanged();
is(PlacesUtils.history.getPageTitle(TEST_URI), TITLE_2, "The title matches the updated title after updating visit");
- let privateWin = yield BrowserTestUtils.openNewBrowserWindow({private:true});
+ let privateWin = yield BrowserTestUtils.openNewBrowserWindow({private: true});
yield BrowserTestUtils.browserLoaded(privateWin.gBrowser.addTab(TEST_URL).linkedBrowser);
is(PlacesUtils.history.getPageTitle(TEST_URI), TITLE_2, "The title remains the same after visiting in private window");
yield PlacesTestUtils.clearHistory();
// Cleanup
BrowserTestUtils.closeWindow(privateWin);
gBrowser.removeTab(tabToClose);
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -421,19 +421,19 @@
<parameter name="aParams"/>
<parameter name="aOneOff"/>
<body><![CDATA[
var textBox = this._textbox;
// Save the current value in the form history
if (aData && !PrivateBrowsingUtils.isWindowPrivate(window) && this.FormHistory.enabled) {
this.FormHistory.update(
- { op : "bump",
- fieldname : textBox.getAttribute("autocompletesearchparam"),
- value : aData },
+ { op: "bump",
+ fieldname: textBox.getAttribute("autocompletesearchparam"),
+ value: aData },
{ handleError(aError) {
Components.utils.reportError("Saving search to form history failed: " + aError.message);
}});
}
let engine = aEngine || this.currentEngine;
var submission = engine.getSubmission(aData, null, "searchbar");
let telemetrySearchDetails = this.telemetrySearchDetails;
@@ -838,17 +838,17 @@
return true;
},
doCommand(aCommand) {
switch (aCommand) {
case "cmd_clearhistory":
var param = this._self.getAttribute("autocompletesearchparam");
- BrowserSearch.searchBar.FormHistory.update({ op : "remove", fieldname : param }, null);
+ BrowserSearch.searchBar.FormHistory.update({ op: "remove", fieldname: param }, null);
this._self.value = "";
break;
case "cmd_togglesuggest":
// The pref observer will update _suggestEnabled and the menu
// checkmark.
Services.prefs.setBoolPref("browser.search.suggest.enabled",
!this._self._suggestEnabled);
break;
--- a/browser/components/search/test/browser_amazon.js
+++ b/browser/components/search/test/browser_amazon.js
@@ -29,17 +29,17 @@ function test() {
name: "Amazon.com",
alias: null,
description: "Amazon.com Search",
searchForm: "https://www.amazon.com/exec/obidos/external-search/?field-keywords=&ie=UTF-8&mode=blended&tag=mozilla-20&sourceid=Mozilla-search",
hidden: false,
wrappedJSObject: {
queryCharset: "UTF-8",
"_iconURL": "resource://search-plugins/images/amazon.ico",
- _urls : [
+ _urls: [
{
type: "application/x-suggestions+json",
method: "GET",
template: "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1",
params: "",
},
{
type: "text/html",
--- a/browser/components/search/test/browser_bing.js
+++ b/browser/components/search/test/browser_bing.js
@@ -39,17 +39,17 @@ function test() {
name: "Bing",
alias: null,
description: "Bing. Search by Microsoft.",
searchForm: "https://www.bing.com/search?q=&pc=MOZI&form=MOZSBR",
hidden: false,
wrappedJSObject: {
queryCharset: "UTF-8",
"_iconURL": "data:image/x-icon;base64,AAABAAIAICAAAAEACACoCAAAJgAAABAQAAABAAgAaAUAAM4IAAAoAAAAIAAAAEAAAAABAAgAAAAAAIAEAAAAAAAAAAAAAAABAAAAAAAAhIQMAI+PIwCXlzEAn59BAKioUwCurl8AtbVuAL6+fwDJyZMA0tKlANjYsgDe3r4A5eXMAOzs2QDy8uUA+fnzAP///wAAGi8AAC1QAAA/cAAAUZAAAGOwAAB2zwAAiPAAEZj/ADGm/wBRs/8AccH/AJHP/wCx3f8A0ev/AP///wAAAAAAACwvAABLUAAAaHAAAIaQAAClsAAAw88AAOHwABHv/wAx8f8AUfP/AHH1/wCR9/8Asfn/ANH7/wD///8AAAAAAAAvIQAAUDcAAHBMAACQYwAAsHkAAM+PAADwpgAR/7QAMf++AFH/yABx/9MAkf/cALH/5QDR//AA////AAAAAAAALw4AAFAYAABwIgAAkCwAALA2AADPQAAA8EoAEf9bADH/cQBR/4cAcf+dAJH/sgCx/8kA0f/fAP///wAAAAAAAi8AAARQAAAGcAAACJAAAAqwAAALzwAADvAAACD/EgA9/zEAW/9RAHn/cQCY/5EAtf+xANT/0QD///8AAAAAABQvAAAiUAAAMHAAAD2QAABMsAAAWc8AAGfwAAB4/xEAiv8xAJz/UQCu/3EAwP+RANL/sQDk/9EA////AAAAAAAmLwAAQFAAAFpwAAB0kAAAjrAAAKnPAADC8AAA0f8RANj/MQDe/1EA4/9xAOn/kQDv/7EA9v/RAP///wAAAAAALyYAAFBBAABwWwAAkHQAALCOAADPqQAA8MMAAP/SEQD/2DEA/91RAP/kcQD/6pEA//CxAP/20QD///8AAAAAAC8UAABQIgAAcDAAAJA+AACwTQAAz1sAAPBpAAD/eREA/4oxAP+dUQD/r3EA/8GRAP/SsQD/5dEA////AAAAAAAvAwAAUAQAAHAGAACQCQAAsAoAAM8MAADwDgAA/yASAP8+MQD/XFEA/3pxAP+XkQD/trEA/9TRAP///wAAAAAALwAOAFAAFwBwACEAkAArALAANgDPAEAA8ABJAP8RWgD/MXAA/1GGAP9xnAD/kbIA/7HIAP/R3wD///8AAAAAAC8AIABQADYAcABMAJAAYgCwAHgAzwCOAPAApAD/EbMA/zG+AP9RxwD/cdEA/5HcAP+x5QD/0fAA////AAAAAAAsAC8ASwBQAGkAcACHAJAApQCwAMQAzwDhAPAA8BH/APIx/wD0Uf8A9nH/APeR/wD5sf8A+9H/AP///wAAAAAAGwAvAC0AUAA/AHAAUgCQAGMAsAB2AM8AiADwAJkR/wCmMf8AtFH/AMJx/wDPkf8A3LH/AOvR/wD///8AAAAAAAgALwAOAFAAFQBwABsAkAAhALAAJgDPACwA8AA+Ef8AWDH/AHFR/wCMcf8AppH/AL+x/wDa0f8A////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBggCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAsQEA0HAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwkPEBAQEBALBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEMEBAQEBAQEBAPCQMAAAAAAAAAAAAAAAAAAAAAAAAAAQ0QEBAQEBAQEBAQDQgBAAAAAAAAAAAAAAAAAAAAAAABDRAQEBAQEBAQEBAQEA0GAQAAAAAAAAAAAAAAAAAAAAENEBAQDgcLEBAQEBAQEBALBAAAAAAAAAAAAAAAAAAAAQ0QEBANAQEHDRAQEBAQEBAOCAAAAAAAAAAAAAAAAAABDRAQEA4BAAACCA4QEBAQEBANAQAAAAAAAAAAAAAAAAENEBAQDgEAAAAABAsQEBAQEA0BAAAAAAAAAAAAAAAAAQ0QEBAOAQAAAAABBw4QEBAQDQEAAAAAAAAAAAAAAAABDRAQEA4BAAABBw0QEBAQEBANAQAAAAAAAAAAAAAAAAENEBAQDgEAAAcQEBAQEBAQEA0BAAAAAAAAAAAAAAAAAQ0QEBAOAQABCxAQEBAQEBANBwAAAAAAAAAAAAAAAAABDRAQEA4BAAQPEBAQEA0IBAEAAAAAAAAAAAAAAAAAAAENEBAQDgEACRAQDQkGAQAAAAAAAAAAAAAAAAAAAAAAAQ0QEBAOAQILCgYCAAAAAAAAAAAAAAAAAAAAAAAAAAABDRAQEA4BAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAENEBAQDgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0QEBAOAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRAQEA4BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAENEBAQDgEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0QEBAOAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABDRAQEA0BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAENEA0IBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQcFAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAACEhAAAjIwAAJKSFgCZmSgAqqpRALKyYgC+vnsAxsaKAM3NmQDU1KgA4ODBAOjozwDw8OEA+fnyAP///wD///8AAAAAAAAaLwAALVAAAD9wAABRkAAAY7AAAHbPAACI8AARmP8AMab/AFGz/wBxwf8Akc//ALHd/wDR6/8A////AAAAAAAALC8AAEtQAABocAAAhpAAAKWwAADDzwAA4fAAEe//ADHx/wBR8/8AcfX/AJH3/wCx+f8A0fv/AP///wAAAAAAAC8hAABQNwAAcEwAAJBjAACweQAAz48AAPCmABH/tAAx/74AUf/IAHH/0wCR/9wAsf/lANH/8AD///8AAAAAAAAvDgAAUBgAAHAiAACQLAAAsDYAAM9AAADwSgAR/1sAMf9xAFH/hwBx/50Akf+yALH/yQDR/98A////AAAAAAACLwAABFAAAAZwAAAIkAAACrAAAAvPAAAO8AAAIP8SAD3/MQBb/1EAef9xAJj/kQC1/7EA1P/RAP///wAAAAAAFC8AACJQAAAwcAAAPZAAAEywAABZzwAAZ/AAAHj/EQCK/zEAnP9RAK7/cQDA/5EA0v+xAOT/0QD///8AAAAAACYvAABAUAAAWnAAAHSQAACOsAAAqc8AAMLwAADR/xEA2P8xAN7/UQDj/3EA6f+RAO//sQD2/9EA////AAAAAAAvJgAAUEEAAHBbAACQdAAAsI4AAM+pAADwwwAA/9IRAP/YMQD/3VEA/+RxAP/qkQD/8LEA//bRAP///wAAAAAALxQAAFAiAABwMAAAkD4AALBNAADPWwAA8GkAAP95EQD/ijEA/51RAP+vcQD/wZEA/9KxAP/l0QD///8AAAAAAC8DAABQBAAAcAYAAJAJAACwCgAAzwwAAPAOAAD/IBIA/z4xAP9cUQD/enEA/5eRAP+2sQD/1NEA////AAAAAAAvAA4AUAAXAHAAIQCQACsAsAA2AM8AQADwAEkA/xFaAP8xcAD/UYYA/3GcAP+RsgD/scgA/9HfAP///wAAAAAALwAgAFAANgBwAEwAkABiALAAeADPAI4A8ACkAP8RswD/Mb4A/1HHAP9x0QD/kdwA/7HlAP/R8AD///8AAAAAACwALwBLAFAAaQBwAIcAkAClALAAxADPAOEA8ADwEf8A8jH/APRR/wD2cf8A95H/APmx/wD70f8A////AAAAAAAbAC8ALQBQAD8AcABSAJAAYwCwAHYAzwCIAPAAmRH/AKYx/wC0Uf8AwnH/AM+R/wDcsf8A69H/AP///wAAAAAACAAvAA4AUAAVAHAAGwCQACEAsAAmAM8ALADwAD4R/wBYMf8AcVH/AIxx/wCmkf8Av7H/ANrR/wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMAAAAAAAAAAAAAAAACBgwMBwIAAAAAAAAAAAAABg4ODg4MBgIAAAAAAAAAAAYODQoODg4KBAAAAAAAAAAGDgwDBQsODg4FAAAAAAAABg4MAgADCg4OBgAAAAAAAAYODAICCg4ODgYAAAAAAAAGDgwCBg4OCwcCAAAAAAAABg4MAwkIBAIAAAAAAAAAAAYODAICAAAAAAAAAAAAAAAGDgwCAAAAAAAAAAAAAAAABg4MAgAAAAAAAAAAAAAAAAYMCAEAAAAAAAAAAAAAAAACAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
- _urls : [
+ _urls: [
{
type: "application/x-suggestions+json",
method: "GET",
template: "https://www.bing.com/osjson.aspx",
params: [
{
name: "query",
value: "{searchTerms}",
@@ -95,17 +95,17 @@ function test() {
{
name: "form",
value: "MOZSPG",
purpose: "homepage",
},
{
name: "form",
value: "MOZLBR",
- purpose:"keyword",
+ purpose: "keyword",
},
{
name: "form",
value: "MOZTSB",
purpose: "newtab",
},
],
mozparams: {},
--- a/browser/components/search/test/browser_ddg.js
+++ b/browser/components/search/test/browser_ddg.js
@@ -39,17 +39,17 @@ function test() {
name: "DuckDuckGo",
alias: null,
description: "Search DuckDuckGo",
searchForm: "https://duckduckgo.com/?q=&t=ffsb",
hidden: false,
wrappedJSObject: {
queryCharset: "UTF-8",
"_iconURL": "data:image/icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA11RgALs6oACbQ9wAj0v8AI9L/ACfQ9wAu0agANdUYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzzN4CNdL/oK/z//////////////////////+jsPv/BDXX/wAz0t4AAAAAAAAAAAAAAAAAAAAAAAAAAAAyzvNSduD//////8jK/v+P+Lf/IbQL/17RPP+J3Y//wOKX//////9YeuX/ADLO8wAAAAAAAAAAAAAAAAAw091piOX/8/X9/1Fx5P9xhu//WOWZ/0W9Lv9Lwjn/J8BB/xyDAP9bdfL/9fP//2mI5v8AMNPdAAAAAAc610YRQ9f//////0Zr4P8AGdD/sb32////////////wrv//wAh1/8MPab/ACPc/05r4///////EkPX/wc610YANtWkrr/y/6S48P8AJ9L/AB3R/+/w/v///////////3+D7f8AQeL/AYTw/wFr5/8AMNb/p7Tv/6698v8AM9WkADLW//////8yXt//AC3V/wAw1/////////////z///8A0P7/AKb1/wWI7P8AuPf/AJ3w/zZW3P//////ADHV/wAx2P//////AzrZ/wAu1/84ZOL////////////e////AND//wC1+f8Atff/AZbv/wY62f8ELNf//////wAw1/8AMtn//////wAw2f8ALNn/kKrz////+//cwbH////////////R////Rcb8/wDO/f8A/P//AHzo//////8AMNj/ADXa//////8vXuL/ACna/4yq9///79T/jUkg/9i+r///////r2Q0/7Cozv8BKdr/AirY/zdZ4P//////ADTa/wI72tOuv/T/prr0/wAl2v+JqPb//7yW/+bUxv/9+/n////u//W+n/+Op/L/ADPd/wAv2v+ru/T/r7/0/wI72tMLQd1DEEjg//////9Cbef/ADng///////////////////////R3///AC3g/wAy3v9SeOn//////xFI4P8LQd1DAAAAAAM64PNmiuz/9/j//2mN7f/m7P3///////////9Cb+n/ACXd/wAt3v9rju3//////2iL7P8DOuDzAAAAAAAAAAAAAAAAAT3g/0p16f//////3OT8/3OS7v8AKt3/ACPc/zhn5/+xw/b//////0956v8CPeD/AAAAAAAAAAAAAAAAAAAAAAAAAAAEPODzBUDh/5uz8//7/f7/////////////////prz0/wtF4v8FQeDzAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtF5kYDQOOkADrj/wA44v8AOeP/ADzk/wVB46QPReZGAAAAAAAAAAAAAAAAAAAAAPAPAADgBwAAwAMAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChIzyAnRNFwJ0TQryND0d8nRNH/J0TR/ydE0f8nRNH/I0PR3ydE0K8nRNFwKEjPIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChE00AlRdK/J0XS/ydF0v8nRdL/XXPd/11z3f94i+P/k6Lp/5Oi6f9rf+D/NVDV/ydF0v8nRdL/JUXSvyhE00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAzxAnRNOvJ0XT/ydF0/8lRdK/KEXSYOvu+6/+/v6//v7+v/39/c////////////7+/r/J0fOAKEXSYCVF0r8nRdP/J0XT/ydE068gQM8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlRdUwJ0bT7ydG0/8nRtHPKETTQAAAAADHx8dA2vHhn5TYpN/o9+z/////////////////8PL83ydG0o8lRdUwAAAAAChE00AnRtHPJ0bT/ydG0+8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKEXVYCdG1P8nRtT/KEbTgAAAAAAmRtZQI0PU38jIyP/F6s//Rrtk/0a7ZP9/yIr/c796/4vLkv+JpNf/M3Kq/zyWh/8zeKTfJkbWUAAAAAAoRtOAJ0bU/ydG1P8oRdVgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVF1TAnR9X/J0fV/yhF1WAgQM8QJ0fTrydH1f9CW8//2tra/6Pdsv9Gu2T/Rrtk/0WzWv9Gu2T/Rrtk/0a7ZP9Gu2T/Rrtk/z6egP8nR9X/J0fTryBAzxAoRdVgJ0fV/ydH1f8lRdUwAAAAAAAAAAAAAAAAAAAAAAAAAAAgQM8QJ0fV7ydH1f8oSNVgIEDPECdH1c8nR9X/J0fV/1xwyf/t7e3/o92y/0a7ZP9Gu2T/Ra5U/0a7ZP9Gu2T/Rrtk/0a7ZP9Gu2T/Pp6A/ydH1f8nR9X/J0fVzyBAzxAoSNVgJ0fV/ydH1e8gQM8QAAAAAAAAAAAAAAAAAAAAACdH1q8nR9b/KEjVgCBQzxAnR9bPJ0fW/ydH1v8nR9b/gIzB//r6+v+j3bL/Rrtk/13Ed/+i26//ruG7/z6egf8+noH/Rrtk/0a7ZP86kI//J0fW/ydH1v8nR9b/J0fWzyBQzxAoSNWAJ0fW/ydH1q8AAAAAAAAAAAAAAAAoSNdAJkjW/yZH1s8AAAAAJEfWryZI1v8mSNb/JkjW/yZI1v+jqsT//////+j37P/R7tj////////////W3ff/JkjW/yZI1v8uZbr/PJeI/zJzrP8mSNb/JkjW/yZI1v8mSNb/JEfWrwAAAAAmR9bPJkjW/yhI10AAAAAAAAAAACVI1r8mSNf/KEjXQCZJ1lAmSNf/JkjX/yZI1/8mSNf/JkjX/9HR0f///////////////////////////5Ok6/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JkjX/yZI1/8mSNf/JknWUChI10AmSNf/JUjWvwAAAAAoSNcgJknY/yZH2M8AAAAAI0nY3yZJ2P8mSdj/JknY/yZJ2P9KZM//39/f////////////////////////////XHfi/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8mSdj/JknY/yZJ2P8jSdjfAAAAACZH2M8mSdj/KEjXICdJ2HAmSdj/JUjXYCVK2jAmSdj/JknY/yZJ2P8mSdj/JknY/2V4yf/t7e3///////////////////////////9cd+L/HXTj/xSf7/8Nwfj/CdL8/wnS/P8J0vz/ELDz/xt85v8mSdj/JknY/yZJ2P8lStowJUjXYCZJ2P8nSdhwJErZryZK2f8oSNcgJUnajyZK2f8mStn/JkrZ/yZK2f8mStn/iJPA////////////////////////////0ff+/xjV/P8J0vz/Drn1/xiO6/8Yjuv/GI7r/xCw8/8Lyvr/CdL8/xmF6P8mStn/JkrZ/yVJ2o8oSNcgJkrZ/yRK2a8jStrfI0rZ3wAAAAAlSdq/Jkra/yZK2v8mStr/Jkra/yZK2v+xtsf///////////////////////////8o2Pz/CdL8/wvK+v8mStr/Jkra/yZK2v8mStr/Jkra/yZK2v8iW97/Jkra/yZK2v8mStr/JUnavwAAAAAjStnfI0ra3yZK2v8lSdq/AAAAACZH2O8mStr/Jkra/yZK2v8mStr/L1HY/9HR0f///////////////////////////yjY/P8J0vz/CdL8/xCw9P8QsPT/ELD0/xSf7/8ddeX/Jkra/yZK2v8mStr/Jkra/yZK2v8mR9jvAAAAACVJ2r8mStr/Jkvb/yVJ2r8AAAAAJkvb/yZL2/8mS9v/Jkvb/yZL2/9KZtL/4+Pj////////////////////////////4Pn//0fd/f8J0vz/CdL8/wnS/P8J0vz/CdL8/wnS/P8Lyvr/Fpfu/yJc3/8mS9v/Jkvb/yZL2/8AAAAAJUnavyZL2/8mS9z/JUncvwAAAAAmS9z/Jkvc/yZL3P8mS9z/Jkvc/26AyP/x8fH//////////////////////////////////////9H3/v/C9P7/o+7+/2fa+/8Oufb/CdL8/wnS/P8J0vz/CdL8/xiP7P8mS9z/Jkvc/wAAAAAlSdy/Jkvc/yZM3P8lTNy/AAAAACZJ2e8mTNz/Jkzc/yZM3P8mTNz/iJTB////////////qnth/5VaOf/x6eX///////////////////////Hp5f/x6eX/ydL2/yZM3P8kVN7/G37o/xKo8v8QsfT/HXbm/yZM3P8mSdnvAAAAACVM3L8mTNz/I0vc3yZJ2u8AAAAAJUzevyZM3f8mTN3/Jkzd/yZM3f+fqc3///////////+VWjn/v5yI/+re1///////////////////////jk8s/7iRe//J0vb/Jkzd/yZM3f8mTN3/Jkzd/yZM3f8mTN3/Jkzd/yVM3r8AAAAAI0vc3yNL3N8kTd2vJk3d/yhQ3yAlTd2PJk3d/yZN3f8mTd3/Jk3d/6St0v////////////Hp5f/q3tf///////////////////////////+xhm7/49PK/6Cx8P8mTd3/Jk3d/yZN3f8mTd3/Jk3d/yZN3f8mTd3/JU3djyhQ3yAmTd3/JE3drydN33AmTd7/J03fcCVK3zAmTd7/Jk3e/yZN3v8mTd7/pK7S///////Sp5r/////////////////////////////////////////////////T27k/yZN3v8mTd7/Jk3e/yZN3v8mTd7/Jk3e/yZN3v8lSt8wJ03fcCZN3v8nTd9wKFDfICZO3/8mTt3PAAAAACVN3r8mTt//Jk7f/yZO3/+EltX//////+fRyv/SqaD/59LO///////////////////////at63/vIBy/7Glxf8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8mTt//JU3evwAAAAAmTt3PJk7f/yhQ3yAAAAAAJE/dryZO3/8oUN9AKFDfQCZO3/8mTt//Jk7f/zhb2v/o6/T/////////////////////////////////////////////////XHrn/yZO3/8mTt//Jk7f/yZO3/8mTt//Jk7f/yZO3/8oUN9AKFDfQCZO3/8kT92vAAAAAAAAAAAoUN9AJk7g/yZO4M8AAAAAJk/hnyZO4P8mTuD/Jk7g/05v5v/k6fv//////////////////////////////////////3eR7P8mTuD/Jk7g/yZO4P8mTuD/Jk7g/yZO4P8mTuD/Jk/hnwAAAAAmTuDPJk7g/yhQ30AAAAAAAAAAAAAAAAAjT+GfJU/h/yVO4Y8gUN8QIk7gzyVP4f8lT+H/SWnW/0lp1v+bq+H/8fHx/////////////////6Cy8v9OcOb/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yJO4M8gUN8QJU7hjyVP4f8jT+GfAAAAAAAAAAAAAAAAAAAAACBQ3xAlTOHvJU/h/yVQ4mAgUN8QIk7hzyVP4f+ktOv///////////////////////H0/f9phur/JU/h/yVP4f8lT+H/JU/h/yVP4f8lT+H/JU/h/yVP4f8iTuHPIFDfECVQ4mAlT+H/JUzh7yBQ3xAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ3zAlUOLvJVDi/yVQ4mAgUN8QI1Din4mb2//J0/j/ydP4/6299P93ku3/M1vk/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/I1DinyBQ3xAlUOJgJVDi/yVQ4u8lUN8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAlUOLvJVDi/yVQ4o8AAAAAJFDjQCVQ4r8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDi/yVQ4v8lUOL/JVDivyRQ40AAAAAAJVDijyVQ4v8lUOLvJVDkMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACVQ5DAjUeTfJVHj/yNR5N8kUONAAAAAACVQ5DAmUuOAJVHivyNR5N8lUeP/JVHj/yNR5N8lUeK/JlLjgCVQ5DAAAAAAJFDjQCNR5N8lUeP/I1Hk3yVQ5DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBQ3xAjUuSfJVHk/yVR5P8jUeTfJFLkcChQ5yAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoUOcgJFLkcCNR5N8lUeT/JVHk/yNS5J8gUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkUONAI1LknyVS5P8lUuT/JVLk/yVS5O8lUeS/JVHkvyVR5L8lUeS/JVLk7yVS5P8lUuT/JVLk/yRS468kUONAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIFDfECVS5GAjUuWfIlPlzyVS5f8lUuX/JVLl/yVS5f8iU+XPI1LlnyVS5GAgUN8QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/ggBB/wgAEP4AAAB8AAAAPAAAADiAAAEYAAAAEQAAAIAAAAAAAAAAAgAAAEIAAABCAAAAQgAAAEIAAABCAAAAQAAAAAAAAAABAAAAiAAAABiAAAEcAAAAPAAAAD4AAAB/CAAQ/4IAQf/AfgP/8AAP//wAP/",
- _urls : [
+ _urls: [
{
type: "text/html",
method: "GET",
template: "https://duckduckgo.com/",
params: [
{
name: "q",
value: "{searchTerms}",
@@ -58,17 +58,17 @@ function test() {
{
name: "t",
value: "ffcm",
purpose: "contextmenu",
},
{
name: "t",
value: "ffab",
- purpose:"keyword",
+ purpose: "keyword",
},
{
name: "t",
value: "ffsb",
purpose: "searchbar",
},
{
name: "t",
--- a/browser/components/search/test/browser_google.js
+++ b/browser/components/search/test/browser_google.js
@@ -45,17 +45,17 @@ function test() {
name: "Google",
alias: null,
description: "Google Search",
searchForm: "https://www.google.com/search?q=&ie=utf-8&oe=utf-8",
hidden: false,
wrappedJSObject: {
queryCharset: "UTF-8",
"_iconURL": "data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///zD9/f2W/f392P39/fn9/f35/f391/39/ZT+/v4uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Cf39/Zn///////////////////////////////////////////39/ZX///8IAAAAAAAAAAAAAAAA/v7+Cf39/cH/////+v35/7TZp/92ul3/WKs6/1iqOv9yuFn/rNWd//j79v///////f39v////wgAAAAAAAAAAP39/Zn/////7PXp/3G3WP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP+Or1j//vDo///////9/f2VAAAAAP///zD/////+vz5/3G3V/9TqDT/WKo6/6LQkf/U6cz/1urO/6rUm/+Zo0r/8IZB//adZ////v7///////7+/i79/f2Y/////4nWzf9Lqkj/Vqo4/9Xqzv///////////////////////ebY//SHRv/0hUL//NjD///////9/f2U/f392v////8sxPH/Ebzt/43RsP/////////////////////////////////4roL/9IVC//i1jf///////f391/39/fr/////Cr37/wW8+/+16/7/////////////////9IVC//SFQv/0hUL/9IVC//SFQv/3pnX///////39/fn9/f36/////wu++/8FvPv/tuz+//////////////////SFQv/0hUL/9IVC//SFQv/0hUL/96p7///////9/f35/f392/////81yfz/CrL5/2uk9v///////////////////////////////////////////////////////f392P39/Zn/////ks/7/zdS7P84Rur/0NT6///////////////////////9/f////////////////////////39/Zb+/v4y//////n5/v9WYu3/NUPq/ztJ6/+VnPT/z9L6/9HU+v+WnfT/Ul7t/+Hj/P////////////////////8wAAAAAP39/Z3/////6Or9/1hj7v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9sdvD////////////9/f2YAAAAAAAAAAD///8K/f39w//////5+f7/paz2/11p7v88Suv/Okfq/1pm7v+iqfX/+fn+///////9/f3B/v7+CQAAAAAAAAAAAAAAAP///wr9/f2d///////////////////////////////////////////9/f2Z/v7+CQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f2Z/f392/39/fr9/f36/f392v39/Zj///8wAAAAAAAAAAAAAAAAAAAAAPAPAADAAwAAgAEAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/g3+/v5X/f39mf39/cj9/f3q/f39+f39/fn9/f3q/f39yP39/Zn+/v5W////DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f2c/f399f/////////////////////////////////////////////////////9/f31/f39mv7+/iMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/gn9/f2K/f39+////////////////////////////////////////////////////////////////////////////f39+v39/Yf///8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4k/f390v////////////////////////////////////////////////////////////////////////////////////////////////39/dD///8iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////MP39/er//////////////////////////+r05v+v16H/gsBs/2WxSf9Wqjj/Vqk3/2OwRv99vWX/pdKV/97u2P////////////////////////////39/ej+/v4vAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f3q/////////////////////+v15/+Pxnv/VKk2/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/36+Z//d7tf///////////////////////39/ej///8iAAAAAAAAAAAAAAAAAAAAAAAAAAD///8K/f390//////////////////////E4bn/XKw+/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1apN/+x0pv///////////////////////39/dD///8IAAAAAAAAAAAAAAAAAAAAAP39/Yv/////////////////////sdij/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/YKU1/8qOPv/5wZ////////////////////////39/YcAAAAAAAAAAAAAAAD+/v4l/f39+////////////////8Lgt/9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9utlT/n86N/7faqv+426v/pdKV/3u8ZP9UqDX/U6g0/3egN//jiUH/9IVC//SFQv/82MP//////////////////f39+v7+/iMAAAAAAAAAAP39/Z3////////////////q9Ob/W6w+/1OoNP9TqDT/U6g0/1OoNP9nskz/zOXC/////////////////////////////////+Dv2v+osWP/8YVC//SFQv/0hUL/9IVC//WQVP/++fb//////////////////f39mgAAAAD+/v4O/f399v///////////////4LHj/9TqDT/U6g0/1OoNP9TqDT/dblc//L58P/////////////////////////////////////////////8+v/3p3f/9IVC//SFQv/0hUL/9IVC//rIqf/////////////////9/f31////DP7+/ln////////////////f9v7/Cbz2/zOwhv9TqDT/U6g0/2KwRv/v9+z///////////////////////////////////////////////////////738//1kFT/9IVC//SFQv/0hUL/9plg///////////////////////+/v5W/f39nP///////////////4jf/f8FvPv/Bbz7/yG1s/9QqDz/vN2w//////////////////////////////////////////////////////////////////rHqP/0hUL/9IVC//SFQv/0hUL//vDn//////////////////39/Zn9/f3L////////////////R878/wW8+/8FvPv/Bbz7/y7C5P/7/fr//////////////////////////////////////////////////////////////////ere//SFQv/0hUL/9IVC//SFQv/718H//////////////////f39yP39/ez///////////////8cwvv/Bbz7/wW8+/8FvPv/WNL8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//rIqv/////////////////9/f3q/f39+v///////////////we9+/8FvPv/Bbz7/wW8+/993P3///////////////////////////////////////SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/+cGf//////////////////39/fn9/f36////////////////B737/wW8+/8FvPv/Bbz7/33c/f//////////////////////////////////////9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/6xaX//////////////////f39+f39/e3///////////////8cwvv/Bbz7/wW8+/8FvPv/WdP8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//vVv//////////////////9/f3q/f39y////////////////0bN/P8FvPv/Bbz7/wW8+/8hrvn/+/v///////////////////////////////////////////////////////////////////////////////////////////////////////////////////39/cj9/f2c////////////////ht/9/wW8+/8FvPv/FZP1/zRJ6/+zuPf//////////////////////////////////////////////////////////////////////////////////////////////////////////////////f39mf7+/lr////////////////d9v7/B7n7/yB38f81Q+r/NUPq/0hV7P/u8P3////////////////////////////////////////////////////////////////////////////////////////////////////////////+/v5X////D/39/ff///////////////9tkPT/NUPq/zVD6v81Q+r/NUPq/2Fs7//y8v7////////////////////////////////////////////09f7//////////////////////////////////////////////////f399f7+/g0AAAAA/f39n////////////////+Tm/P89Suv/NUPq/zVD6v81Q+r/NUPq/1Bc7f/IzPn/////////////////////////////////x8v5/0xY7P+MlPP////////////////////////////////////////////9/f2cAAAAAAAAAAD+/v4n/f39/P///////////////7W69/81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9ZZe7/k5v0/6609/+vtff/lJv0/1pm7v81Q+r/NUPq/zVD6v+GjvL//v7//////////////////////////////f39+/7+/iQAAAAAAAAAAAAAAAD9/f2N/////////////////////6Cn9f81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v+BivL////////////////////////////9/f2KAAAAAAAAAAAAAAAAAAAAAP7+/gv9/f3V/////////////////////7W69/8+S+v/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/P0zr/7q/+P///////////////////////f390v7+/gkAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3r/////////////////////+Xn/P94gfH/NkTq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NkTq/3Z/8f/l5/z///////////////////////39/er+/v4kAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f3r///////////////////////////k5vz/nqX1/2p08P9IVez/OEbq/zdF6v9GU+z/aHLv/5qh9f/i5Pz////////////////////////////9/f3q////MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3V/////////////////////////////////////////////////////////////////////////////////////////////////f390v7+/iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wr9/f2N/f39/P///////////////////////////////////////////////////////////////////////////f39+/39/Yv+/v4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4n/f39n/39/ff//////////////////////////////////////////////////////f399v39/Z3+/v4lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Dv7+/lr9/f2c/f39y/39/e39/f36/f39+v39/ez9/f3L/f39nP7+/ln+/v4OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/gAAB/wAAAP4AAAB8AAAAPAAAADgAAAAYAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAAAAcAAAAPAAAAD4AAAB/AAAA/4AAAf/AAAP/8AAP//wAP/",
- _urls : [
+ _urls: [
{
type: "application/x-suggestions+json",
method: "GET",
template: "https://www.google.com/complete/search?client=firefox&q={searchTerms}",
params: "",
},
{
type: "text/html",
--- a/browser/components/search/test/browser_yahoo.js
+++ b/browser/components/search/test/browser_yahoo.js
@@ -43,17 +43,17 @@ function test() {
name: "Yahoo",
alias: null,
description: "Yahoo Search",
searchForm: "https://search.yahoo.com/yhs/search?p=&ei=UTF-8&hspart=mozilla&hsimp=yhs-001",
hidden: false,
wrappedJSObject: {
queryCharset: "UTF-8",
"_iconURL": "resource://search-plugins/images/yahoo.ico",
- _urls : [
+ _urls: [
{
type: "application/x-suggestions+json",
method: "GET",
template: "https://search.yahoo.com/sugg/ff",
params: [
{
name: "output",
value: "fxjson",
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -4453,30 +4453,30 @@ var SessionStoreInternal = {
/**
* Replace "Loading..." with the tab label (with minimal side-effects)
* @param aString is the string the title is stored in
* @param aTabbrowser is a tabbrowser object, containing aTab
* @param aTab is the tab whose title we're updating & using
*
* @returns aString that has been updated with the new title
*/
- _replaceLoadingTitle : function ssi_replaceLoadingTitle(aString, aTabbrowser, aTab) {
+ _replaceLoadingTitle: function ssi_replaceLoadingTitle(aString, aTabbrowser, aTab) {
if (aString == aTabbrowser.mStringBundle.getString("tabs.connecting")) {
aTabbrowser.setTabTitle(aTab);
[aString, aTab.label] = [aTab.label, aString];
}
return aString;
},
/**
* Resize this._closedWindows to the value of the pref, except in the case
* where we don't have any non-popup windows on Windows and Linux. Then we must
* resize such that we have at least one non-popup window.
*/
- _capClosedWindows : function ssi_capClosedWindows() {
+ _capClosedWindows: function ssi_capClosedWindows() {
if (this._closedWindows.length <= this._max_windows_undo)
return;
let spliceTo = this._max_windows_undo;
if (AppConstants.platform != "macosx") {
let normalWindowIndex = 0;
// try to find a non-popup window in this._closedWindows
while (normalWindowIndex < this._closedWindows.length &&
!!this._closedWindows[normalWindowIndex].isPopup)
--- a/browser/components/sessionstore/nsSessionStartup.js
+++ b/browser/components/sessionstore/nsSessionStartup.js
@@ -334,15 +334,15 @@ SessionStartup.prototype = {
/**
* Get whether the previous session crashed.
*/
get previousSessionCrashed() {
return this._previousSessionCrashed;
},
/* ........ QueryInterface .............. */
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference,
- Ci.nsISessionStartup]),
- classID: Components.ID("{ec7a6c20-e081-11da-8ad9-0800200c9a66}")
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference,
+ Ci.nsISessionStartup]),
+ classID: Components.ID("{ec7a6c20-e081-11da-8ad9-0800200c9a66}")
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SessionStartup]);
--- a/browser/components/sessionstore/test/browser_394759_purge.js
+++ b/browser/components/sessionstore/test/browser_394759_purge.js
@@ -30,17 +30,17 @@ function test() {
let oldState_wins = JSON.parse(oldState).windows.length;
if (oldState_wins != 1)
ok(false, "oldState in test_purge has " + oldState_wins + " windows instead of 1");
// create a new state for testing
const REMEMBER = Date.now(), FORGET = Math.random();
let testState = {
windows: [ { tabs: [{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64 }] }], selected: 1 } ],
- _closedWindows : [
+ _closedWindows: [
// _closedWindows[0]
{
tabs: [
{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64, title: REMEMBER }] },
{ entries: [{ url: "http://mozilla.org/", triggeringPrincipal_base64, title: FORGET }] }
],
selected: 2,
title: "mozilla.org",
--- a/browser/components/sessionstore/test/browser_465223.js
+++ b/browser/components/sessionstore/test/browser_465223.js
@@ -13,17 +13,17 @@ function test() {
let uniqueValue1 = "unik" + Date.now();
let uniqueValue2 = "pi != " + Math.random();
// open a window and set a value on it
let newWin = openDialog(location, "_blank", "chrome,all,dialog=no");
promiseWindowLoaded(newWin).then(() => {
ss.setWindowValue(newWin, uniqueKey1, uniqueValue1);
- let newState = { windows: [{ tabs:[{ entries: [] }], extData: {} }] };
+ let newState = { windows: [{ tabs: [{ entries: [] }], extData: {} }] };
newState.windows[0].extData[uniqueKey2] = uniqueValue2;
ss.setWindowState(newWin, JSON.stringify(newState), false);
is(newWin.gBrowser.tabs.length, 2,
"original tab wasn't overwritten");
is(ss.getWindowValue(newWin, uniqueKey1), uniqueValue1,
"window value wasn't overwritten when the tabs weren't");
is(ss.getWindowValue(newWin, uniqueKey2), uniqueValue2,
--- a/browser/components/sessionstore/test/browser_491577.js
+++ b/browser/components/sessionstore/test/browser_491577.js
@@ -6,17 +6,17 @@ function test() {
/** Test for Bug 491577 **/
// test setup
waitForExplicitFinish();
const REMEMBER = Date.now(), FORGET = Math.random();
let test_state = {
windows: [ { tabs: [{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64 }] }], selected: 1 } ],
- _closedWindows : [
+ _closedWindows: [
// _closedWindows[0]
{
tabs: [
{ entries: [{ url: "http://example.com/", triggeringPrincipal_base64, title: "title" }] },
{ entries: [{ url: "http://mozilla.org/", triggeringPrincipal_base64, title: "title" }] }
],
selected: 2,
title: FORGET,
--- a/browser/components/sessionstore/test/browser_500328.js
+++ b/browser/components/sessionstore/test/browser_500328.js
@@ -19,17 +19,17 @@ let checkState = Task.async(function*(br
if (popStateCount == 0) {
popStateCount++;
ok(aEvent.state, "Event should have a state property.");
ContentTask.spawn(browser, null, function() {
is(content.testState, "foo",
"testState after going back");
- is(JSON.stringify(content.history.state), JSON.stringify({obj1:1}),
+ is(JSON.stringify(content.history.state), JSON.stringify({obj1: 1}),
"first popstate object.");
// Add a node with id "new-elem" to the document.
let doc = content.document;
ok(!doc.getElementById("new-elem"),
"doc shouldn't contain new-elem before we add it.");
let elem = doc.createElement("div");
elem.id = "new-elem";
@@ -90,19 +90,19 @@ add_task(function* test() {
// After these push/replaceState calls, the window should have three
// history entries:
// testURL (state object: null) <-- oldest
// testURL (state object: {obj1:1})
// testURL?page2 (state object: {obj3:/^a$/}) <-- newest
function contentTest() {
let history = content.window.history;
- history.pushState({obj1:1}, "title-obj1");
- history.pushState({obj2:2}, "title-obj2", "?page2");
- history.replaceState({obj3:/^a$/}, "title-obj3");
+ history.pushState({obj1: 1}, "title-obj1");
+ history.pushState({obj2: 2}, "title-obj2", "?page2");
+ history.replaceState({obj3: /^a$/}, "title-obj3");
}
yield ContentTask.spawn(browser, null, contentTest);
yield TabStateFlusher.flush(browser);
state = ss.getTabState(gBrowser.getTabForBrowser(browser));
});
// Restore the state into a new tab. Things don't work well when we
--- a/browser/components/sessionstore/test/browser_595601-restore_hidden.js
+++ b/browser/components/sessionstore/test/browser_595601-restore_hidden.js
@@ -1,20 +1,20 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-var windowState = {windows:[{tabs:[
- {entries:[{url:"http://example.com#1", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#2", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#3", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#4", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#5", triggeringPrincipal_base64}], hidden: true},
- {entries:[{url:"http://example.com#6", triggeringPrincipal_base64}], hidden: true},
- {entries:[{url:"http://example.com#7", triggeringPrincipal_base64}], hidden: true},
- {entries:[{url:"http://example.com#8", triggeringPrincipal_base64}], hidden: true}
+var windowState = {windows: [{tabs: [
+ {entries: [{url: "http://example.com#1", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#2", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#3", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#4", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#5", triggeringPrincipal_base64}], hidden: true},
+ {entries: [{url: "http://example.com#6", triggeringPrincipal_base64}], hidden: true},
+ {entries: [{url: "http://example.com#7", triggeringPrincipal_base64}], hidden: true},
+ {entries: [{url: "http://example.com#8", triggeringPrincipal_base64}], hidden: true}
]}]};
function test() {
waitForExplicitFinish();
requestLongerTimeout(2);
registerCleanupFunction(function() {
Services.prefs.clearUserPref("browser.sessionstore.restore_hidden_tabs");
--- a/browser/components/sessionstore/test/browser_600545.js
+++ b/browser/components/sessionstore/test/browser_600545.js
@@ -26,17 +26,17 @@ function testBug600545() {
// and browser.sessionstore.resume_from_crash preference is false,
// tab session data for non-active window is stripped for non-pinned
// tabs. This occurs after "sessionstore-state-write-complete"
// fires which will only fire in this case if there is at least one
// pinned tab.
let state = { windows: [
{
tabs: [
- { entries: [{ url: "http://example.org#0", triggeringPrincipal_base64 }], pinned:true },
+ { entries: [{ url: "http://example.org#0", triggeringPrincipal_base64 }], pinned: true },
{ entries: [{ url: "http://example.com#1", triggeringPrincipal_base64 }] },
{ entries: [{ url: "http://example.com#2", triggeringPrincipal_base64 }] },
],
selected: 2
},
{
tabs: [
{ entries: [{ url: "http://example.com#3", triggeringPrincipal_base64 }] },
--- a/browser/components/sessionstore/test/browser_636279.js
+++ b/browser/components/sessionstore/test/browser_636279.js
@@ -1,22 +1,22 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
var stateBackup = ss.getBrowserState();
-var statePinned = {windows:[{tabs:[
- {entries:[{url:"http://example.com#1", triggeringPrincipal_base64}], pinned: true}
+var statePinned = {windows: [{tabs: [
+ {entries: [{url: "http://example.com#1", triggeringPrincipal_base64}], pinned: true}
]}]};
-var state = {windows:[{tabs:[
- {entries:[{url:"http://example.com#1", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#2", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#3", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#4", triggeringPrincipal_base64}]},
+var state = {windows: [{tabs: [
+ {entries: [{url: "http://example.com#1", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#2", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#3", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#4", triggeringPrincipal_base64}]},
]}]};
function test() {
waitForExplicitFinish();
registerCleanupFunction(function() {
TabsProgressListener.uninit();
ss.setBrowserState(stateBackup);
--- a/browser/components/sessionstore/test/browser_662743.js
+++ b/browser/components/sessionstore/test/browser_662743.js
@@ -14,29 +14,29 @@ function test() {
let testTabCount = 0;
let formData = [
// default case
{ },
// new format
// index doesn't match value (testing an option in between (two))
- { id:{ "select_id": {"selectedIndex":0, "value":"val2"} } },
+ { id: { "select_id": {"selectedIndex": 0, "value": "val2"} } },
// index doesn't match value (testing an invalid value)
- { id:{ "select_id": {"selectedIndex":4, "value":"val8"} } },
+ { id: { "select_id": {"selectedIndex": 4, "value": "val8"} } },
// index doesn't match value (testing an invalid index)
- { id:{ "select_id": {"selectedIndex":8, "value":"val5"} } },
+ { id: { "select_id": {"selectedIndex": 8, "value": "val5"} } },
// index and value match position zero
- { id:{ "select_id": {"selectedIndex":0, "value":"val0"} }, xpath: {} },
+ { id: { "select_id": {"selectedIndex": 0, "value": "val0"} }, xpath: {} },
// index doesn't match value (testing the last option (seven))
- { id:{}, "xpath":{ "/xhtml:html/xhtml:body/xhtml:select[@name='select_name']": {"selectedIndex":1, "value":"val7"} } },
+ { id: {}, "xpath": { "/xhtml:html/xhtml:body/xhtml:select[@name='select_name']": {"selectedIndex": 1, "value": "val7"} } },
// index and value match the default option "selectedIndex":3,"value":"val3"
- { xpath: { "/xhtml:html/xhtml:body/xhtml:select[@name='select_name']" : {"selectedIndex":3, "value":"val3"} } },
+ { xpath: { "/xhtml:html/xhtml:body/xhtml:select[@name='select_name']": {"selectedIndex": 3, "value": "val3"} } },
// index matches default option however it doesn't match value
- { id:{ "select_id": {"selectedIndex":3, "value":"val4"} } },
+ { id: { "select_id": {"selectedIndex": 3, "value": "val4"} } },
];
let expectedValues = [
null, // default value
"val2",
null, // default value (invalid value)
"val5", // value is still valid (even it has an invalid index)
"val0",
--- a/browser/components/sessionstore/test/browser_687710.js
+++ b/browser/components/sessionstore/test/browser_687710.js
@@ -5,17 +5,17 @@
//
// These cycles shouldn't be there in the first place, but they cause hangs
// when they mysteriously appear (bug 687710). Docshell code assumes this
// graph is a tree and tires to walk to the root. But if there's a cycle,
// there is no root, and we loop forever.
var stateBackup = ss.getBrowserState();
-var state = {windows:[{tabs:[{entries:[
+var state = {windows: [{tabs: [{entries: [
{
docIdentifier: 1,
url: "http://example.com",
triggeringPrincipal_base64,
children: [
{
docIdentifier: 2,
url: "http://example.com",
--- a/browser/components/sessionstore/test/browser_687710_2.js
+++ b/browser/components/sessionstore/test/browser_687710_2.js
@@ -2,17 +2,17 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
// Test that the fix for bug 687710 isn't too aggressive -- shentries which are
// cousins should be able to share bfcache entries.
var stateBackup = ss.getBrowserState();
-var state = {entries:[
+var state = {entries: [
{
docIdentifier: 1,
url: "http://example.com?1",
triggeringPrincipal_base64,
children: [{ docIdentifier: 10,
url: "http://example.com?10",
triggeringPrincipal_base64 }]
},
--- a/browser/components/sessionstore/test/browser_701377.js
+++ b/browser/components/sessionstore/test/browser_701377.js
@@ -1,14 +1,14 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
-var state = {windows:[{tabs:[
- {entries:[{url:"http://example.com#1", triggeringPrincipal_base64}]},
- {entries:[{url:"http://example.com#2", triggeringPrincipal_base64}], hidden: true}
+var state = {windows: [{tabs: [
+ {entries: [{url: "http://example.com#1", triggeringPrincipal_base64}]},
+ {entries: [{url: "http://example.com#2", triggeringPrincipal_base64}], hidden: true}
]}]};
function test() {
waitForExplicitFinish();
newWindowWithState(state, function(aWindow) {
let tab = aWindow.gBrowser.tabs[1];
ok(tab.hidden, "the second tab is hidden");
--- a/browser/components/sessionstore/test/browser_formdata_format.js
+++ b/browser/components/sessionstore/test/browser_formdata_format.js
@@ -5,35 +5,35 @@
function test() {
/** Tests formdata format **/
waitForExplicitFinish();
let formData = [
{ },
// old format
- { "#input1" : "value0" },
- { "#input1" : "value1", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value2" },
- { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value3" },
+ { "#input1": "value0" },
+ { "#input1": "value1", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value2" },
+ { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value3" },
// new format
- { id: { "input1" : "value4" } },
- { id: { "input1" : "value5" }, xpath: {} },
- { id: { "input1" : "value6" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value7" } },
- { id: {}, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value8" } },
- { xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value9" } },
+ { id: { "input1": "value4" } },
+ { id: { "input1": "value5" }, xpath: {} },
+ { id: { "input1": "value6" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value7" } },
+ { id: {}, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value8" } },
+ { xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value9" } },
// combinations
- { "#input1" : "value10", id: { "input1" : "value11" } },
- { "#input1" : "value12", id: { "input1" : "value13" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value14" } },
- { "#input1" : "value15", xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value16" } },
- { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value17", id: { "input1" : "value18" } },
- { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value19", id: { "input1" : "value20" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value21" } },
- { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value22", xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value23" } },
- { "#input1" : "value24", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value25", id: { "input1" : "value26" } },
- { "#input1" : "value27", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value28", id: { "input1" : "value29" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value30" } },
- { "#input1" : "value31", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value32", xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']" : "value33" } }
+ { "#input1": "value10", id: { "input1": "value11" } },
+ { "#input1": "value12", id: { "input1": "value13" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value14" } },
+ { "#input1": "value15", xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value16" } },
+ { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value17", id: { "input1": "value18" } },
+ { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value19", id: { "input1": "value20" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value21" } },
+ { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value22", xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value23" } },
+ { "#input1": "value24", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value25", id: { "input1": "value26" } },
+ { "#input1": "value27", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value28", id: { "input1": "value29" }, xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value30" } },
+ { "#input1": "value31", "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value32", xpath: { "/xhtml:html/xhtml:body/xhtml:input[@name='input2']": "value33" } }
]
let expectedValues = [
[ "", "" ],
// old format
[ "value0", "" ],
[ "value1", "value2" ],
[ "", "value3" ],
// new format
--- a/browser/components/sessionstore/test/browser_frame_history.js
+++ b/browser/components/sessionstore/test/browser_frame_history.js
@@ -18,22 +18,22 @@ add_task(function*() {
let browser_b = tab.linkedBrowser.contentDocument.getElementsByTagName("frame")[1];
let document_b = browser_b.contentDocument;
let links = document_b.getElementsByTagName("a");
// We're going to click on the first link, so listen for another load event
info("Clicking on link 1, 1 load should take place");
let promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
- EventUtils.sendMouseEvent({type:"click"}, links[0], browser_b.contentWindow);
+ EventUtils.sendMouseEvent({type: "click"}, links[0], browser_b.contentWindow);
yield promise;
info("Clicking on link 2, 1 load should take place");
promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
- EventUtils.sendMouseEvent({type:"click"}, links[1], browser_b.contentWindow);
+ EventUtils.sendMouseEvent({type: "click"}, links[1], browser_b.contentWindow);
yield promise;
info("Close then un-close page, 4 loads should take place");
yield promiseRemoveTab(tab);
let newTab = ss.undoCloseTab(window, 0);
yield waitForLoadsInBrowser(newTab.linkedBrowser, 4);
info("Go back in time, 1 load should take place");
@@ -63,22 +63,22 @@ add_task(function*() {
getElementById("iframe").contentDocument.
getElementsByTagName("frame")[1];
let document_b = browser_b.contentDocument;
let links = document_b.getElementsByTagName("a");
// We're going to click on the first link, so listen for another load event
info("iframe: Clicking on link 1, 1 load should take place");
let promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
- EventUtils.sendMouseEvent({type:"click"}, links[0], browser_b.contentWindow);
+ EventUtils.sendMouseEvent({type: "click"}, links[0], browser_b.contentWindow);
yield promise;
info("iframe: Clicking on link 2, 1 load should take place");
promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
- EventUtils.sendMouseEvent({type:"click"}, links[1], browser_b.contentWindow);
+ EventUtils.sendMouseEvent({type: "click"}, links[1], browser_b.contentWindow);
yield promise;
info("iframe: Close then un-close page, 5 loads should take place");
yield promiseRemoveTab(tab);
let newTab = ss.undoCloseTab(window, 0);
yield waitForLoadsInBrowser(newTab.linkedBrowser, 5);
info("iframe: Go back in time, 1 load should take place");
@@ -126,22 +126,22 @@ add_task(function*() {
getElementById("iframe").contentDocument.
getElementsByTagName("frame")[1];
let document_b = browser_b.contentDocument;
let links = document_b.getElementsByTagName("a");
// We're going to click on the first link, so listen for another load event
info("dynamic: Clicking on link 1, 1 load should take place");
let promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
- EventUtils.sendMouseEvent({type:"click"}, links[0], browser_b.contentWindow);
+ EventUtils.sendMouseEvent({type: "click"}, links[0], browser_b.contentWindow);
yield promise;
info("dynamic: Clicking on link 2, 1 load should take place");
promise = waitForLoadsInBrowser(tab.linkedBrowser, 1);
- EventUtils.sendMouseEvent({type:"click"}, links[1], browser_b.contentWindow);
+ EventUtils.sendMouseEvent({type: "click"}, links[1], browser_b.contentWindow);
yield promise;
info("Check in the state that we have not stored this history");
let state = ss.getBrowserState();
info(JSON.stringify(JSON.parse(state), null, "\t"));
is(state.indexOf("c1.html"), -1, "History entry was not stored in the session state");
gBrowser.removeTab(tab);
});
--- a/browser/components/sessionstore/test/browser_windowStateContainer.js
+++ b/browser/components/sessionstore/test/browser_windowStateContainer.js
@@ -90,17 +90,17 @@ add_task(function* () {
for (let i = 0; i < 2; i++) {
Assert.equal(winState.windows[0].tabs[i].userContextId, i,
"1st Window: tabs[" + i + "].userContextId should be " + i);
}
let win2 = yield BrowserTestUtils.openNewBrowserWindow();
- let tab2 = win2.gBrowser.addTab("http://example.com/", { userContextId : 1 });
+ let tab2 = win2.gBrowser.addTab("http://example.com/", { userContextId: 1 });
yield promiseBrowserLoaded(tab2.linkedBrowser);
yield TabStateFlusher.flush(tab2.linkedBrowser);
// Move the first normal tab to end, so the first tab of win2 will be a
// container tab.
win2.gBrowser.moveTabTo(win2.gBrowser.tabs[0], win2.gBrowser.tabs.length - 1);
yield TabStateFlusher.flush(win2.gBrowser.tabs[0].linkedBrowser);
--- a/browser/components/sessionstore/test/unit/test_histogram_corrupt_files.js
+++ b/browser/components/sessionstore/test/unit/test_histogram_corrupt_files.js
@@ -68,17 +68,17 @@ add_task(function* test_no_files_exist()
* Makes sure that the histogram is negatively updated when at least one
* backup file is not corrupted.
*/
add_task(function* test_one_file_valid() {
// Corrupting some backup files.
let invalidSession = "data/sessionstore_invalid.js";
let validSession = "data/sessionstore_valid.js";
reset_session({
- clean : invalidSession,
+ clean: invalidSession,
cleanBackup: validSession,
recovery: invalidSession,
recoveryBackup: invalidSession
});
yield SessionFile.read();
// Checking if the histogram is updated negatively.
let h = Telemetry.getHistogramById(HistogramId);
@@ -90,17 +90,17 @@ add_task(function* test_one_file_valid()
/**
* Makes sure that the histogram is positively updated when all
* backup files are corrupted.
*/
add_task(function* test_all_files_corrupt() {
// Corrupting all backup files.
let invalidSession = "data/sessionstore_invalid.js";
reset_session({
- clean : invalidSession,
+ clean: invalidSession,
cleanBackup: invalidSession,
recovery: invalidSession,
recoveryBackup: invalidSession
});
yield SessionFile.read();
// Checking if the histogram is positively updated.
let h = Telemetry.getHistogramById(HistogramId);
--- a/browser/components/shell/content/setDesktopBackground.js
+++ b/browser/components/shell/content/setDesktopBackground.js
@@ -2,22 +2,22 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
Components.utils.import("resource://gre/modules/AppConstants.jsm");
var Ci = Components.interfaces;
var gSetBackground = {
- _position : AppConstants.platform == "macosx" ? "STRETCH" : "",
- _backgroundColor : AppConstants.platform != "macosx" ? 0 : undefined,
- _screenWidth : 0,
- _screenHeight : 0,
- _image : null,
- _canvas : null,
+ _position: AppConstants.platform == "macosx" ? "STRETCH" : "",
+ _backgroundColor: AppConstants.platform != "macosx" ? 0 : undefined,
+ _screenWidth: 0,
+ _screenHeight: 0,
+ _image: null,
+ _canvas: null,
get _shell() {
return Components.classes["@mozilla.org/browser/shell-service;1"]
.getService(Ci.nsIShellService);
},
load() {
this._canvas = document.getElementById("screen");
--- a/browser/components/translation/Translation.jsm
+++ b/browser/components/translation/Translation.jsm
@@ -83,18 +83,18 @@ this.Translation = {
Cu.import("resource:///modules/RecentWindow.jsm");
RecentWindow.getMostRecentBrowserWindow().openUILinkIn(attribution, "tab");
},
/**
* The list of translation engines and their attributions.
*/
supportedEngines: {
- "bing" : "http://aka.ms/MicrosoftTranslatorAttribution",
- "yandex" : "http://translate.yandex.com/"
+ "bing": "http://aka.ms/MicrosoftTranslatorAttribution",
+ "yandex": "http://translate.yandex.com/"
},
/**
* Fallback engine (currently Bing Translator) if the preferences seem
* confusing.
*/
get defaultEngine() {
return this.supportedEngines.keys[0];
@@ -298,28 +298,28 @@ TranslationUI.prototype = {
*/
this.TranslationTelemetry = {
init() {
// Constructing histograms.
const plain = (id) => Services.telemetry.getHistogramById(id);
const keyed = (id) => Services.telemetry.getKeyedHistogramById(id);
this.HISTOGRAMS = {
- OPPORTUNITIES : () => plain("TRANSLATION_OPPORTUNITIES"),
- OPPORTUNITIES_BY_LANG : () => keyed("TRANSLATION_OPPORTUNITIES_BY_LANGUAGE"),
- PAGES : () => plain("TRANSLATED_PAGES"),
- PAGES_BY_LANG : () => keyed("TRANSLATED_PAGES_BY_LANGUAGE"),
- CHARACTERS : () => plain("TRANSLATED_CHARACTERS"),
- DENIED : () => plain("DENIED_TRANSLATION_OFFERS"),
- AUTO_REJECTED : () => plain("AUTO_REJECTED_TRANSLATION_OFFERS"),
- SHOW_ORIGINAL : () => plain("REQUESTS_OF_ORIGINAL_CONTENT"),
- TARGET_CHANGES : () => plain("CHANGES_OF_TARGET_LANGUAGE"),
- DETECTION_CHANGES : () => plain("CHANGES_OF_DETECTED_LANGUAGE"),
- SHOW_UI : () => plain("SHOULD_TRANSLATION_UI_APPEAR"),
- DETECT_LANG : () => plain("SHOULD_AUTO_DETECT_LANGUAGE"),
+ OPPORTUNITIES: () => plain("TRANSLATION_OPPORTUNITIES"),
+ OPPORTUNITIES_BY_LANG: () => keyed("TRANSLATION_OPPORTUNITIES_BY_LANGUAGE"),
+ PAGES: () => plain("TRANSLATED_PAGES"),
+ PAGES_BY_LANG: () => keyed("TRANSLATED_PAGES_BY_LANGUAGE"),
+ CHARACTERS: () => plain("TRANSLATED_CHARACTERS"),
+ DENIED: () => plain("DENIED_TRANSLATION_OFFERS"),
+ AUTO_REJECTED: () => plain("AUTO_REJECTED_TRANSLATION_OFFERS"),
+ SHOW_ORIGINAL: () => plain("REQUESTS_OF_ORIGINAL_CONTENT"),
+ TARGET_CHANGES: () => plain("CHANGES_OF_TARGET_LANGUAGE"),
+ DETECTION_CHANGES: () => plain("CHANGES_OF_DETECTED_LANGUAGE"),
+ SHOW_UI: () => plain("SHOULD_TRANSLATION_UI_APPEAR"),
+ DETECT_LANG: () => plain("SHOULD_AUTO_DETECT_LANGUAGE"),
};
// Capturing the values of flags at the startup.
this.recordPreferences();
},
/**
* Record a translation opportunity in the health report.
--- a/browser/components/translation/test/browser_translation_telemetry.js
+++ b/browser/components/translation/test/browser_translation_telemetry.js
@@ -5,28 +5,28 @@
var tmp = {};
Cu.import("resource:///modules/translation/Translation.jsm", tmp);
var {Translation, TranslationTelemetry} = tmp;
const Telemetry = Services.telemetry;
var MetricsChecker = {
HISTOGRAMS: {
- OPPORTUNITIES : Services.telemetry.getHistogramById("TRANSLATION_OPPORTUNITIES"),
- OPPORTUNITIES_BY_LANG : Services.telemetry.getKeyedHistogramById("TRANSLATION_OPPORTUNITIES_BY_LANGUAGE"),
- PAGES : Services.telemetry.getHistogramById("TRANSLATED_PAGES"),
- PAGES_BY_LANG : Services.telemetry.getKeyedHistogramById("TRANSLATED_PAGES_BY_LANGUAGE"),
- CHARACTERS : Services.telemetry.getHistogramById("TRANSLATED_CHARACTERS"),
- DENIED : Services.telemetry.getHistogramById("DENIED_TRANSLATION_OFFERS"),
- AUTO_REJECTED : Services.telemetry.getHistogramById("AUTO_REJECTED_TRANSLATION_OFFERS"),
- SHOW_ORIGINAL : Services.telemetry.getHistogramById("REQUESTS_OF_ORIGINAL_CONTENT"),
- TARGET_CHANGES : Services.telemetry.getHistogramById("CHANGES_OF_TARGET_LANGUAGE"),
- DETECTION_CHANGES : Services.telemetry.getHistogramById("CHANGES_OF_DETECTED_LANGUAGE"),
- SHOW_UI : Services.telemetry.getHistogramById("SHOULD_TRANSLATION_UI_APPEAR"),
- DETECT_LANG : Services.telemetry.getHistogramById("SHOULD_AUTO_DETECT_LANGUAGE"),
+ OPPORTUNITIES: Services.telemetry.getHistogramById("TRANSLATION_OPPORTUNITIES"),
+ OPPORTUNITIES_BY_LANG: Services.telemetry.getKeyedHistogramById("TRANSLATION_OPPORTUNITIES_BY_LANGUAGE"),
+ PAGES: Services.telemetry.getHistogramById("TRANSLATED_PAGES"),
+ PAGES_BY_LANG: Services.telemetry.getKeyedHistogramById("TRANSLATED_PAGES_BY_LANGUAGE"),
+ CHARACTERS: Services.telemetry.getHistogramById("TRANSLATED_CHARACTERS"),
+ DENIED: Services.telemetry.getHistogramById("DENIED_TRANSLATION_OFFERS"),
+ AUTO_REJECTED: Services.telemetry.getHistogramById("AUTO_REJECTED_TRANSLATION_OFFERS"),
+ SHOW_ORIGINAL: Services.telemetry.getHistogramById("REQUESTS_OF_ORIGINAL_CONTENT"),
+ TARGET_CHANGES: Services.telemetry.getHistogramById("CHANGES_OF_TARGET_LANGUAGE"),
+ DETECTION_CHANGES: Services.telemetry.getHistogramById("CHANGES_OF_DETECTED_LANGUAGE"),
+ SHOW_UI: Services.telemetry.getHistogramById("SHOULD_TRANSLATION_UI_APPEAR"),
+ DETECT_LANG: Services.telemetry.getHistogramById("SHOULD_AUTO_DETECT_LANGUAGE"),
},
reset() {
for (let i of Object.keys(this.HISTOGRAMS)) {
this.HISTOGRAMS[i].clear();
}
this.updateMetrics();
},
@@ -175,19 +175,19 @@ add_task(function* setup() {
add_task(function* test_telemetry() {
// Translate a page.
yield translate("<h1>Привет, мир!</h1>", "ru");
// Translate another page.
yield translate("<h1>Hallo Welt!</h1><h1>Bratwurst!</h1>", "de");
yield MetricsChecker.checkAdditions({
opportunitiesCount: 2,
- opportunitiesCountByLang: { "ru" : 1, "de" : 1 },
+ opportunitiesCountByLang: { "ru": 1, "de": 1 },
pageCount: 1,
- pageCountByLang: { "de -> en" : 1 },
+ pageCountByLang: { "de -> en": 1 },
charCount: 21,
deniedOffers: 0
});
});
add_task(function* test_deny_translation_metric() {
function* offerAndDeny(elementAnonid) {
let tab = yield offerTranslationFor("<h1>Hallo Welt!</h1>", "de", "en");
@@ -271,21 +271,21 @@ add_task(function* test_never_offer_tran
gBrowser.removeTab(tab);
Services.prefs.clearUserPref("browser.translation.neverForLanguages");
});
add_task(function* test_translation_preferences() {
let preferenceChecks = {
- "browser.translation.ui.show" : [
+ "browser.translation.ui.show": [
{value: false, expected: {showUI: 0}},
{value: true, expected: {showUI: 1}}
],
- "browser.translation.detectLanguage" : [
+ "browser.translation.detectLanguage": [
{value: false, expected: {detectLang: 0}},
{value: true, expected: {detectLang: 1}}
],
};
for (let preference of Object.keys(preferenceChecks)) {
for (let check of preferenceChecks[preference]) {
MetricsChecker.reset();
--- a/browser/components/uitour/test/browser_UITour_defaultBrowser.js
+++ b/browser/components/uitour/test/browser_UITour_defaultBrowser.js
@@ -13,24 +13,24 @@ function MockShellService() {}
MockShellService.prototype = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIShellService]),
isDefaultBrowser(aStartupCheck, aForAllTypes) { return false; },
setDefaultBrowser(aClaimAllTypes, aForAllUsers) {
setDefaultBrowserCalled = true;
},
shouldCheckDefaultBrowser: false,
canSetDesktopBackground: false,
- BACKGROUND_TILE : 1,
- BACKGROUND_STRETCH : 2,
- BACKGROUND_CENTER : 3,
- BACKGROUND_FILL : 4,
- BACKGROUND_FIT : 5,
+ BACKGROUND_TILE: 1,
+ BACKGROUND_STRETCH: 2,
+ BACKGROUND_CENTER: 3,
+ BACKGROUND_FILL: 4,
+ BACKGROUND_FIT: 5,
setDesktopBackground(aElement, aPosition) {},
- APPLICATION_MAIL : 0,
- APPLICATION_NEWS : 1,
+ APPLICATION_MAIL: 0,
+ APPLICATION_NEWS: 1,
openApplication(aApplication) {},
desktopBackgroundColor: 0,
openApplicationWithURI(aApplication, aURI) {},
defaultFeedReader: 0,
};
var mockShellService = new MockObjectRegisterer("@mozilla.org/browser/shell-service;1",
MockShellService);
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -7,25 +7,25 @@
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/Preferences.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/UpdateUtils.jsm");
// The amount of people to be part of e10s
const TEST_THRESHOLD = {
- "beta" : 0.5, // 50%
- "release" : 1.0, // 100%
- "esr" : 1.0, // 100%
+ "beta": 0.5, // 50%
+ "release": 1.0, // 100%
+ "esr": 1.0, // 100%
};
const ADDON_ROLLOUT_POLICY = {
- "beta" : "51alladdons", // Any WebExtension or addon except with mpc = false
- "release" : "50allmpc",
- "esr" : "esrA", // WebExtensions and Addons with mpc=true
+ "beta": "51alladdons", // Any WebExtension or addon except with mpc = false
+ "release": "50allmpc",
+ "esr": "esrA", // WebExtensions and Addons with mpc=true
};
const PREF_COHORT_SAMPLE = "e10s.rollout.cohortSample";
const PREF_COHORT_NAME = "e10s.rollout.cohort";
const PREF_E10S_OPTED_IN = "browser.tabs.remote.autostart";
const PREF_E10S_FORCE_ENABLED = "browser.tabs.remote.force-enable";
const PREF_E10S_FORCE_DISABLED = "browser.tabs.remote.force-disable";
const PREF_TOGGLE_E10S = "browser.tabs.remote.autostart.2";
--- a/browser/extensions/pocket/content/main.js
+++ b/browser/extensions/pocket/content/main.js
@@ -392,22 +392,22 @@ var pktUI = (function() {
// Callback post initialization to tell background script that panel is "ready" for communication.
pktUIMessaging.addMessageListener(iframe, "listenerReady", function(panelId, data) {
});
pktUIMessaging.addMessageListener(iframe, "collapseSavePanel", function(panelId, data) {
if (!pktApi.isPremiumUser() && !isInOverflowMenu())
- resizePanel({width:savePanelWidth, height:savePanelHeights.collapsed});
+ resizePanel({width: savePanelWidth, height: savePanelHeights.collapsed});
});
pktUIMessaging.addMessageListener(iframe, "expandSavePanel", function(panelId, data) {
if (!isInOverflowMenu())
- resizePanel({width:savePanelWidth, height:savePanelHeights.expanded});
+ resizePanel({width: savePanelWidth, height: savePanelHeights.expanded});
});
// Ask for recently accessed/used tags for auto complete
var _getTagsMessageId = "getTags";
pktUIMessaging.addMessageListener(iframe, _getTagsMessageId, function(panelId, data) {
pktApi.getTags(function(tags, usedTags) {
pktUIMessaging.sendResponseMessageToPanel(panelId, _getTagsMessageId, {
tags,
--- a/browser/extensions/pocket/content/panels/js/saved.js
+++ b/browser/extensions/pocket/content/panels/js/saved.js
@@ -154,17 +154,17 @@ var PKT_SAVED_OVERLAY = function(options
emptyInputLength: 200,
search_function(term, cb) {
var returnlist = [];
if (term.length) {
var limit = 15;
var r = new RegExp("^" + term);
for (var i = 0; i < myself.userTags.length; i++) {
if (r.test(myself.userTags[i]) && limit > 0) {
- returnlist.push({name:myself.userTags[i]});
+ returnlist.push({name: myself.userTags[i]});
limit--;
}
}
}
if (!$(".token-input-dropdown-tag").data("init")) {
$(".token-input-dropdown-tag").css("width", inputwrapper.outerWidth()).data("init");
inputwrapper.append($(".token-input-dropdown-tag"));
}
@@ -177,30 +177,30 @@ var PKT_SAVED_OVERLAY = function(options
this.changestamp = Date.now();
setTimeout(function() {
$(".token-input-input-token input").val(text).focus();
}, 10);
}
return null;
}
myself.hideTagsError();
- return {name:myself.sanitizeText(text.toLowerCase())};
+ return {name: myself.sanitizeText(text.toLowerCase())};
},
onReady() {
$(".token-input-dropdown").addClass("token-input-dropdown-tag");
inputwrapper.find(".token-input-input-token input").attr("placeholder", $(".tag-input").attr("placeholder")).css("width", "200px");
if ($(".pkt_ext_suggestedtag_detail").length) {
myself.wrapper.find(".pkt_ext_suggestedtag_detail").on("click", ".token_tag", function(e) {
e.preventDefault();
var tag = $(e.target);
if ($(this).parents(".pkt_ext_suggestedtag_detail_disabled").length) {
return;
}
myself.justaddedsuggested = true;
- inputwrapper.find(".pkt_ext_tag_input").tokenInput("add", {id:inputwrapper.find(".token-input-token").length, name:tag.text()});
+ inputwrapper.find(".pkt_ext_tag_input").tokenInput("add", {id: inputwrapper.find(".token-input-token").length, name: tag.text()});
tag.addClass("token-suggestedtag-inactive");
$(".token-input-input-token input").focus();
});
}
$(".token-input-list").on("keydown", "input", function(e) {
if (e.which == 37) {
myself.updateSlidingTagList();
}
@@ -237,17 +237,17 @@ var PKT_SAVED_OVERLAY = function(options
});
$("body").on("keydown", function(e) {
var key = e.keyCode || e.which;
if (key == 8) {
var selected = $(".token-input-selected-token");
if (selected.length) {
e.preventDefault();
e.stopImmediatePropagation();
- inputwrapper.find(".pkt_ext_tag_input").tokenInput("remove", {name:selected.find("p").text()});
+ inputwrapper.find(".pkt_ext_tag_input").tokenInput("remove", {name: selected.find("p").text()});
}
} else if ($(e.target).parent().hasClass("token-input-input-token")) {
e.stopImmediatePropagation();
}
});
};
this.disableInput = function() {
this.wrapper.find(".pkt_ext_item_actions").addClass("pkt_ext_item_actions_disabled");
--- a/browser/extensions/webcompat-reporter/test/browser/webcompat.html
+++ b/browser/extensions/webcompat-reporter/test/browser/webcompat.html
@@ -30,17 +30,17 @@ function getBlobAsDataURL(blob) {
function setPreviewBG(backgroundData) {
return new Promise((resolve) => {
preview.style.background = `url(${backgroundData})`;
resolve();
});
}
function sendReceivedEvent() {
- window.dispatchEvent(new CustomEvent("ScreenshotReceived", {bubbles:true}));
+ window.dispatchEvent(new CustomEvent("ScreenshotReceived", {bubbles: true}));
}
window.addEventListener("message", function(event) {
if (event.data instanceof Blob) {
preview.innerText = "Pass";
}
getBlobAsDataURL(event.data).then(setPreviewBG).then(sendReceivedEvent);
--- a/browser/modules/FormSubmitObserver.jsm
+++ b/browser/modules/FormSubmitObserver.jsm
@@ -231,10 +231,10 @@ FormSubmitObserver.prototype =
if (this._content == null) {
return true;
}
let target = aEvent.originalTarget;
return (target == this._content.document ||
(target.ownerDocument && target.ownerDocument == this._content.document));
},
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver])
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver])
};
--- a/browser/modules/test/unit/test_DirectoryLinksProvider.js
+++ b/browser/modules/test/unit/test_DirectoryLinksProvider.js
@@ -25,17 +25,17 @@ XPCOMUtils.defineLazyModuleGetter(this,
XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
"resource://testing-common/PlacesTestUtils.jsm");
do_get_profile();
const DIRECTORY_LINKS_FILE = "directoryLinks.json";
const DIRECTORY_FRECENCY = 1000;
const SUGGESTED_FRECENCY = Infinity;
-const kURLData = {"directory": [{"url":"http://example.com", "title":"LocalSource"}]};
+const kURLData = {"directory": [{"url": "http://example.com", "title": "LocalSource"}]};
const kTestURL = "data:application/json," + JSON.stringify(kURLData);
// DirectoryLinksProvider preferences
const kLocalePref = DirectoryLinksProvider._observedPrefs.prefSelectedLocale;
const kSourceUrlPref = DirectoryLinksProvider._observedPrefs.linksURL;
const kPingUrlPref = "browser.newtabpage.directory.ping";
const kNewtabEnhancedPref = "browser.newtabpage.enhanced";
@@ -52,17 +52,17 @@ const kPingUrl = kBaseUrl + kPingPath;
// app/profile/firefox.js are not avaialble in xpcshell: hence, preset them
Services.prefs.setCharPref(kLocalePref, "en-US");
Services.prefs.setCharPref(kSourceUrlPref, kTestURL);
Services.prefs.setCharPref(kPingUrlPref, kPingUrl);
Services.prefs.setBoolPref(kNewtabEnhancedPref, true);
const kHttpHandlerData = {};
-kHttpHandlerData[kExamplePath] = {"directory": [{"url":"http://example.com", "title":"RemoteSource"}]};
+kHttpHandlerData[kExamplePath] = {"directory": [{"url": "http://example.com", "title": "RemoteSource"}]};
const BinaryInputStream = CC("@mozilla.org/binaryinputstream;1",
"nsIBinaryInputStream",
"setInputStream");
var gLastRequestPath;
var suggestedTile1 = {
@@ -1102,20 +1102,20 @@ add_task(function* test_DirectoryLinksPr
add_task(function* test_DirectoryLinksProvider_enhancedURIs() {
let origIsTopPlacesSite = NewTabUtils.isTopPlacesSite;
NewTabUtils.isTopPlacesSite = () => true;
let origCurrentTopSiteCount = DirectoryLinksProvider._getCurrentTopSiteCount;
DirectoryLinksProvider._getCurrentTopSiteCount = () => 8;
let data = {
"suggested": [
- {url: "http://example.net", enhancedImageURI: "data:,net1", title:"SuggestedTitle", adgroup_name: "Test", frecent_sites: ["test.com"]}
+ {url: "http://example.net", enhancedImageURI: "data:,net1", title: "SuggestedTitle", adgroup_name: "Test", frecent_sites: ["test.com"]}
],
"directory": [
- {url: "http://example.net", enhancedImageURI: "data:,net2", title:"DirectoryTitle"}
+ {url: "http://example.net", enhancedImageURI: "data:,net2", title: "DirectoryTitle"}
]
};
let dataURI = "data:application/json," + JSON.stringify(data);
yield promiseSetupDirectoryLinksProvider({linksURL: dataURI});
// Wait for links to get loaded
let gLinks = NewTabUtils.links;
gLinks.addProvider(DirectoryLinksProvider);
--- a/js/src/builtin/Map.js
+++ b/js/src/builtin/Map.js
@@ -55,17 +55,17 @@ function MapForEach(callbackfn, thisArg
}
}
function MapEntries() {
return callFunction(std_Map_iterator, this);
}
_SetCanonicalName(MapEntries, "entries");
-var iteratorTemp = { mapIterationResultPair : null };
+var iteratorTemp = { mapIterationResultPair: null };
function MapIteratorNext() {
// Step 1.
var O = this;
// Steps 2-3.
if (!IsObject(O) || !IsMapIterator(O))
return callFunction(CallMapIteratorMethodIfWrapped, O, "MapIteratorNext");
--- a/js/src/builtin/Set.js
+++ b/js/src/builtin/Set.js
@@ -57,17 +57,17 @@ function SetValues() {
// ES6 final draft 23.2.2.2.
function SetSpecies() {
// Step 1.
return this;
}
_SetCanonicalName(SetSpecies, "get [Symbol.species]");
-var setIteratorTemp = { setIterationResult : null };
+var setIteratorTemp = { setIterationResult: null };
function SetIteratorNext() {
// Step 1.
var O = this;
// Steps 2-3.
if (!IsObject(O) || !IsSetIterator(O))
return callFunction(CallSetIteratorMethodIfWrapped, O, "SetIteratorNext");
--- a/js/src/builtin/TypedObject.js
+++ b/js/src/builtin/TypedObject.js
@@ -1237,21 +1237,21 @@ function MapTypedSeqImpl(inArray, depth,
assert(IsObject(inArray) && ObjectIsTypedObject(inArray), "Map/From called on non-object or untyped input array.");
assert(TypeDescrIsArrayType(outputType), "Map/From called on non array-type outputType");
if (depth <= 0 || TO_INT32(depth) !== depth)
ThrowTypeError(JSMSG_TYPEDOBJECT_BAD_ARGS);
// Compute iteration space for input and output and check for compatibility.
var inputType = TypeOfTypedObject(inArray);
- var {iterationSpace:inIterationSpace, grainType:inGrainType} =
+ var {iterationSpace: inIterationSpace, grainType: inGrainType} =
ComputeIterationSpace(inputType, depth, inArray.length);
if (!IsObject(inGrainType) || !ObjectIsTypeDescr(inGrainType))
ThrowTypeError(JSMSG_TYPEDOBJECT_BAD_ARGS);
- var {iterationSpace, grainType:outGrainType, totalLength} =
+ var {iterationSpace, grainType: outGrainType, totalLength} =
ComputeIterationSpace(outputType, depth, outputType.length);
for (var i = 0; i < depth; i++)
if (inIterationSpace[i] !== iterationSpace[i])
// TypeError("Incompatible iteration space in input and output type");
ThrowTypeError(JSMSG_TYPEDOBJECT_BAD_ARGS);
// Create a zeroed instance with no data
var result = new outputType();
--- a/toolkit/components/aboutperformance/content/aboutPerformance.js
+++ b/toolkit/components/aboutperformance/content/aboutPerformance.js
@@ -98,17 +98,17 @@ let tabFinder = {
* tabbrowser and tab if the latter could be found.
*/
get(id) {
let browser = this._map.get(id);
if (!browser) {
return null;
}
let tabbrowser = browser.getTabBrowser();
- return {tabbrowser, tab:tabbrowser.getTabForBrowser(browser)};
+ return {tabbrowser, tab: tabbrowser.getTabForBrowser(browser)};
},
getAny(ids) {
for (let id of ids) {
let result = this.get(id);
if (result) {
return result;
}
--- a/toolkit/components/apppicker/content/appPicker.js
+++ b/toolkit/components/apppicker/content/appPicker.js
@@ -4,17 +4,17 @@
Components.utils.import("resource://gre/modules/AppConstants.jsm");
function AppPicker() {}
AppPicker.prototype =
{
// Class members
- _incomingParams:null,
+ _incomingParams: null,
/**
* Init the dialog and populate the application list
*/
appPickerLoad: function appPickerLoad() {
const nsILocalHandlerApp = Components.interfaces.nsILocalHandlerApp;
this._incomingParams = window.arguments[0];
--- a/toolkit/components/asyncshutdown/nsAsyncShutdown.js
+++ b/toolkit/components/asyncshutdown/nsAsyncShutdown.js
@@ -181,18 +181,18 @@ nsAsyncShutdownClient.prototype = {
if (!moduleBlocker) {
return false;
}
this._deletePromisified(xpcomBlocker);
return this._moduleClient.removeBlocker(moduleBlocker);
},
/* ........ QueryInterface .............. */
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
- classID: Components.ID("{314e9e96-cc37-4d5c-843b-54709ce11426}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
+ classID: Components.ID("{314e9e96-cc37-4d5c-843b-54709ce11426}"),
};
/**
* Construct an instance of nsIAsyncShutdownBarrier from an instance
* of AsyncShutdown.Barrier.
*
* @param {object} moduleBarrier an instance if
* `AsyncShutdown.Barrier`. This instance will serve as back-end for
@@ -213,18 +213,18 @@ nsAsyncShutdownBarrier.prototype = {
wait(onReady) {
this._moduleBarrier.wait().then(() => {
onReady.done();
});
// By specification, _moduleBarrier.wait() cannot reject.
},
/* ........ QueryInterface .............. */
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
- classID: Components.ID("{29a0e8b5-9111-4c09-a0eb-76cd02bf20fa}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncShutdownBarrier]),
+ classID: Components.ID("{29a0e8b5-9111-4c09-a0eb-76cd02bf20fa}"),
};
function nsAsyncShutdownService() {
// Cache for the getters
for (let _k of
[// Parent process
"profileBeforeChange",
@@ -260,18 +260,18 @@ function nsAsyncShutdownService() {
};
}
nsAsyncShutdownService.prototype = {
makeBarrier(name) {
return new nsAsyncShutdownBarrier(new AsyncShutdown.Barrier(name));
},
/* ........ QueryInterface .............. */
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAsyncShutdownService]),
- classID: Components.ID("{35c496de-a115-475d-93b5-ffa3f3ae6fe3}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncShutdownService]),
+ classID: Components.ID("{35c496de-a115-475d-93b5-ffa3f3ae6fe3}"),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
nsAsyncShutdownService,
nsAsyncShutdownBarrier,
nsAsyncShutdownClient,
]);
--- a/toolkit/components/asyncshutdown/tests/xpcshell/test_converters.js
+++ b/toolkit/components/asyncshutdown/tests/xpcshell/test_converters.js
@@ -34,31 +34,31 @@ function test_conversions() {
"string",
null,
// Objects
{
a: 1,
b: true,
c: "string",
- d:.5,
+ d: .5,
e: [2, false, "another string", .3],
f: [],
g: {
a2: 1,
b2: true,
c2: "string",
- d2:.5,
+ d2: .5,
e2: [2, false, "another string", .3],
f2: [],
g2: [{
a3: 1,
b3: true,
c3: "string",
- d3:.5,
+ d3: .5,
e3: [2, false, "another string", .3],
f3: [],
g3: {}
}]
}
}];
for (let sample of SAMPLES) {
--- a/toolkit/components/autocomplete/tests/unit/test_378079.js
+++ b/toolkit/components/autocomplete/tests/unit/test_378079.js
@@ -151,17 +151,17 @@ function AutoCompleteSearch(aName, aResu
}
AutoCompleteSearch.prototype = {
constructor: AutoCompleteSearch,
// Search name. Used by AutoCompleteController
name: null,
// AutoCompleteResult
- _result:null,
+ _result: null,
/**
* Return the same result set for every search
*/
startSearch(aSearchString,
aSearchParam,
aPreviousResult,
--- a/toolkit/components/autocomplete/tests/unit/test_440866.js
+++ b/toolkit/components/autocomplete/tests/unit/test_440866.js
@@ -149,17 +149,17 @@ function AutoCompleteSearch(aName, aResu
}
AutoCompleteSearch.prototype = {
constructor: AutoCompleteSearch,
// Search name. Used by AutoCompleteController
name: null,
// AutoCompleteResult
- _result:null,
+ _result: null,
/**
* Return the same result set for every search
*/
startSearch(aSearchString,
aSearchParam,
aPreviousResult,
--- a/toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js
+++ b/toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js
@@ -138,17 +138,17 @@ function AutoCompleteSearch(aName, aResu
}
AutoCompleteSearch.prototype = {
constructor: AutoCompleteSearch,
// Search name. Used by AutoCompleteController
name: null,
// AutoCompleteResult
- _result:null,
+ _result: null,
/**
* Return the same result set for every search
*/
startSearch(aSearchString,
aSearchParam,
aPreviousResult,
--- a/toolkit/components/captivedetect/captivedetect.js
+++ b/toolkit/components/captivedetect/captivedetect.js
@@ -168,17 +168,17 @@ function LoginObserver(captivePortalDete
break;
}
}
},
/*
* Check if login activity is finished according to HTTP burst.
*/
- notify : function notify() {
+ notify: function notify() {
switch (state) {
case LOGIN_OBSERVER_STATE_BURST:
// Wait while network stays idle for a short period
state = LOGIN_OBSERVER_STATE_VERIFY_NEEDED;
// Fall though to start polling timer
case LOGIN_OBSERVER_STATE_IDLE:
if (waitForNetworkActivity) {
timer.initWithCallback(this,
--- a/toolkit/components/contentprefs/tests/unit/test_stringGroups.js
+++ b/toolkit/components/contentprefs/tests/unit/test_stringGroups.js
@@ -7,17 +7,17 @@ function run_test() {
var cps = new ContentPrefInstance(null);
// Make sure disk synchronization checking is turned off by default.
var statement = cps.DBConnection.createStatement("PRAGMA synchronous");
statement.executeStep();
do_check_eq(0, statement.getInt32(0));
// These are the different types of aGroup arguments we'll test.
- var anObject = {"foo":"bar"}; // a simple object
+ var anObject = {"foo": "bar"}; // a simple object
var uri = ContentPrefTest.getURI("http://www.example.com/"); // nsIURI
var stringURI = "www.example.com"; // typeof = "string"
var stringObjectURI = new String("www.example.com"); // typeof = "object"
// First check that all the methods work or don't work.
function simple_test_methods(aGroup, shouldThrow) {
var prefName = "test.pref.0";
var prefValue = Math.floor(Math.random() * 100);
--- a/toolkit/components/ctypes/tests/unit/test_finalizer.js
+++ b/toolkit/components/ctypes/tests/unit/test_finalizer.js
@@ -131,20 +131,20 @@ function run_test() {
ctypes.bool,
ctypes.char.ptr,
ctypes.char.ptr),
status,
released
}
);
const rect_t = new ctypes.StructType("myRECT",
- [{ top : ctypes.int32_t },
- { left : ctypes.int32_t },
+ [{ top: ctypes.int32_t },
+ { left: ctypes.int32_t },
{ bottom: ctypes.int32_t },
- { right : ctypes.int32_t }]);
+ { right: ctypes.int32_t }]);
samples.push(
{
name: "struct",
acquire: library.declare("test_finalizer_acq_struct_t",
ctypes.default_abi,
rect_t,
ctypes.int),
release: library.declare("test_finalizer_rel_struct_t",
--- a/toolkit/components/ctypes/tests/unit/test_jsctypes.js
+++ b/toolkit/components/ctypes/tests/unit/test_jsctypes.js
@@ -1336,35 +1336,35 @@ function run_StructType_tests() {
do_check_throws(function() { ctypes.StructType(); }, TypeError);
do_check_throws(function() { ctypes.StructType("a", [], 5); }, TypeError);
do_check_throws(function() { ctypes.StructType(null, []); }, TypeError);
do_check_throws(function() { ctypes.StructType("a", null); }, TypeError);
// Check that malformed descriptors are an error.
do_check_throws(function() {
- ctypes.StructType("a", [{"x":ctypes.int32_t}, {"x":ctypes.int8_t}]);
+ ctypes.StructType("a", [{"x": ctypes.int32_t}, {"x": ctypes.int8_t}]);
}, TypeError);
do_check_throws(function() {
ctypes.StructType("a", [5]);
}, TypeError);
do_check_throws(function() {
ctypes.StructType("a", [{}]);
}, TypeError);
do_check_throws(function() {
- ctypes.StructType("a", [{5:ctypes.int32_t}]);
+ ctypes.StructType("a", [{5: ctypes.int32_t}]);
}, TypeError);
do_check_throws(function() {
- ctypes.StructType("a", [{"5":ctypes.int32_t}]);
+ ctypes.StructType("a", [{"5": ctypes.int32_t}]);
}, TypeError);
do_check_throws(function() {
- ctypes.StructType("a", [{"x":5}]);
+ ctypes.StructType("a", [{"x": 5}]);
}, TypeError);
do_check_throws(function() {
- ctypes.StructType("a", [{"x":ctypes.int32_t()}]);
+ ctypes.StructType("a", [{"x": ctypes.int32_t()}]);
}, TypeError);
// Check that opaque structs work.
let opaque_t = ctypes.StructType("a");
do_check_eq(opaque_t.name, "a");
do_check_eq(opaque_t.toString(), "type a");
do_check_eq(opaque_t.toSource(), 'ctypes.StructType("a")');
do_check_true(opaque_t.prototype === undefined);
@@ -2101,17 +2101,17 @@ function run_type_toString_tests() {
do_check_eq(c.float.toString(), "type float");
do_check_eq(c.double.toString(), "type double");
do_check_eq(c.bool.toString(), "type bool");
do_check_eq(c.void_t.toString(), "type void");
do_check_eq(c.voidptr_t.toString(), "type void*");
do_check_eq(c.char16_t.toString(), "type char16_t");
- var simplestruct = c.StructType("simplestruct", [{"smitty":c.voidptr_t}]);
+ var simplestruct = c.StructType("simplestruct", [{"smitty": c.voidptr_t}]);
do_check_eq(simplestruct.toString(), "type simplestruct");
// One type modifier, int base type.
do_check_eq(c.int.ptr.toString(), "type int*");
do_check_eq(c.ArrayType(c.int).toString(), "type int[]");
do_check_eq(c.ArrayType(c.int, 4).toString(), "type int[4]");
do_check_eq(c.FunctionType(c.default_abi, c.int).toString(), "type int()");
do_check_eq(c.FunctionType(c.default_abi, c.int, [c.bool]).toString(), "type int(bool)");
@@ -2396,38 +2396,38 @@ function run_readstring_tests(library) {
do_check_eq(0xFFFD, utf8_cesu8_result.charCodeAt(3));
}
function run_struct_tests(library) {
const point_t = new ctypes.StructType("myPOINT",
[{ x: ctypes.int32_t },
{ y: ctypes.int32_t }]);
const rect_t = new ctypes.StructType("myRECT",
- [{ top : ctypes.int32_t },
- { left : ctypes.int32_t },
+ [{ top: ctypes.int32_t },
+ { left: ctypes.int32_t },
{ bottom: ctypes.int32_t },
- { right : ctypes.int32_t }]);
+ { right: ctypes.int32_t }]);
let test_pt_in_rect = library.declare("test_pt_in_rect", ctypes.default_abi, ctypes.int32_t, rect_t, point_t);
let rect = new rect_t(10, 5, 5, 10);
let pt1 = new point_t(6, 6);
do_check_eq(test_pt_in_rect(rect, pt1), 1);
let pt2 = new point_t(2, 2);
do_check_eq(test_pt_in_rect(rect, pt2), 0);
const inner_t = new ctypes.StructType("INNER",
[{ i1: ctypes.uint8_t },
{ i2: ctypes.int64_t },
{ i3: ctypes.uint8_t }]);
const nested_t = new ctypes.StructType("NESTED",
- [{ n1 : ctypes.int32_t },
- { n2 : ctypes.int16_t },
+ [{ n1: ctypes.int32_t },
+ { n2: ctypes.int16_t },
{ inner: inner_t },
- { n3 : ctypes.int64_t },
- { n4 : ctypes.int32_t }]);
+ { n3: ctypes.int64_t },
+ { n4: ctypes.int32_t }]);
let test_nested_struct = library.declare("test_nested_struct", ctypes.default_abi, ctypes.int32_t, nested_t);
let inner = new inner_t(161, 523412, 43);
let nested = new nested_t(13155, 1241, inner, 24512115, 1234111);
// add up all the numbers and make sure the C function agrees
do_check_eq(test_nested_struct(nested), 26284238);
// test returning a struct by value
@@ -2698,20 +2698,20 @@ function run_variadic_tests(library) {
[ctypes.uint8_t]).ptr;
do_check_throws(function() {
sum_va_type().value = sum_notva_type();
}, TypeError);
}
function run_static_data_tests(library) {
const rect_t = new ctypes.StructType("myRECT",
- [{ top : ctypes.int32_t },
- { left : ctypes.int32_t },
+ [{ top: ctypes.int32_t },
+ { left: ctypes.int32_t },
{ bottom: ctypes.int32_t },
- { right : ctypes.int32_t }]);
+ { right: ctypes.int32_t }]);
let data_rect = library.declare("data_rect", rect_t);
// Test reading static data.
do_check_true(data_rect.constructor === rect_t);
do_check_eq(data_rect.top, -1);
do_check_eq(data_rect.left, -2);
do_check_eq(data_rect.bottom, 3);
--- a/toolkit/components/exthelper/extApplication.js
+++ b/toolkit/components/exthelper/extApplication.js
@@ -408,17 +408,17 @@ SessionStorage.prototype = {
this._storage[aName] = aValue;
this._events.dispatch("change", aName);
},
get: function ss_get(aName, aDefaultValue) {
return this.has(aName) ? this._storage[aName] : aDefaultValue;
},
- QueryInterface : XPCOMUtils.generateQI([Ci.extISessionStorage])
+ QueryInterface: XPCOMUtils.generateQI([Ci.extISessionStorage])
};
// =================================================
// ExtensionObserver constructor (internal class)
//
// ExtensionObserver is a global singleton which watches the browser's
// extensions and sends you events when things change.
--- a/toolkit/components/feeds/FeedProcessor.js
+++ b/toolkit/components/feeds/FeedProcessor.js
@@ -157,41 +157,41 @@ function makePropGetter(key) {
}
return null;
}
}
const RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
// namespace map
var gNamespaces = {
- "http://webns.net/mvcb/":"admin",
- "http://backend.userland.com/rss":"",
- "http://blogs.law.harvard.edu/tech/rss":"",
- "http://www.w3.org/2005/Atom":"atom",
- "http://purl.org/atom/ns#":"atom03",
- "http://purl.org/rss/1.0/modules/content/":"content",
- "http://purl.org/dc/elements/1.1/":"dc",
- "http://purl.org/dc/terms/":"dcterms",
- "http://www.w3.org/1999/02/22-rdf-syntax-ns#":"rdf",
- "http://purl.org/rss/1.0/":"rss1",
- "http://my.netscape.com/rdf/simple/0.9/":"rss1",
- "http://wellformedweb.org/CommentAPI/":"wfw",
- "http://purl.org/rss/1.0/modules/wiki/":"wiki",
- "http://www.w3.org/XML/1998/namespace":"xml",
- "http://search.yahoo.com/mrss/":"media",
- "http://search.yahoo.com/mrss":"media"
+ "http://webns.net/mvcb/": "admin",
+ "http://backend.userland.com/rss": "",
+ "http://blogs.law.harvard.edu/tech/rss": "",
+ "http://www.w3.org/2005/Atom": "atom",
+ "http://purl.org/atom/ns#": "atom03",
+ "http://purl.org/rss/1.0/modules/content/": "content",
+ "http://purl.org/dc/elements/1.1/": "dc",
+ "http://purl.org/dc/terms/": "dcterms",
+ "http://www.w3.org/1999/02/22-rdf-syntax-ns#": "rdf",
+ "http://purl.org/rss/1.0/": "rss1",
+ "http://my.netscape.com/rdf/simple/0.9/": "rss1",
+ "http://wellformedweb.org/CommentAPI/": "wfw",
+ "http://purl.org/rss/1.0/modules/wiki/": "wiki",
+ "http://www.w3.org/XML/1998/namespace": "xml",
+ "http://search.yahoo.com/mrss/": "media",
+ "http://search.yahoo.com/mrss": "media"
}
// We allow a very small set of namespaces in XHTML content,
// for attributes only
var gAllowedXHTMLNamespaces = {
- "http://www.w3.org/XML/1998/namespace":"xml",
+ "http://www.w3.org/XML/1998/namespace": "xml",
// if someone ns qualifies XHTML, we have to prefix it to avoid an
// attribute collision.
- "http://www.w3.org/1999/xhtml":"xhtml"
+ "http://www.w3.org/1999/xhtml": "xhtml"
}
function FeedResult() {}
FeedResult.prototype = {
bozo: false,
doc: null,
version: null,
headers: null,
@@ -224,17 +224,17 @@ function Feed() {
Feed.prototype = {
searchLists: {
title: ["title", "rss1:title", "atom03:title", "atom:title"],
subtitle: ["description", "dc:description", "rss1:description",
"atom03:tagline", "atom:subtitle"],
items: ["items", "atom03_entries", "entries"],
id: ["atom:id", "rdf:about"],
generator: ["generator"],
- authors : ["authors"],
+ authors: ["authors"],
contributors: ["contributors"],
link: [["link", strToURI], ["rss1:link", strToURI]],
categories: ["categories", "dc:subject"],
rights: ["atom03:rights", "atom:rights"],
cloud: ["cloud"],
image: ["image", "rss1:image", "atom:logo"],
textInput: ["textInput", "rss1:textinput"],
skipDays: ["skipDays"],
@@ -399,17 +399,17 @@ Entry.prototype = {
enclosures: null,
mediaContent: null,
searchLists: {
title: ["title", "rss1:title", "atom03:title", "atom:title"],
link: [["link", strToURI], ["rss1:link", strToURI]],
id: [["guid", makePropGetter("guid")], "rdf:about",
"atom03:id", "atom:id"],
- authors : ["authors"],
+ authors: ["authors"],
contributors: ["contributors"],
summary: ["description", "rss1:description", "dc:description",
"atom03:summary", "atom:summary"],
content: ["content:encoded", "atom03:content", "atom:content"],
rights: ["atom03:rights", "atom:rights"],
published: ["pubDate", "atom03:issued", "dcterms:issued", "atom:published"],
updated: ["pubDate", "atom03:modified", "dc:date", "dcterms:modified",
"atom:updated"]
@@ -1049,31 +1049,31 @@ function FeedProcessor() {
this._xhtmlHandler = null;
this._haveSentResult = false;
// The nsIFeedResultListener waiting for the parse results
this.listener = null;
// These elements can contain (X)HTML or plain text.
// We keep a table here that contains their default treatment
- this._textConstructs = {"atom:title":"text",
- "atom:summary":"text",
- "atom:rights":"text",
- "atom:content":"text",
- "atom:subtitle":"text",
- "description":"html",
- "rss1:description":"html",
- "dc:description":"html",
- "content:encoded":"html",
- "title":"text",
- "rss1:title":"text",
- "atom03:title":"text",
- "atom03:tagline":"text",
- "atom03:summary":"text",
- "atom03:content":"text"};
+ this._textConstructs = {"atom:title": "text",
+ "atom:summary": "text",
+ "atom:rights": "text",
+ "atom:content": "text",
+ "atom:subtitle": "text",
+ "description": "html",
+ "rss1:description": "html",
+ "dc:description": "html",
+ "content:encoded": "html",
+ "title": "text",
+ "rss1:title": "text",
+ "atom03:title": "text",
+ "atom03:tagline": "text",
+ "atom03:summary": "text",
+ "atom03:content": "text"};
this._stack = [];
this._trans = {
"START": {
// If we hit a root RSS element, treat as RSS2.
"rss": new FeedElementInfo("RSS2", "rss2"),
// If we hit an RDF element, if could be RSS1, but we can't
@@ -1128,17 +1128,17 @@ function FeedProcessor() {
"media:thumbnail": new ElementInfo("mediathumbnail", null, null, true),
"guid": new ElementInfo("guid", null, rssGuid, false)
},
"IN_SKIPDAYS": {
"day": new ElementInfo("days", null, rssArrayElement, true)
},
- "IN_SKIPHOURS":{
+ "IN_SKIPHOURS": {
"hour": new ElementInfo("hours", null, rssArrayElement, true)
},
"IN_MEDIAGROUP": {
"media:content": new ElementInfo("mediacontent", null, null, true),
"media:thumbnail": new ElementInfo("mediathumbnail", null, null, true)
},
@@ -1605,20 +1605,20 @@ FeedProcessor.prototype = {
var val = attributes.getValue(i);
bag.setPropertyAsAString(key, val);
}
},
// Only for RSS2esque formats
_findRSSVersion: function FP__findRSSVersion(attributes) {
var versionAttr = attributes.getValueFromName("", "version").trim();
- var versions = { "0.91":"rss091",
- "0.92":"rss092",
- "0.93":"rss093",
- "0.94":"rss094" }
+ var versions = { "0.91": "rss091",
+ "0.92": "rss092",
+ "0.93": "rss093",
+ "0.94": "rss094" }
if (versions[versionAttr])
return versions[versionAttr];
if (versionAttr.substr(0, 2) != "2.")
return "rssUnknown";
return "rss2";
},
// unknown element values are returned here. See startElement above
--- a/toolkit/components/filepicker/content/filepicker.js
+++ b/toolkit/components/filepicker/content/filepicker.js
@@ -623,17 +623,17 @@ function goHome() {
function newDir() {
var file;
var promptService =
Components.classes[NS_PROMPTSERVICE_CONTRACTID].getService(Components.interfaces.nsIPromptService);
var dialogTitle =
gFilePickerBundle.getString("promptNewDirTitle");
var dialogMsg =
gFilePickerBundle.getString("promptNewDirMessage");
- var ret = promptService.prompt(window, dialogTitle, dialogMsg, gNewDirName, null, {value:0});
+ var ret = promptService.prompt(window, dialogTitle, dialogMsg, gNewDirName, null, {value: 0});
if (ret) {
file = processPath(gNewDirName.value);
if (!file) {
showErrorDialog("errorCreateNewDirTitle",
"errorCreateNewDirMessage",
file);
return false;
--- a/toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js
+++ b/toolkit/components/jsdownloads/test/browser/browser_DownloadPDFSaver.js
@@ -28,17 +28,17 @@ function* test_download_state_complete(a
is(aDownload.source.isPrivate, aPrivate, "Download source has correct private state");
ok(aDownload.stopped, "Download is stopped");
is(aCanceled, aDownload.canceled, "Download has correct canceled state");
is(!aCanceled, aDownload.succeeded, "Download has correct succeeded state");
is(aDownload.error, null, "Download error is not defined");
}
function* test_createDownload_common(aPrivate, aType) {
- let win = yield BrowserTestUtils.openNewBrowserWindow({ private : aPrivate});
+ let win = yield BrowserTestUtils.openNewBrowserWindow({ private: aPrivate});
let tab = yield BrowserTestUtils.openNewForegroundTab(win.gBrowser, getRootDirectory(gTestPath) + "testFile.html");
let download = yield Downloads.createDownload({
source: tab.linkedBrowser.contentWindow,
target: { path: getTempFile(TEST_TARGET_FILE_NAME_PDF).path },
saver: { type: aType }
});
--- a/toolkit/components/jsdownloads/test/unit/test_DownloadStore.js
+++ b/toolkit/components/jsdownloads/test/unit/test_DownloadStore.js
@@ -258,19 +258,19 @@ add_task(function* test_save_reload_unkn
let download3 = yield Downloads.createDownload({
source: { url: httpUrl("empty.txt"),
referrer: TEST_REFERRER_URL,
source1: "download3source1",
source2: "download3source2" },
target: { path: getTempFile(TEST_TARGET_FILE_NAME).path,
target1: "download3target1",
target2: "download3target2" },
- saver : { type: "copy",
- saver1: "download3saver1",
- saver2: "download3saver2" },
+ saver: { type: "copy",
+ saver1: "download3saver1",
+ saver2: "download3saver2" },
});
listForSave.add(download3);
yield storeForSave.save();
yield storeForLoad.load();
let itemsForSave = yield listForSave.getAll();
let itemsForLoad = yield listForLoad.getAll();
--- a/toolkit/components/lz4/tests/xpcshell/data/worker_lz4.js
+++ b/toolkit/components/lz4/tests/xpcshell/data/worker_lz4.js
@@ -22,17 +22,17 @@ function do_check_eq(a, b) {
let result = a == b;
self.postMessage({kind: "do_check_true", args: [result]});
if (!result) {
throw new Error("do_check_eq failed " + a + " != " + b);
}
}
function do_test_complete() {
- self.postMessage({kind: "do_test_complete", args:[]});
+ self.postMessage({kind: "do_test_complete", args: []});
}
self.onmessage = function() {
try {
run_test();
} catch (ex) {
let {message, moduleStack, moduleName, lineNumber} = ex;
let error = new Error(message, moduleName, lineNumber);
--- a/toolkit/components/nsDefaultCLH.js
+++ b/toolkit/components/nsDefaultCLH.js
@@ -32,21 +32,21 @@ function getDirectoryService() {
}
function nsDefaultCLH() { }
nsDefaultCLH.prototype = {
classID: Components.ID("{6ebc941a-f2ff-4d56-b3b6-f7d0b9d73344}"),
/* nsISupports */
- QueryInterface : XPCOMUtils.generateQI([nsICommandLineHandler]),
+ QueryInterface: XPCOMUtils.generateQI([nsICommandLineHandler]),
/* nsICommandLineHandler */
- handle : function clh_handle(cmdLine) {
+ handle: function clh_handle(cmdLine) {
var printDir;
while ((printDir = cmdLine.handleFlagWithParam("print-xpcom-dir", false))) {
var out = "print-xpcom-dir(\"" + printDir + "\"): ";
try {
out += getDirectoryService().get(printDir, nsIFile).path;
} catch (e) {
out += "<Not Provided>";
}
@@ -105,12 +105,12 @@ nsDefaultCLH.prototype = {
var wwatch = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
.getService(nsIWindowWatcher);
wwatch.openWindow(null, chromeURI, "_blank",
flags, cmdLine);
} catch (e) { }
},
- helpInfo : "",
+ helpInfo: "",
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsDefaultCLH]);
--- a/toolkit/components/passwordmgr/LoginManagerContent.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerContent.jsm
@@ -39,17 +39,17 @@ XPCOMUtils.defineLazyGetter(this, "log",
return logger.log.bind(logger);
});
// These mirror signon.* prefs.
var gEnabled, gAutofillForms, gStoreWhenAutocompleteOff;
var gLastContextMenuEventTimeStamp = Number.NEGATIVE_INFINITY;
var observer = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver,
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
Ci.nsIFormSubmitObserver,
Ci.nsIWebProgressListener,
Ci.nsIDOMEventListener,
Ci.nsISupportsWeakReference]),
// nsIFormSubmitObserver
notify(formElement, aWindow, actionURI) {
log("observer notified for form submission.");
@@ -156,17 +156,17 @@ function messageManagerFromWindow(win) {
.QueryInterface(Ci.nsIDocShell)
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIContentFrameMessageManager);
}
// This object maps to the "child" process (even in the single-process case).
var LoginManagerContent = {
- __formFillService : null, // FormFillController, for username autocompleting
+ __formFillService: null, // FormFillController, for username autocompleting
get _formFillService() {
if (!this.__formFillService)
this.__formFillService =
Cc["@mozilla.org/satchel/form-fill-controller;1"].
getService(Ci.nsIFormFillController);
return this.__formFillService;
},
@@ -688,17 +688,17 @@ var LoginManagerContent = {
continue;
}
if (skipEmptyFields && !element.value.trim()) {
continue;
}
pwFields[pwFields.length] = {
- index : i,
+ index: i,
element
};
}
// If too few or too many fields, bail out.
if (pwFields.length == 0) {
log("(form ignored -- no password fields.)");
return null;
@@ -739,18 +739,18 @@ var LoginManagerContent = {
var pwOverrideField = LoginRecipesContent.queryLoginField(
form,
fieldOverrideRecipe.passwordSelector
);
if (pwOverrideField) {
// The field from the password override may be in a different FormLike.
let formLike = LoginFormFactory.createFromField(pwOverrideField);
pwFields = [{
- index : [...formLike.elements].indexOf(pwOverrideField),
- element : pwOverrideField,
+ index: [...formLike.elements].indexOf(pwOverrideField),
+ element: pwOverrideField,
}];
}
var usernameOverrideField = LoginRecipesContent.queryLoginField(
form,
fieldOverrideRecipe.usernameSelector
);
if (usernameOverrideField) {
@@ -1441,34 +1441,34 @@ function UserAutoCompleteResult(aSearchS
if (this.matchCount > 0) {
this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
this.defaultIndex = 0;
}
}
UserAutoCompleteResult.prototype = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult,
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult,
Ci.nsISupportsWeakReference]),
// private
- logins : null,
+ logins: null,
// Allow autoCompleteSearch to get at the JS object so it can
// modify some readonly properties for internal use.
get wrappedJSObject() {
return this;
},
// Interfaces from idl...
- searchString : null,
- searchResult : Ci.nsIAutoCompleteResult.RESULT_NOMATCH,
- defaultIndex : -1,
- errorDescription : "",
- matchCount : 0,
+ searchString: null,
+ searchResult: Ci.nsIAutoCompleteResult.RESULT_NOMATCH,
+ defaultIndex: -1,
+ errorDescription: "",
+ matchCount: 0,
getValueAt(index) {
if (index < 0 || index >= this.matchCount) {
throw new Error("Index out of range.");
}
if (this._showInsecureFieldWarning && index === 0) {
return "";
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -636,27 +636,27 @@ function CopyPassword() {
// Don't copy passwords if we aren't already showing the passwords & a master
// password hasn't been entered.
if (!showingPasswords && !masterPasswordLogin())
return;
// Copy selected signon's password to clipboard
let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
getService(Ci.nsIClipboardHelper);
let row = signonsTree.currentIndex;
- let password = signonsTreeView.getCellText(row, {id : "passwordCol" });
+ let password = signonsTreeView.getCellText(row, {id: "passwordCol" });
clipboard.copyString(password);
Services.telemetry.getHistogramById("PWMGR_MANAGE_COPIED_PASSWORD").add(1);
}
function CopyUsername() {
// Copy selected signon's username to clipboard
let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].
getService(Ci.nsIClipboardHelper);
let row = signonsTree.currentIndex;
- let username = signonsTreeView.getCellText(row, {id : "userCol" });
+ let username = signonsTreeView.getCellText(row, {id: "userCol" });
clipboard.copyString(username);
Services.telemetry.getHistogramById("PWMGR_MANAGE_COPIED_USERNAME").add(1);
}
function EditCellInSelectedRow(columnName) {
let row = signonsTree.currentIndex;
let columnElement = getColumnByName(columnName);
signonsTree.startEditing(row, signonsTree.columns.getColumnFor(columnElement));
--- a/toolkit/components/passwordmgr/crypto-SDR.js
+++ b/toolkit/components/passwordmgr/crypto-SDR.js
@@ -11,42 +11,42 @@ XPCOMUtils.defineLazyModuleGetter(this,
"resource://gre/modules/LoginHelper.jsm");
function LoginManagerCrypto_SDR() {
this.init();
}
LoginManagerCrypto_SDR.prototype = {
- classID : Components.ID("{dc6c2976-0f73-4f1f-b9ff-3d72b4e28309}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsILoginManagerCrypto]),
+ classID: Components.ID("{dc6c2976-0f73-4f1f-b9ff-3d72b4e28309}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginManagerCrypto]),
- __decoderRing : null, // nsSecretDecoderRing service
+ __decoderRing: null, // nsSecretDecoderRing service
get _decoderRing() {
if (!this.__decoderRing)
this.__decoderRing = Cc["@mozilla.org/security/sdr;1"].
getService(Ci.nsISecretDecoderRing);
return this.__decoderRing;
},
- __utfConverter : null, // UCS2 <--> UTF8 string conversion
+ __utfConverter: null, // UCS2 <--> UTF8 string conversion
get _utfConverter() {
if (!this.__utfConverter) {
this.__utfConverter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
createInstance(Ci.nsIScriptableUnicodeConverter);
this.__utfConverter.charset = "UTF-8";
}
return this.__utfConverter;
},
_utfConverterReset() {
this.__utfConverter = null;
},
- _uiBusy : false,
+ _uiBusy: false,
init() {
// Check to see if the internal PKCS#11 token has been initialized.
// If not, set a blank password.
let tokenDB = Cc["@mozilla.org/security/pk11tokendb;1"].
getService(Ci.nsIPK11TokenDB);
--- a/toolkit/components/passwordmgr/nsLoginInfo.js
+++ b/toolkit/components/passwordmgr/nsLoginInfo.js
@@ -9,30 +9,30 @@ Cu.import("resource://gre/modules/XPCOMU
XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper",
"resource://gre/modules/LoginHelper.jsm");
function nsLoginInfo() {}
nsLoginInfo.prototype = {
- classID : Components.ID("{0f2f347c-1e4f-40cc-8efd-792dea70a85e}"),
+ classID: Components.ID("{0f2f347c-1e4f-40cc-8efd-792dea70a85e}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginInfo, Ci.nsILoginMetaInfo]),
//
// nsILoginInfo interfaces...
//
- hostname : null,
- formSubmitURL : null,
- httpRealm : null,
- username : null,
- password : null,
- usernameField : null,
- passwordField : null,
+ hostname: null,
+ formSubmitURL: null,
+ httpRealm: null,
+ username: null,
+ password: null,
+ usernameField: null,
+ passwordField: null,
init(aHostname, aFormSubmitURL, aHttpRealm,
aUsername, aPassword,
aUsernameField, aPasswordField) {
this.hostname = aHostname;
this.formSubmitURL = aFormSubmitURL;
this.httpRealm = aHttpRealm;
this.username = aUsername;
@@ -77,17 +77,17 @@ nsLoginInfo.prototype = {
return clone;
},
//
// nsILoginMetaInfo interfaces...
//
- guid : null,
- timeCreated : null,
- timeLastUsed : null,
- timePasswordChanged : null,
- timesUsed : null
+ guid: null,
+ timeCreated: null,
+ timeLastUsed: null,
+ timePasswordChanged: null,
+ timesUsed: null
}; // end of nsLoginInfo implementation
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsLoginInfo]);
--- a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
+++ b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
@@ -35,21 +35,21 @@ const PROMPT_NEVER = 3;
function LoginManagerPromptFactory() {
Services.obs.addObserver(this, "quit-application-granted", true);
Services.obs.addObserver(this, "passwordmgr-crypto-login", true);
Services.obs.addObserver(this, "passwordmgr-crypto-loginCanceled", true);
}
LoginManagerPromptFactory.prototype = {
- classID : Components.ID("{749e62f4-60ae-4569-a8a2-de78b649660e}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ classID: Components.ID("{749e62f4-60ae-4569-a8a2-de78b649660e}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIObserver, Ci.nsISupportsWeakReference]),
- _asyncPrompts : {},
- _asyncPromptInProgress : false,
+ _asyncPrompts: {},
+ _asyncPromptInProgress: false,
observe(subject, topic, data) {
this.log("Observed: " + topic);
if (topic == "quit-application-granted") {
this._cancelPendingPrompts();
} else if (topic == "passwordmgr-crypto-login") {
// Start processing the deferred prompters.
this._doAsyncPrompt();
@@ -236,60 +236,60 @@ XPCOMUtils.defineLazyGetter(this.LoginMa
*
* nsILoginManagerPrompter: Used by Login Manager for saving/changing logins
* found in HTML forms.
*/
function LoginManagerPrompter() {}
LoginManagerPrompter.prototype = {
- classID : Components.ID("{8aa66d77-1bbb-45a6-991e-b8f47751c291}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAuthPrompt,
+ classID: Components.ID("{8aa66d77-1bbb-45a6-991e-b8f47751c291}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt,
Ci.nsIAuthPrompt2,
Ci.nsILoginManagerPrompter]),
- _factory : null,
- _chromeWindow : null,
- _browser : null,
- _opener : null,
+ _factory: null,
+ _chromeWindow: null,
+ _browser: null,
+ _opener: null,
- __pwmgr : null, // Password Manager service
+ __pwmgr: null, // Password Manager service
get _pwmgr() {
if (!this.__pwmgr)
this.__pwmgr = Cc["@mozilla.org/login-manager;1"].
getService(Ci.nsILoginManager);
return this.__pwmgr;
},
- __promptService : null, // Prompt service for user interaction
+ __promptService: null, // Prompt service for user interaction
get _promptService() {
if (!this.__promptService)
this.__promptService =
Cc["@mozilla.org/embedcomp/prompt-service;1"].
getService(Ci.nsIPromptService2);
return this.__promptService;
},
- __strBundle : null, // String bundle for L10N
+ __strBundle: null, // String bundle for L10N
get _strBundle() {
if (!this.__strBundle) {
var bunService = Cc["@mozilla.org/intl/stringbundle;1"].
getService(Ci.nsIStringBundleService);
this.__strBundle = bunService.createBundle(
"chrome://passwordmgr/locale/passwordmgr.properties");
if (!this.__strBundle)
throw new Error("String bundle for Login Manager not present!");
}
return this.__strBundle;
},
- __ellipsis : null,
+ __ellipsis: null,
get _ellipsis() {
if (!this.__ellipsis) {
this.__ellipsis = "\u2026";
try {
this.__ellipsis = Services.prefs.getComplexValue(
"intl.ellipsis", Ci.nsIPrefLocalizedString).data;
} catch (e) { }
}
@@ -346,17 +346,17 @@ LoginManagerPrompter.prototype = {
aSavePassword, aUsername, aPassword) {
this.log("===== promptUsernameAndPassword() called =====");
if (aSavePassword == Ci.nsIAuthPrompt.SAVE_PASSWORD_FOR_SESSION)
throw new Components.Exception("promptUsernameAndPassword doesn't support SAVE_PASSWORD_FOR_SESSION",
Cr.NS_ERROR_NOT_IMPLEMENTED);
var selectedLogin = null;
- var checkBox = { value : false };
+ var checkBox = { value: false };
var checkBoxLabel = null;
var [hostname, realm, unused] = this._getRealmInfo(aPasswordRealm);
// If hostname is null, we can't save this login.
if (hostname) {
var canRememberLogin;
if (this._inPrivateBrowsing)
canRememberLogin = false;
@@ -446,17 +446,17 @@ LoginManagerPrompter.prototype = {
promptPassword(aDialogTitle, aText, aPasswordRealm,
aSavePassword, aPassword) {
this.log("===== promptPassword called() =====");
if (aSavePassword == Ci.nsIAuthPrompt.SAVE_PASSWORD_FOR_SESSION)
throw new Components.Exception("promptPassword doesn't support SAVE_PASSWORD_FOR_SESSION",
Cr.NS_ERROR_NOT_IMPLEMENTED);
- var checkBox = { value : false };
+ var checkBox = { value: false };
var checkBoxLabel = null;
var [hostname, realm, username] = this._getRealmInfo(aPasswordRealm);
username = decodeURIComponent(username);
// If hostname is null, we can't save this login.
if (hostname && !this._inPrivateBrowsing) {
var canRememberLogin = (aSavePassword ==
@@ -544,17 +544,17 @@ LoginManagerPrompter.prototype = {
* Implementation of nsIAuthPrompt2.
*
* @param {nsIChannel} aChannel
* @param {int} aLevel
* @param {nsIAuthInformation} aAuthInfo
*/
promptAuth(aChannel, aLevel, aAuthInfo) {
var selectedLogin = null;
- var checkbox = { value : false };
+ var checkbox = { value: false };
var checkboxLabel = null;
var epicfail = false;
var canAutologin = false;
var notifyObj;
var foundLogins;
try {
this.log("===== promptAuth called =====");
@@ -703,17 +703,17 @@ LoginManagerPrompter.prototype = {
}
this.log("Adding new prompt to the queue, callback = " + aCallback);
asyncPrompt = {
consumers: [cancelable],
channel: aChannel,
authInfo: aAuthInfo,
level: aLevel,
- inProgress : false,
+ inProgress: false,
prompter: this
};
this._factory._asyncPrompts[hashKey] = asyncPrompt;
this._factory._doAsyncPrompt();
} catch (e) {
Components.utils.reportError("LoginManagerPrompter: " +
"asyncPromptAuth: " + e + "\nFalling back to promptAuth\n");
--- a/toolkit/components/passwordmgr/storage-mozStorage.js
+++ b/toolkit/components/passwordmgr/storage-mozStorage.js
@@ -42,33 +42,33 @@ Transaction.prototype = {
},
};
function LoginManagerStorage_mozStorage() { }
LoginManagerStorage_mozStorage.prototype = {
- classID : Components.ID("{8c2023b9-175c-477e-9761-44ae7b549756}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsILoginManagerStorage,
+ classID: Components.ID("{8c2023b9-175c-477e-9761-44ae7b549756}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsILoginManagerStorage,
Ci.nsIInterfaceRequestor]),
getInterface(aIID) {
if (aIID.equals(Ci.nsIVariant)) {
// Allows unwrapping the JavaScript object for regression tests.
return this;
}
if (aIID.equals(Ci.mozIStorageConnection)) {
return this._dbConnection;
}
throw new Components.Exception("Interface not available", Cr.NS_ERROR_NO_INTERFACE);
},
- __crypto : null, // nsILoginManagerCrypto service
+ __crypto: null, // nsILoginManagerCrypto service
get _crypto() {
if (!this.__crypto)
this.__crypto = Cc["@mozilla.org/login-manager/crypto/SDR;1"].
getService(Ci.nsILoginManagerCrypto);
return this.__crypto;
},
__profileDir: null, // nsIFile for the user's profile dir
@@ -140,20 +140,20 @@ LoginManagerStorage_mozStorage.prototype
columns: ["guid"]
},
moz_logins_encType_index: {
table: "moz_logins",
columns: ["encType"]
}
}
},
- _dbConnection : null, // The database connection
- _dbStmts : null, // Database statements for memoization
+ _dbConnection: null, // The database connection
+ _dbStmts: null, // Database statements for memoization
- _signonsFile : null, // nsIFile for "signons.sqlite"
+ _signonsFile: null, // nsIFile for "signons.sqlite"
/*
* Internal method used by regression tests only. It overrides the default
* database location.
*/
initWithFile(aDBFile) {
if (aDBFile)
--- a/toolkit/components/passwordmgr/test/mochitest/test_prompt.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt.html
@@ -91,147 +91,147 @@ function initLogins() {
}
add_task(function* setup() {
runInParent(initLogins);
});
add_task(function* test_prompt_accept() {
state = {
- msg : "the message",
- title : "the title",
- textValue : "abc",
- passValue : "",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "abc",
+ passValue: "",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- textField : "xyz",
+ buttonClick: "ok",
+ textField: "xyz",
};
promptDone = handlePrompt(state, action);
isOk = prompter1.prompt(defaultTitle, defaultMsg, "http://example.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, "abc", result);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(result.value, "xyz", "Checking prompt() returned value");
});
add_task(function* test_prompt_cancel() {
state = {
- msg : "the message",
- title : "the title",
- textValue : "abc",
- passValue : "",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "abc",
+ passValue: "",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "cancel",
+ buttonClick: "cancel",
};
promptDone = handlePrompt(state, action);
isOk = prompter1.prompt(defaultTitle, defaultMsg, "http://example.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, "abc", result);
yield promptDone;
ok(!isOk, "Checking dialog return value (cancel)");
});
add_task(function* test_promptPassword_defaultAccept() {
// Default password provided, existing logins are ignored.
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "inputpw",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "inputpw",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "secret",
+ buttonClick: "ok",
+ passField: "secret",
};
pword.value = "inputpw";
promptDone = handlePrompt(state, action);
isOk = prompter1.promptPassword(defaultTitle, defaultMsg, "http://example.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(pword.value, "secret", "Checking returned password");
});
add_task(function* test_promptPassword_defaultCancel() {
// Default password provided, existing logins are ignored.
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "inputpw",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "inputpw",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "cancel",
+ buttonClick: "cancel",
};
pword.value = "inputpw";
promptDone = handlePrompt(state, action);
isOk = prompter1.promptPassword(defaultTitle, defaultMsg, "http://example.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, pword);
yield promptDone;
ok(!isOk, "Checking dialog return value (cancel)");
});
add_task(function* test_promptPassword_emptyAccept() {
// No default password provided, realm does not match existing login.
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "secret",
+ buttonClick: "ok",
+ passField: "secret",
};
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptPassword(defaultTitle, defaultMsg, "http://nonexample.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(pword.value, "secret", "Checking returned password");
@@ -245,33 +245,33 @@ add_task(function* test_promptPassword_s
ok(isOk, "Checking dialog return value (accept)");
is(pword.value, "examplepass", "Checking returned password");
});
add_task(function* test_promptPassword_noMatchingPasswordForEmptyUN() {
// No default password provided, none of the logins from this host are
// password-only so the user is prompted.
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "secret",
+ buttonClick: "ok",
+ passField: "secret",
};
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptPassword(defaultTitle, defaultMsg, "http://example2.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(pword.value, "secret", "Checking returned password");
@@ -322,376 +322,376 @@ add_task(function* test_promptPassword_u
is(pword.value, "user3pass", "Checking returned password");
// XXX test saving a password with Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY
});
add_task(function* test_promptPassword_realm() {
// We don't pre-fill or save for NS_GetAuthKey-generated realms, but we should still prompt
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "fill2pass",
+ buttonClick: "ok",
+ passField: "fill2pass",
};
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptPassword(defaultTitle, defaultMsg, "example2.com:80 (somerealm)",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(pword.value, "fill2pass", "Checking returned password");
});
add_task(function* test_promptPassword_realm2() {
// We don't pre-fill or save for NS_GetAuthKey-generated realms, but we should still prompt
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "fill2pass",
+ buttonClick: "ok",
+ passField: "fill2pass",
};
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptPassword(defaultTitle, defaultMsg, "example2.com:80 (somerealm)",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(pword.value, "fill2pass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_accept() {
state = {
- msg : "the message",
- title : "the title",
- textValue : "inuser",
- passValue : "inpass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "inuser",
+ passValue: "inpass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- textField : "outuser",
- passField : "outpass",
+ buttonClick: "ok",
+ textField: "outuser",
+ passField: "outpass",
};
uname.value = "inuser";
pword.value = "inpass";
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://nonexample.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(uname.value, "outuser", "Checking returned username");
is(pword.value, "outpass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_cancel() {
state = {
- msg : "the message",
- title : "the title",
- textValue : "inuser",
- passValue : "inpass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "inuser",
+ passValue: "inpass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "cancel",
+ buttonClick: "cancel",
};
uname.value = "inuser";
pword.value = "inpass";
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://nonexample.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, uname, pword);
yield promptDone;
ok(!isOk, "Checking dialog return value (cancel)");
});
add_task(function* test_promptUsernameAndPassword_autofill() {
// test filling in existing password-only login
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "examplepass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- checkMsg : "Use Password Manager to remember this password.",
- checked : true,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "examplepass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ checkMsg: "Use Password Manager to remember this password.",
+ checked: true,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
uname.value = null;
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://example.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(uname.value, "", "Checking returned username");
is(pword.value, "examplepass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_multipleExisting() {
// test filling in existing login (undetermined from multiple selection)
// user2name/user2pass would also be valid to fill here.
state = {
- msg : "the message",
- title : "the title",
- textValue : "user1name",
- passValue : "user1pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- checkMsg : "Use Password Manager to remember this password.",
- checked : true,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "user1name",
+ passValue: "user1pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ checkMsg: "Use Password Manager to remember this password.",
+ checked: true,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
uname.value = null;
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://example2.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
ok(uname.value == "user1name" || uname.value == "user2name", "Checking returned username");
ok(pword.value == "user1pass" || uname.value == "user2pass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_multipleExisting1() {
// test filling in existing login (user1 from multiple selection)
state = {
- msg : "the message",
- title : "the title",
- textValue : "user1name",
- passValue : "user1pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- checkMsg : "Use Password Manager to remember this password.",
- checked : true,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "user1name",
+ passValue: "user1pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ checkMsg: "Use Password Manager to remember this password.",
+ checked: true,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
uname.value = "user1name";
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://example2.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(uname.value, "user1name", "Checking returned username");
is(pword.value, "user1pass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_multipleExisting2() {
// test filling in existing login (user2 from multiple selection)
state = {
- msg : "the message",
- title : "the title",
- textValue : "user2name",
- passValue : "user2pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- checkMsg : "Use Password Manager to remember this password.",
- checked : true,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "user2name",
+ passValue: "user2pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ checkMsg: "Use Password Manager to remember this password.",
+ checked: true,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
uname.value = "user2name";
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://example2.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(uname.value, "user2name", "Checking returned username");
is(pword.value, "user2pass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_passwordChange() {
// test changing password
state = {
- msg : "the message",
- title : "the title",
- textValue : "user2name",
- passValue : "user2pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- checkMsg : "Use Password Manager to remember this password.",
- checked : true,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "user2name",
+ passValue: "user2pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ checkMsg: "Use Password Manager to remember this password.",
+ checked: true,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "NEWuser2pass",
+ buttonClick: "ok",
+ passField: "NEWuser2pass",
};
uname.value = "user2name";
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://example2.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(uname.value, "user2name", "Checking returned username");
is(pword.value, "NEWuser2pass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_changePasswordBack() {
// test changing password (back to original value)
state = {
- msg : "the message",
- title : "the title",
- textValue : "user2name",
- passValue : "NEWuser2pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- checkMsg : "Use Password Manager to remember this password.",
- checked : true,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "user2name",
+ passValue: "NEWuser2pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ checkMsg: "Use Password Manager to remember this password.",
+ checked: true,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "user2pass",
+ buttonClick: "ok",
+ passField: "user2pass",
};
uname.value = "user2name";
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "http://example2.com",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(uname.value, "user2name", "Checking returned username");
is(pword.value, "user2pass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_realm() {
// We don't pre-fill or save for NS_GetAuthKey-generated realms, but we should still prompt
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- textField : "fill2user",
- passField : "fill2pass",
+ buttonClick: "ok",
+ textField: "fill2user",
+ passField: "fill2pass",
};
uname.value = null;
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "example2.com:80 (somerealm)",
Ci.nsIAuthPrompt.SAVE_PASSWORD_NEVER, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
is(uname.value, "fill2user", "Checking returned username");
is(pword.value, "fill2pass", "Checking returned password");
});
add_task(function* test_promptUsernameAndPassword_realm2() {
// We don't pre-fill or save for NS_GetAuthKey-generated realms, but we should still prompt
state = {
- msg : "the message",
- title : "the title",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "the message",
+ title: "the title",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- textField : "fill2user",
- passField : "fill2pass",
+ buttonClick: "ok",
+ textField: "fill2user",
+ passField: "fill2pass",
};
uname.value = null;
pword.value = null;
promptDone = handlePrompt(state, action);
isOk = prompter1.promptUsernameAndPassword(defaultTitle, defaultMsg, "example2.com:80 (somerealm)",
Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, uname, pword);
yield promptDone;
ok(isOk, "Checking dialog return value (accept)");
--- a/toolkit/components/passwordmgr/test/mochitest/test_prompt_http.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt_http.html
@@ -75,61 +75,61 @@ runInParent(() => {
pwmgr.addLogin(httpUpgradeLogin);
pwmgr.addLogin(httpsDowngradeLogin);
pwmgr.addLogin(dedupeHttpUpgradeLogin);
pwmgr.addLogin(dedupeHttpsUpgradeLogin);
});
add_task(function* test_iframe() {
let state = {
- msg : "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest”",
- title : "Authentication Required",
- textValue : "mochiuser1",
- passValue : "mochipass1",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest”",
+ title: "Authentication Required",
+ textValue: "mochiuser1",
+ passValue: "mochipass1",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
let action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
// The following tests are driven by iframe loads
var iframeLoaded = onloadPromiseFor("iframe");
iframe.src = "authenticate.sjs?user=mochiuser1&pass=mochipass1";
yield promptDone;
yield iframeLoaded;
checkEchoedAuthInfo({user: "mochiuser1", pass: "mochipass1"},
iframe.contentDocument);
state = {
- msg : "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest2”",
- title : "Authentication Required",
- textValue : "mochiuser2",
- passValue : "mochipass2",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest2”",
+ title: "Authentication Required",
+ textValue: "mochiuser2",
+ passValue: "mochipass2",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
// We've already authenticated to this host:port. For this next
// request, the existing auth should be sent, we'll get a 401 reply,
// and we should prompt for new auth.
iframeLoaded = onloadPromiseFor("iframe");
iframe.src = "authenticate.sjs?user=mochiuser2&pass=mochipass2&realm=mochitest2";
yield promptDone;
@@ -145,65 +145,65 @@ add_task(function* test_iframe() {
yield iframeLoaded;
checkEchoedAuthInfo({user: "mochiuser1", pass: "mochipass1"},
iframe.contentDocument);
// Same realm we've already authenticated to, but with a different
// expected password (to trigger an auth prompt, and change-password
// popup notification).
state = {
- msg : "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest”",
- title : "Authentication Required",
- textValue : "mochiuser1",
- passValue : "mochipass1",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest”",
+ title: "Authentication Required",
+ textValue: "mochiuser1",
+ passValue: "mochipass1",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "mochipass1-new",
+ buttonClick: "ok",
+ passField: "mochipass1-new",
};
promptDone = handlePrompt(state, action);
iframeLoaded = onloadPromiseFor("iframe");
let promptShownPromise = promisePromptShown("passwordmgr-prompt-change");
iframe.src = "authenticate.sjs?user=mochiuser1&pass=mochipass1-new";
yield promptDone;
yield iframeLoaded;
checkEchoedAuthInfo({user: "mochiuser1", pass: "mochipass1-new"},
iframe.contentDocument);
yield promptShownPromise;
// Same as last test, but for a realm we haven't already authenticated
// to (but have an existing saved login for, so that we'll trigger
// a change-password popup notification.
state = {
- msg : "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest3”",
- title : "Authentication Required",
- textValue : "mochiuser3",
- passValue : "mochipass3-old",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest3”",
+ title: "Authentication Required",
+ textValue: "mochiuser3",
+ passValue: "mochipass3-old",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- passField : "mochipass3-new",
+ buttonClick: "ok",
+ passField: "mochipass3-new",
};
promptDone = handlePrompt(state, action);
iframeLoaded = onloadPromiseFor("iframe");
promptShownPromise = promisePromptShown("passwordmgr-prompt-change");
iframe.src = "authenticate.sjs?user=mochiuser3&pass=mochipass3-new&realm=mochitest3";
yield promptDone;
yield iframeLoaded;
checkEchoedAuthInfo({user: "mochiuser3", pass: "mochipass3-new"},
@@ -223,131 +223,131 @@ add_task(function* test_iframe() {
// Clear cached auth from this subtest, and avoid leaking due to bug 459620.
var authMgr = Cc["@mozilla.org/network/http-auth-manager;1"].
getService(Ci.nsIHttpAuthManager);
authMgr.clearAll();
});
state = {
- msg : "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest3”",
- title : "Authentication Required",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest3”",
+ title: "Authentication Required",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- textField : "mochiuser3",
- passField : "mochipass3-old",
+ buttonClick: "ok",
+ textField: "mochiuser3",
+ passField: "mochipass3-old",
};
// Trigger a new prompt, so we can test adding a new login.
promptDone = handlePrompt(state, action);
iframeLoaded = onloadPromiseFor("iframe");
promptShownPromise = promisePromptShown("passwordmgr-prompt-save");
iframe.src = "authenticate.sjs?user=mochiuser3&pass=mochipass3-old&realm=mochitest3";
yield promptDone;
yield iframeLoaded;
checkEchoedAuthInfo({user: "mochiuser3", pass: "mochipass3-old"},
iframe.contentDocument);
yield promptShownPromise;
});
add_task(function* test_schemeUpgrade() {
let state = {
- msg : "https://example.com is requesting your username and password. " +
+ msg: "https://example.com is requesting your username and password. " +
"WARNING: Your password will not be sent to the website you are currently visiting!",
- title : "Authentication Required",
- textValue : "httpUser",
- passValue : "httpPass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ title: "Authentication Required",
+ textValue: "httpUser",
+ passValue: "httpPass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
let action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
// The following tests are driven by iframe loads
let iframeLoaded = onloadPromiseFor("iframe");
iframe.src = "https://example.com" + AUTHENTICATE_PATH +
"?user=httpUser&pass=httpPass&realm=schemeUpgrade";
yield promptDone;
yield iframeLoaded;
checkEchoedAuthInfo({user: "httpUser", pass: "httpPass"},
SpecialPowers.wrap(iframe).contentDocument);
});
add_task(function* test_schemeDowngrade() {
let state = {
- msg : "http://example.com is requesting your username and password. " +
+ msg: "http://example.com is requesting your username and password. " +
"WARNING: Your password will not be sent to the website you are currently visiting!",
- title : "Authentication Required",
- textValue : "", // empty because we shouldn't downgrade
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ title: "Authentication Required",
+ textValue: "", // empty because we shouldn't downgrade
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
let action = {
- buttonClick : "cancel",
+ buttonClick: "cancel",
};
let promptDone = handlePrompt(state, action);
// The following tests are driven by iframe loads
let iframeLoaded = onloadPromiseFor("iframe");
iframe.src = "http://example.com" + AUTHENTICATE_PATH +
"?user=unused&pass=unused&realm=schemeDowngrade";
yield promptDone;
yield iframeLoaded;
});
add_task(function* test_schemeUpgrade_dedupe() {
let state = {
- msg : "https://example.org is requesting your username and password. " +
+ msg: "https://example.org is requesting your username and password. " +
"WARNING: Your password will not be sent to the website you are currently visiting!",
- title : "Authentication Required",
- textValue : "dedupeUser",
- passValue : "httpsPass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ title: "Authentication Required",
+ textValue: "dedupeUser",
+ passValue: "httpsPass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
let action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
// The following tests are driven by iframe loads
let iframeLoaded = onloadPromiseFor("iframe");
iframe.src = "https://example.org" + AUTHENTICATE_PATH +
"?user=dedupeUser&pass=httpsPass&realm=schemeUpgradeDedupe";
--- a/toolkit/components/passwordmgr/test/mochitest/test_prompt_noWindow.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt_noWindow.html
@@ -31,32 +31,32 @@ runInParent(() => {
createInstance(Ci.nsILoginInfo);
login.init("http://mochi.test:8888", null, "mochitest",
"mochiuser1", "mochipass1", "", "");
Services.logins.addLogin(login);
});
add_task(function* test_sandbox_xhr() {
let state = {
- msg : "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest”",
- title : "Authentication Required",
- textValue : "mochiuser1",
- passValue : "mochipass1",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://mochi.test:8888 is requesting your username and password. The site says: “mochitest”",
+ title: "Authentication Required",
+ textValue: "mochiuser1",
+ passValue: "mochipass1",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
let action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
let url = new URL("authenticate.sjs?user=mochiuser1&pass=mochipass1", window.location.href);
let sandboxConstructor = SpecialPowers.Cu.Sandbox;
let sandbox = new sandboxConstructor(this, {wantXrays: true});
function sandboxedRequest(sandboxedUrl) {
let req = SpecialPowers.Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
--- a/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth.html
@@ -17,23 +17,23 @@
<pre id="test">
<script class="testbody" type="text/javascript">
var state, action;
var isOk;
var level = Ci.nsIAuthPrompt2.LEVEL_NONE;
var authinfo = {
- username : "",
- password : "",
- domain : "",
+ username: "",
+ password: "",
+ domain: "",
- flags : Ci.nsIAuthInformation.AUTH_HOST,
- authenticationScheme : "basic",
- realm : ""
+ flags: Ci.nsIAuthInformation.AUTH_HOST,
+ authenticationScheme: "basic",
+ realm: ""
};
// Force parent to not look for tab-modal prompts, as they're not used for auth prompts.
isTabModal = false;
let chromeScript = runInParent(SimpleTest.getTestFileURL("pwmgr_common.js"));
let prompterParent = runInParent(() => {
@@ -120,34 +120,34 @@ let prompterParent = runInParent(() => {
pwmgr.addLogin(login2D);
pwmgr.addLogin(login2E);
});
let prompter2 = new PrompterProxy(prompterParent);
add_task(function* test_accept() {
state = {
- msg : "http://example.com is requesting your username and password. The site says: “some realm”",
- title : "Authentication Required",
- textValue : "inuser",
- passValue : "inpass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example.com is requesting your username and password. The site says: “some realm”",
+ title: "Authentication Required",
+ textValue: "inuser",
+ passValue: "inpass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- textField : "outuser",
- passField : "outpass",
+ buttonClick: "ok",
+ textField: "outuser",
+ passField: "outpass",
};
authinfo.username = "inuser";
authinfo.password = "inpass";
authinfo.realm = "some realm";
promptDone = handlePrompt(state, action);
// Since prompter2 is actually a proxy to send a message to a chrome script and
// we can't send a channel in a message, we instead send the channel name that
@@ -157,59 +157,59 @@ add_task(function* test_accept() {
ok(isOk, "Checking dialog return value (accept)");
is(authinfo.username, "outuser", "Checking returned username");
is(authinfo.password, "outpass", "Checking returned password");
});
add_task(function* test_cancel() {
state = {
- msg : "http://example.com is requesting your username and password. The site says: “some realm”",
- title : "Authentication Required",
- textValue : "outuser",
- passValue : "outpass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example.com is requesting your username and password. The site says: “some realm”",
+ title: "Authentication Required",
+ textValue: "outuser",
+ passValue: "outpass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "cancel",
+ buttonClick: "cancel",
};
promptDone = handlePrompt(state, action);
isOk = prompter2.promptAuth("channel1", level, authinfo);
yield promptDone;
ok(!isOk, "Checking dialog return value (cancel)");
});
add_task(function* test_pwonly() {
// test filling in password-only login
state = {
- msg : "http://example.com is requesting your username and password. The site says: “http://example.com”",
- title : "Authentication Required",
- textValue : "",
- passValue : "examplepass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example.com is requesting your username and password. The site says: “http://example.com”",
+ title: "Authentication Required",
+ textValue: "",
+ passValue: "examplepass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
authinfo.username = "";
authinfo.password = "";
authinfo.realm = "http://example.com";
promptDone = handlePrompt(state, action);
isOk = prompter2.promptAuth("channel1", level, authinfo);
yield promptDone;
@@ -218,32 +218,32 @@ add_task(function* test_pwonly() {
is(authinfo.username, "", "Checking returned username");
is(authinfo.password, "examplepass", "Checking returned password");
});
add_task(function* test_multipleExisting() {
// test filling in existing login (undetermined from multiple selection)
// user2name/user2pass would also be valid to fill here.
state = {
- msg : "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
- title : "Authentication Required",
- textValue : "user1name",
- passValue : "user1pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
+ title: "Authentication Required",
+ textValue: "user1name",
+ passValue: "user1pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
authinfo.username = "";
authinfo.password = "";
authinfo.realm = "http://example2.com";
promptDone = handlePrompt(state, action);
isOk = prompter2.promptAuth("channel2", level, authinfo);
yield promptDone;
@@ -252,35 +252,35 @@ add_task(function* test_multipleExisting
ok(authinfo.username == "user1name" || authinfo.username == "user2name", "Checking returned username");
ok(authinfo.password == "user1pass" || authinfo.password == "user2pass", "Checking returned password");
});
add_task(function* test_multipleExisting2() {
// test filling in existing login (undetermined --> user1)
// user2name/user2pass would also be valid to fill here.
state = {
- msg : "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
- title : "Authentication Required",
- textValue : "user1name",
- passValue : "user1pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
+ title: "Authentication Required",
+ textValue: "user1name",
+ passValue: "user1pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
// enter one of the known logins, test 504+505 exercise the two possible states.
action = {
- buttonClick : "ok",
- textField : "user1name",
- passField : "user1pass",
+ buttonClick: "ok",
+ textField: "user1name",
+ passField: "user1pass",
};
authinfo.username = "";
authinfo.password = "";
authinfo.realm = "http://example2.com";
promptDone = handlePrompt(state, action);
isOk = prompter2.promptAuth("channel2", level, authinfo);
yield promptDone;
@@ -289,35 +289,35 @@ add_task(function* test_multipleExisting
is(authinfo.username, "user1name", "Checking returned username");
is(authinfo.password, "user1pass", "Checking returned password");
});
add_task(function* test_multipleExisting3() {
// test filling in existing login (undetermined --> user2)
// user2name/user2pass would also be valid to fill here.
state = {
- msg : "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
- title : "Authentication Required",
- textValue : "user1name",
- passValue : "user1pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
+ title: "Authentication Required",
+ textValue: "user1name",
+ passValue: "user1pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
// enter one of the known logins, test 504+505 exercise the two possible states.
action = {
- buttonClick : "ok",
- textField : "user2name",
- passField : "user2pass",
+ buttonClick: "ok",
+ textField: "user2name",
+ passField: "user2pass",
};
authinfo.username = "";
authinfo.password = "";
authinfo.realm = "http://example2.com";
promptDone = handlePrompt(state, action);
isOk = prompter2.promptAuth("channel2", level, authinfo);
yield promptDone;
@@ -326,35 +326,35 @@ add_task(function* test_multipleExisting
is(authinfo.username, "user2name", "Checking returned username");
is(authinfo.password, "user2pass", "Checking returned password");
});
add_task(function* test_changingMultiple() {
// test changing a password (undetermined --> user2 w/ newpass)
// user2name/user2pass would also be valid to fill here.
state = {
- msg : "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
- title : "Authentication Required",
- textValue : "user1name",
- passValue : "user1pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
+ title: "Authentication Required",
+ textValue: "user1name",
+ passValue: "user1pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
// force to user2, and change the password
action = {
- buttonClick : "ok",
- textField : "user2name",
- passField : "NEWuser2pass",
+ buttonClick: "ok",
+ textField: "user2name",
+ passField: "NEWuser2pass",
};
authinfo.username = "";
authinfo.password = "";
authinfo.realm = "http://example2.com";
promptDone = handlePrompt(state, action);
isOk = prompter2.promptAuth("channel2", level, authinfo);
yield promptDone;
@@ -363,35 +363,35 @@ add_task(function* test_changingMultiple
is(authinfo.username, "user2name", "Checking returned username");
is(authinfo.password, "NEWuser2pass", "Checking returned password");
});
add_task(function* test_changingMultiple2() {
// test changing a password (undetermined --> user2 w/ origpass)
// user2name/user2pass would also be valid to fill here.
state = {
- msg : "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
- title : "Authentication Required",
- textValue : "user1name",
- passValue : "user1pass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example2.com is requesting your username and password. The site says: “http://example2.com”",
+ title: "Authentication Required",
+ textValue: "user1name",
+ passValue: "user1pass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
// force to user2, and change the password back
action = {
- buttonClick : "ok",
- textField : "user2name",
- passField : "user2pass",
+ buttonClick: "ok",
+ textField: "user2name",
+ passField: "user2pass",
};
authinfo.username = "";
authinfo.password = "";
authinfo.realm = "http://example2.com";
promptDone = handlePrompt(state, action);
isOk = prompter2.promptAuth("channel2", level, authinfo);
yield promptDone;
--- a/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html
+++ b/toolkit/components/passwordmgr/test/mochitest/test_prompt_promptAuth_proxy.html
@@ -27,23 +27,23 @@ var proxyChannel;
var systemPrincipal = SpecialPowers.Services.scriptSecurityManager.getSystemPrincipal();
var ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
var level = Ci.nsIAuthPrompt2.LEVEL_NONE;
var proxyAuthinfo = {
- username : "",
- password : "",
- domain : "",
+ username: "",
+ password: "",
+ domain: "",
- flags : Ci.nsIAuthInformation.AUTH_PROXY,
- authenticationScheme : "basic",
- realm : ""
+ flags: Ci.nsIAuthInformation.AUTH_PROXY,
+ authenticationScheme: "basic",
+ realm: ""
};
// Force parent to not look for tab-modal prompts, as they're not used for auth prompts.
isTabModal = false;
const Cc_promptFac = Cc["@mozilla.org/passwordmanager/authpromptfactory;1"];
ok(Cc_promptFac != null, "Access Cc[@mozilla.org/passwordmanager/authpromptfactory;1]");
@@ -137,32 +137,32 @@ startup();
add_task(function* setup() {
info("Waiting for startup to complete...");
yield startupComplete;
});
add_task(function* test_noAutologin() {
// test proxy login (default = no autologin), make sure it prompts.
state = {
- msg : "The proxy moz-proxy://127.0.0.1:8888 is requesting a username and password. The site says: “Proxy Realm”",
- title : "Authentication Required",
- textValue : "proxuser",
- passValue : "proxpass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "The proxy moz-proxy://127.0.0.1:8888 is requesting a username and password. The site says: “Proxy Realm”",
+ title: "Authentication Required",
+ textValue: "proxuser",
+ passValue: "proxpass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
proxyAuthinfo.username = "";
proxyAuthinfo.password = "";
proxyAuthinfo.realm = "Proxy Realm";
proxyAuthinfo.flags = Ci.nsIAuthInformation.AUTH_PROXY;
var time1 = pwmgr.findLogins({}, mozproxy, null, "Proxy Realm")[0].QueryInterface(Ci.nsILoginMetaInfo).timeLastUsed;
promptDone = handlePrompt(state, action);
@@ -195,32 +195,32 @@ add_task(function* test_autologin() {
isnot(time1, time2, "Checking that timeLastUsed was updated");
is(proxyAuthinfo.username, "proxuser", "Checking returned username");
is(proxyAuthinfo.password, "proxpass", "Checking returned password");
});
add_task(function* test_autologin_incorrect() {
// test proxy login (with autologin), ensure it prompts after a failed auth.
state = {
- msg : "The proxy moz-proxy://127.0.0.1:8888 is requesting a username and password. The site says: “Proxy Realm”",
- title : "Authentication Required",
- textValue : "proxuser",
- passValue : "proxpass",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "The proxy moz-proxy://127.0.0.1:8888 is requesting a username and password. The site says: “Proxy Realm”",
+ title: "Authentication Required",
+ textValue: "proxuser",
+ passValue: "proxpass",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
proxyAuthinfo.username = "";
proxyAuthinfo.password = "";
proxyAuthinfo.realm = "Proxy Realm";
proxyAuthinfo.flags = (Ci.nsIAuthInformation.AUTH_PROXY | Ci.nsIAuthInformation.PREVIOUS_FAILED);
time1 = pwmgr.findLogins({}, mozproxy, null, "Proxy Realm")[0].QueryInterface(Ci.nsILoginMetaInfo).timeLastUsed;
@@ -233,23 +233,23 @@ add_task(function* test_autologin_incorr
isnot(time1, time2, "Checking that timeLastUsed was updated");
is(proxyAuthinfo.username, "proxuser", "Checking returned username");
is(proxyAuthinfo.password, "proxpass", "Checking returned password");
});
add_task(function* test_autologin_private() {
// test proxy login (with autologin), ensure it prompts in Private Browsing mode.
state = {
- msg : "the message",
- title : "the title",
- textValue : "proxuser",
- passValue : "proxpass",
+ msg: "the message",
+ title: "the title",
+ textValue: "proxuser",
+ passValue: "proxpass",
};
action = {
- buttonClick : "ok",
+ buttonClick: "ok",
};
proxyAuthinfo.username = "";
proxyAuthinfo.password = "";
proxyAuthinfo.realm = "Proxy Realm";
proxyAuthinfo.flags = Ci.nsIAuthInformation.AUTH_PROXY;
prefs.clearUserPref("signon.autologin.proxy");
--- a/toolkit/components/passwordmgr/test/test_prompt_async.html
+++ b/toolkit/components/passwordmgr/test/test_prompt_async.html
@@ -31,18 +31,18 @@
* from SpecialPowers-wrapped objects is unreliable. Because of that,
* `dialogMonitor` now tracks the number of open windows rather than
* specific window objects.
*
* NB: Because the constructor (above) adds |this| directly as an observer,
* we need to do SpecialPowers.wrapCallbackObject directly on the prototype.
*/
dialogMonitor.prototype = SpecialPowers.wrapCallbackObject({
- windowsOpen : 0,
- windowsRegistered : 0,
+ windowsOpen: 0,
+ windowsRegistered: 0,
QueryInterface(iid) {
const interfaces = [Ci.nsIObserver, Ci.nsISupports];
if (!interfaces.some( function(v) { return iid.equals(v); } ))
throw SpecialPowers.Cr.NS_ERROR_NO_INTERFACE;
return this;
},
--- a/toolkit/components/passwordmgr/test/unit/test_notifications.js
+++ b/toolkit/components/passwordmgr/test/unit/test_notifications.js
@@ -1,17 +1,17 @@
/*
* Tests notifications dispatched when modifying stored logins.
*/
var expectedNotification;
var expectedData;
var TestObserver = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
do_check_eq(topic, "passwordmgr-storage-changed");
do_check_eq(data, expectedNotification);
switch (data) {
case "addLogin":
do_check_true(subject instanceof Ci.nsILoginInfo);
--- a/toolkit/components/perfmonitoring/PerformanceWatcher-content.js
+++ b/toolkit/components/perfmonitoring/PerformanceWatcher-content.js
@@ -29,17 +29,17 @@ let toMsg = function(alerts) {
for (let k of ["groupId", "name", "addonId", "windowId", "isSystem", "processId", "isContentProcess"]) {
serializableSource[k] = source[k];
}
let serializableDetails = {};
for (let k of ["reason", "highestJank", "highestCPOW"]) {
serializableDetails[k] = details[k];
}
- result.push({source:serializableSource, details:serializableDetails});
+ result.push({source: serializableSource, details: serializableDetails});
}
return result;
}
PerformanceWatcher.addPerformanceListener({addonId: "*"}, alerts => {
Services.cpmm.sendAsyncMessage("performancewatcher-propagate-notifications",
{addons: toMsg(alerts)}
);
--- a/toolkit/components/places/PlacesDBUtils.jsm
+++ b/toolkit/components/places/PlacesDBUtils.jsm
@@ -61,17 +61,17 @@ this.PlacesDBUtils = {
aTasks.callback.call(scope, aTasks.messages);
}
// Notify observers that maintenance finished.
Services.obs.notifyObservers(null, FINISHED_MAINTENANCE_TOPIC, null);
}
},
- _isShuttingDown : false,
+ _isShuttingDown: false,
shutdown: function PDBU_shutdown() {
PlacesDBUtils._isShuttingDown = true;
},
/**
* Executes integrity check and common maintenance tasks.
*
* @param [optional] aCallback
--- a/toolkit/components/places/PlacesSyncUtils.jsm
+++ b/toolkit/components/places/PlacesSyncUtils.jsm
@@ -62,17 +62,17 @@ const HistorySyncUtils = PlacesSyncUtils
let canonicalURL = PlacesUtils.SYNC_BOOKMARK_VALIDATORS.url(url);
let db = yield PlacesUtils.promiseDBConnection();
let rows = yield db.executeCached(`
SELECT frecency
FROM moz_places
WHERE url_hash = hash(:url) AND url = :url
LIMIT 1`,
- { url:canonicalURL.href }
+ { url: canonicalURL.href }
);
return rows.length ? rows[0].getResultByName("frecency") : -1;
}),
});
const BookmarkSyncUtils = PlacesSyncUtils.bookmarks = Object.freeze({
SMART_BOOKMARKS_ANNO: "Places/SmartBookmark",
DESCRIPTION_ANNO: "bookmarkProperties/description",
--- a/toolkit/components/places/nsTaggingService.js
+++ b/toolkit/components/places/nsTaggingService.js
@@ -586,17 +586,17 @@ TagAutoCompleteResult.prototype = {
// Implements nsIAutoCompleteSearch
function TagAutoCompleteSearch() {
XPCOMUtils.defineLazyServiceGetter(this, "tagging",
"@mozilla.org/browser/tagging-service;1",
"nsITaggingService");
}
TagAutoCompleteSearch.prototype = {
- _stopped : false,
+ _stopped: false,
/*
* Search for a given string and notify a listener (either synchronously
* or asynchronously) of the result
*
* @param searchString - The string to search for
* @param searchParam - An extra parameter
* @param previousResult - A previous result to use for faster searching
--- a/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js
+++ b/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js
@@ -84,38 +84,38 @@ var testData = [
uri: "https://foo.com/end.html", lastVisit: endTime},
// Test an image link, with annotations
{isInQuery: true, isVisit: true, isDetails: true, isPageAnnotation: true,
title: "mozzie the dino", uri: "https://foo.com/mozzie.png",
annoName: goodAnnoName, annoVal: val, lastVisit: jan14_2130},
// Begin the invalid queries: Test too early
- {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "moz",
uri: "http://foo.com/tooearly.php", lastVisit: jan6_700},
// Test Bad Annotation
- {isInQuery: false, isVisit:true, isDetails: true, isPageAnnotation: true,
+ {isInQuery: false, isVisit: true, isDetails: true, isPageAnnotation: true,
title: "moz", uri: "http://foo.com/badanno.htm", lastVisit: jan12_1730,
annoName: badAnnoName, annoVal: val},
// Test bad URI
- {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "moz",
uri: "http://somefoo.com/justwrong.htm", lastVisit: jan11_800},
// Test afterward, one to update
- {isInQuery: false, isVisit:true, isDetails: true, title: "changeme",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "changeme",
uri: "http://foo.com/changeme1.htm", lastVisit: jan12_1730},
// Test invalid title
- {isInQuery: false, isVisit:true, isDetails: true, title: "changeme2",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "changeme2",
uri: "http://foo.com/changeme2.htm", lastVisit: jan7_800},
// Test changing the lastVisit
- {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "moz",
uri: "http://foo.com/changeme3.htm", lastVisit: dec27_800}];
/**
* This test will test a Query using several terms and do a bit of negative
* testing for items that should be ignored while querying over history.
* The Query:WHERE absoluteTime(matches) AND searchTerms AND URI
* AND annotationIsNot(match) GROUP BY Domain, Day SORT BY uri,ascending
* excludeITems(should be ignored)
--- a/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
+++ b/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js
@@ -68,34 +68,34 @@ var testData = [
uri: "https://foo.com/", lastVisit: jan15_2045},
// Test ftp protocol
{isInQuery: false, isVisit: true, isDetails: true,
uri: "ftp://foo.com/ftp", lastVisit: jan12_1730,
title: "hugelongconfmozlagurationofwordswithasearchtermsinit whoo-hoo"},
// Test too early
- {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "moz",
uri: "http://foo.com/tooearly.php", lastVisit: jan6_700},
// Test Bad Annotation
- {isInQuery: false, isVisit:true, isDetails: true, isPageAnnotation: true,
+ {isInQuery: false, isVisit: true, isDetails: true, isPageAnnotation: true,
title: "moz", uri: "http://foo.com/badanno.htm", lastVisit: jan12_1730,
annoName: badAnnoName, annoVal: val},
// Test afterward, one to update
- {isInQuery: false, isVisit:true, isDetails: true, title: "changeme",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "changeme",
uri: "http://foo.com/changeme1.htm", lastVisit: jan12_1730},
// Test invalid title
- {isInQuery: false, isVisit:true, isDetails: true, title: "changeme2",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "changeme2",
uri: "http://foo.com/changeme2.htm", lastVisit: jan7_800},
// Test changing the lastVisit
- {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "moz",
uri: "http://foo.com/changeme3.htm", lastVisit: dec27_800}];
/**
* This test will test a Query using several terms and do a bit of negative
* testing for items that should be ignored while querying over history.
* The Query:WHERE absoluteTime(matches) AND searchTerms AND URI
* AND annotationIsNot(match) GROUP BY Domain, Day SORT BY uri,ascending
* excludeITems(should be ignored)
@@ -132,22 +132,22 @@ add_task(function* test_abstime_annotati
var root = result.root;
root.containerOpen = true;
// Ensure the result set is correct
compareArrayToResult(testData, root);
// live update.
do_print("change title");
- var change1 = [{isDetails: true, uri:"http://foo.com/",
+ var change1 = [{isDetails: true, uri: "http://foo.com/",
title: "mo"}, ];
yield task_populateDB(change1);
do_check_false(isInResult({uri: "http://foo.com/"}, root));
- var change2 = [{isDetails: true, uri:"http://foo.com/",
+ var change2 = [{isDetails: true, uri: "http://foo.com/",
title: "moz", lastvisit: endTime}, ];
yield task_populateDB(change2);
dump_table("moz_places");
do_check_false(isInResult({uri: "http://foo.com/"}, root));
// Let's delete something from the result set - using annotation
var change3 = [{isPageAnnotation: true,
uri: "http://foo.com/",
--- a/toolkit/components/places/tests/queries/test_results-as-tag-contents-query.js
+++ b/toolkit/components/places/tests/queries/test_results-as-tag-contents-query.js
@@ -104,17 +104,17 @@ add_task(function* test_results_as_tag_c
// Add one by adding a tag, remove one by removing search term.
do_print("Updating items");
var change2 = [{ isDetails: true,
uri: "http://foo3.com/",
title: "foo"},
{ isDetails: true,
uri: "http://foo.com/changeme2.html",
title: "zydeco",
- isBookmark:true,
+ isBookmark: true,
isTag: true,
tagArray: ["bugzilla", "moz"] }];
yield task_populateDB(change2);
do_check_false(isInResult({uri: "http://fooz.com/"}, root));
do_check_true(isInResult({uri: "http://foo.com/changeme2.html"}, root));
// Test removing a tag updates us.
do_print("Deleting item");
--- a/toolkit/components/places/tests/queries/test_searchterms-domain.js
+++ b/toolkit/components/places/tests/queries/test_searchterms-domain.js
@@ -32,29 +32,29 @@
uri: "http://www.foo.com/yiihah", tagArray: ["moz"],
lastVisit: yesterday, title: "foo"},
// Test https protocol
{isInQuery: true, isVisit: true, isDetails: true, title: "moz",
uri: "https://foo.com/", lastVisit: today},
// Begin the invalid queries: wrong search term
- {isInQuery: false, isVisit:true, isDetails: true, title: "m o z",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "m o z",
uri: "http://foo.com/tooearly.php", lastVisit: today},
// Test bad URI
- {isInQuery: false, isVisit:true, isDetails: true, title: "moz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "moz",
uri: "http://sffoo.com/justwrong.htm", lastVisit: yesterday},
// Test what we do with escaping in titles
- {isInQuery: false, isVisit:true, isDetails: true, title: "m%0o%0z",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "m%0o%0z",
uri: "http://foo.com/changeme1.htm", lastVisit: yesterday},
// Test another invalid title - for updating later
- {isInQuery: false, isVisit:true, isDetails: true, title: "m,oz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "m,oz",
uri: "http://foo.com/changeme2.htm", lastVisit: yesterday}];
/**
* This test will test Queries that use relative search terms and domain options
*/
function run_test() {
run_next_test();
}
@@ -97,17 +97,17 @@ add_task(function* test_searchterms_doma
var change2 = [{isDetails: true, uri: "http://foo.com/changeme1.htm",
title: "moz" }];
yield task_populateDB(change2);
do_check_true(isInResult(change2, root));
// Add one and take one out of query set, and simply change one so that it
// still applies to the query.
do_print("Updating More Items");
- var change3 = [{isDetails: true, uri:"http://foo.com/changeme2.htm",
+ var change3 = [{isDetails: true, uri: "http://foo.com/changeme2.htm",
title: "moz"},
{isDetails: true, uri: "http://mail.foo.com/yiihah",
title: "moz now updated"},
{isDetails: true, uri: "ftp://foo.com/ftp", title: "gone"}];
yield task_populateDB(change3);
do_check_true(isInResult({uri: "http://foo.com/changeme2.htm"}, root));
do_check_true(isInResult({uri: "http://mail.foo.com/yiihah"}, root));
do_check_false(isInResult({uri: "ftp://foo.com/ftp"}, root));
--- a/toolkit/components/places/tests/queries/test_searchterms-uri.js
+++ b/toolkit/components/places/tests/queries/test_searchterms-uri.js
@@ -13,34 +13,34 @@
uri: "http://foo.com/", annoName: "moz/test", annoVal: "val",
lastVisit: lastweek, title: "you know, moz is cool"},
// Test https protocol
{isInQuery: false, isVisit: true, isDetails: true, title: "moz",
uri: "https://foo.com/", lastVisit: today},
// Begin the invalid queries: wrong search term
- {isInQuery: false, isVisit:true, isDetails: true, title: "m o z",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "m o z",
uri: "http://foo.com/wrongsearch.php", lastVisit: today},
// Test subdomain inclued, search term at end
{isInQuery: false, isVisit: true, isDetails: true,
uri: "http://mail.foo.com/yiihah", title: "blahmoz", lastVisit: daybefore},
// Test ftp protocol - vary the title length, embed search term
{isInQuery: false, isVisit: true, isDetails: true,
uri: "ftp://foo.com/ftp", lastVisit: lastweek,
title: "hugelongconfmozlagurationofwordswithasearchtermsinit whoo-hoo"},
// Test what we do with escaping in titles
- {isInQuery: false, isVisit:true, isDetails: true, title: "m%0o%0z",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "m%0o%0z",
uri: "http://foo.com/changeme1.htm", lastVisit: yesterday},
// Test another invalid title - for updating later
- {isInQuery: false, isVisit:true, isDetails: true, title: "m,oz",
+ {isInQuery: false, isVisit: true, isDetails: true, title: "m,oz",
uri: "http://foo.com/changeme2.htm", lastVisit: yesterday}];
/**
* This test will test Queries that use relative search terms and URI options
*/
function run_test() {
run_next_test();
}
@@ -66,20 +66,20 @@ add_task(function* test_searchterms_uri(
do_print("result: " + root.getChild(i).uri + " Title: " + root.getChild(i).title);
}
// Check our inital result set
compareArrayToResult(testData, root);
// live update.
do_print("change title");
- var change1 = [{isDetails: true, uri:"http://foo.com/",
+ var change1 = [{isDetails: true, uri: "http://foo.com/",
title: "mo"}, ];
yield task_populateDB(change1);
do_check_false(isInResult({uri: "http://foo.com/"}, root));
- var change2 = [{isDetails: true, uri:"http://foo.com/",
+ var change2 = [{isDetails: true, uri: "http://foo.com/",
title: "moz"}, ];
yield task_populateDB(change2);
do_check_true(isInResult({uri: "http://foo.com/"}, root));
root.containerOpen = false;
});
--- a/toolkit/components/places/tests/unit/test_bookmarks_json.js
+++ b/toolkit/components/places/tests/unit/test_bookmarks_json.js
@@ -12,50 +12,50 @@ const LOAD_IN_SIDEBAR_ANNO = "bookmarkPr
const DESCRIPTION_ANNO = "bookmarkProperties/description";
// An object representing the contents of bookmarks.json.
var test_bookmarks = {
menu: [
{ guid: "OCyeUO5uu9FF",
title: "Mozilla Firefox",
children: [
- { guid:"OCyeUO5uu9FG",
+ { guid: "OCyeUO5uu9FG",
title: "Help and Tutorials",
url: "http://en-us.www.mozilla.com/en-US/firefox/help/",
icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
},
- { guid:"OCyeUO5uu9FH",
+ { guid: "OCyeUO5uu9FH",
title: "Customize Firefox",
url: "http://en-us.www.mozilla.com/en-US/firefox/customize/",
icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
},
- { guid:"OCyeUO5uu9FI",
+ { guid: "OCyeUO5uu9FI",
title: "Get Involved",
url: "http://en-us.www.mozilla.com/en-US/firefox/community/",
icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
},
- { guid:"OCyeUO5uu9FJ",
+ { guid: "OCyeUO5uu9FJ",
title: "About Us",
url: "http://en-us.www.mozilla.com/en-US/about/",
icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
}
]
},
{
guid: "OCyeUO5uu9FK",
type: Ci.nsINavHistoryResultNode.RESULT_TYPE_SEPARATOR
},
{
- guid:"OCyeUO5uu9FL",
+ guid: "OCyeUO5uu9FL",
title: "test",
description: "folder test comment",
dateAdded: 1177541020000000,
// lastModified: 1177541050000000,
children: [
- { guid:"OCyeUO5uu9GX",
+ { guid: "OCyeUO5uu9GX",
title: "test post keyword",
description: "item description",
dateAdded: 1177375336000000,
// lastModified: 1177375423000000,
keyword: "test",
sidebar: true,
postData: "hidden1%3Dbar&text1%3D%25s",
charset: "ISO-8859-1"
@@ -64,17 +64,17 @@ var test_bookmarks = {
}
],
toolbar: [
{ guid: "OCyeUO5uu9FB",
title: "Getting Started",
url: "http://en-us.www.mozilla.com/en-US/firefox/central/",
icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg=="
},
- { guid:"OCyeUO5uu9FR",
+ { guid: "OCyeUO5uu9FR",
title: "Latest Headlines",
url: "http://en-us.fxfeeds.mozilla.com/en-US/firefox/livebookmarks/",
feedUrl: "http://en-us.fxfeeds.mozilla.com/en-US/firefox/headlines.xml"
}
],
unfiled: [
{ guid: "OCyeUO5uu9FW",
title: "Example.tld",
--- a/toolkit/components/places/tests/unit/test_sync_utils.js
+++ b/toolkit/components/places/tests/unit/test_sync_utils.js
@@ -1165,17 +1165,17 @@ add_task(function* test_update_livemark(
syncId: livemark.guid,
site: site + "/new",
}), "Reinserting livemark with changed site URL requires full record");
let newLivemark = yield PlacesSyncUtils.bookmarks.update({
kind: "livemark",
parentSyncId: "menu",
syncId: livemark.guid,
- feed:feedURI,
+ feed: feedURI,
site: site + "/new",
});
notEqual(newLivemark, livemark,
"Livemark with changed site URL should replace old livemark");
equal(newLivemark.syncId, livemark.guid,
"GUIDs should match for reinserted livemark with changed site URL");
equal(newLivemark.site.href, site + "/new",
"Reinserted livemark should have changed site URI");
--- a/toolkit/components/prompts/content/commonDialog.js
+++ b/toolkit/components/prompts/content/commonDialog.js
@@ -21,33 +21,33 @@ function commonDialogOnLoad() {
while (propEnum.hasMoreElements()) {
let prop = propEnum.getNext().QueryInterface(Ci.nsIProperty);
args[prop.name] = prop.value;
}
let dialog = document.documentElement;
let ui = {
- prompt : window,
- loginContainer : document.getElementById("loginContainer"),
- loginTextbox : document.getElementById("loginTextbox"),
- loginLabel : document.getElementById("loginLabel"),
- password1Container : document.getElementById("password1Container"),
- password1Textbox : document.getElementById("password1Textbox"),
- password1Label : document.getElementById("password1Label"),
- infoBody : document.getElementById("info.body"),
- infoTitle : document.getElementById("info.title"),
- infoIcon : document.getElementById("info.icon"),
- checkbox : document.getElementById("checkbox"),
- checkboxContainer : document.getElementById("checkboxContainer"),
- button3 : dialog.getButton("extra2"),
- button2 : dialog.getButton("extra1"),
- button1 : dialog.getButton("cancel"),
- button0 : dialog.getButton("accept"),
- focusTarget : window,
+ prompt: window,
+ loginContainer: document.getElementById("loginContainer"),
+ loginTextbox: document.getElementById("loginTextbox"),
+ loginLabel: document.getElementById("loginLabel"),
+ password1Container: document.getElementById("password1Container"),
+ password1Textbox: document.getElementById("password1Textbox"),
+ password1Label: document.getElementById("password1Label"),
+ infoBody: document.getElementById("info.body"),
+ infoTitle: document.getElementById("info.title"),
+ infoIcon: document.getElementById("info.icon"),
+ checkbox: document.getElementById("checkbox"),
+ checkboxContainer: document.getElementById("checkboxContainer"),
+ button3: dialog.getButton("extra2"),
+ button2: dialog.getButton("extra1"),
+ button1: dialog.getButton("cancel"),
+ button0: dialog.getButton("accept"),
+ focusTarget: window,
};
// limit the dialog to the screen width
document.getElementById("filler").maxWidth = screen.availWidth;
Dialog = new CommonDialog(args, ui);
Dialog.onLoad(dialog);
// resize the window to the content
--- a/toolkit/components/prompts/content/tabprompts.xml
+++ b/toolkit/components/prompts/content/tabprompts.xml
@@ -89,32 +89,32 @@
<constructor>
<![CDATA[
let self = this;
function getElement(anonid) {
return document.getAnonymousElementByAttribute(self, "anonid", anonid);
}
this.ui = {
- prompt : this,
- loginContainer : getElement("loginContainer"),
- loginTextbox : getElement("loginTextbox"),
- loginLabel : getElement("loginLabel"),
- password1Container : getElement("password1Container"),
- password1Textbox : getElement("password1Textbox"),
- password1Label : getElement("password1Label"),
- infoBody : getElement("info.body"),
- infoTitle : getElement("info.title"),
- infoIcon : null,
- checkbox : getElement("checkbox"),
- checkboxContainer : getElement("checkboxContainer"),
- button3 : getElement("button3"),
- button2 : getElement("button2"),
- button1 : getElement("button1"),
- button0 : getElement("button0"),
+ prompt: this,
+ loginContainer: getElement("loginContainer"),
+ loginTextbox: getElement("loginTextbox"),
+ loginLabel: getElement("loginLabel"),
+ password1Container: getElement("password1Container"),
+ password1Textbox: getElement("password1Textbox"),
+ password1Label: getElement("password1Label"),
+ infoBody: getElement("info.body"),
+ infoTitle: getElement("info.title"),
+ infoIcon: null,
+ checkbox: getElement("checkbox"),
+ checkboxContainer: getElement("checkboxContainer"),
+ button3: getElement("button3"),
+ button2: getElement("button2"),
+ button1: getElement("button1"),
+ button0: getElement("button0"),
// focusTarget (for BUTTON_DELAY_ENABLE) not yet supported
};
this.ui.button0.addEventListener("command", this.onButtonClick.bind(this, 0));
this.ui.button1.addEventListener("command", this.onButtonClick.bind(this, 1));
this.ui.button2.addEventListener("command", this.onButtonClick.bind(this, 2));
this.ui.button3.addEventListener("command", this.onButtonClick.bind(this, 3));
// Anonymous wrapper used here because |Dialog| doesn't exist until init() is called!
--- a/toolkit/components/prompts/src/CommonDialog.jsm
+++ b/toolkit/components/prompts/src/CommonDialog.jsm
@@ -16,24 +16,24 @@ XPCOMUtils.defineLazyModuleGetter(this,
this.CommonDialog = function CommonDialog(args, ui) {
this.args = args;
this.ui = ui;
}
CommonDialog.prototype = {
- args : null,
- ui : null,
+ args: null,
+ ui: null,
- hasInputField : true,
- numButtons : undefined,
- iconClass : undefined,
- soundID : undefined,
- focusTimer : null,
+ hasInputField: true,
+ numButtons: undefined,
+ iconClass: undefined,
+ soundID: undefined,
+ focusTimer: null,
onLoad(xulDialog) {
switch (this.args.promptType) {
case "alert":
case "alertCheck":
this.hasInputField = false;
this.numButtons = 1;
this.iconClass = ["alert-icon"];
--- a/toolkit/components/prompts/src/nsPrompter.js
+++ b/toolkit/components/prompts/src/nsPrompter.js
@@ -13,18 +13,18 @@ Cu.import("resource://gre/modules/XPCOMU
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/SharedPromptUtils.jsm");
function Prompter() {
// Note that EmbedPrompter clones this implementation.
}
Prompter.prototype = {
- classID : Components.ID("{1c978d25-b37f-43a8-a2d6-0c7a239ead87}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIPromptService, Ci.nsIPromptService2]),
+ classID: Components.ID("{1c978d25-b37f-43a8-a2d6-0c7a239ead87}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIPromptFactory, Ci.nsIPromptService, Ci.nsIPromptService2]),
/* ---------- private members ---------- */
pickPrompter(domWin) {
return new ModalPrompter(domWin);
},
@@ -113,17 +113,17 @@ Prompter.prototype = {
return p.asyncPromptAuth(channel, callback, context, level, authInfo, checkLabel, checkValue);
},
};
// Common utils not specific to a particular prompter style.
var PromptUtilsTemp = {
- __proto__ : PromptUtils,
+ __proto__: PromptUtils,
getLocalizedString(key, formatArgs) {
if (formatArgs)
return this.strBundle.formatStringFromName(key, formatArgs, formatArgs.length);
return this.strBundle.GetStringFromName(key);
},
confirmExHelper(flags, button0, button1, button2) {
@@ -494,25 +494,25 @@ function openRemotePrompt(domWin, args,
thread.processNextEvent(true);
}
}
function ModalPrompter(domWin) {
this.domWin = domWin;
}
ModalPrompter.prototype = {
- domWin : null,
+ domWin: null,
/*
* Default to not using a tab-modal prompt, unless the caller opts in by
* QIing to nsIWritablePropertyBag and setting the value of this property
* to true.
*/
- allowTabModal : false,
+ allowTabModal: false,
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIPrompt, Ci.nsIAuthPrompt,
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt, Ci.nsIAuthPrompt,
Ci.nsIAuthPrompt2,
Ci.nsIWritablePropertyBag2]),
/* ---------- internal methods ---------- */
openPrompt(args) {
@@ -868,34 +868,34 @@ ModalPrompter.prototype = {
throw Cr.NS_ERROR_ILLEGAL_VALUE;
},
};
function AuthPromptAdapterFactory() {
}
AuthPromptAdapterFactory.prototype = {
- classID : Components.ID("{6e134924-6c3a-4d86-81ac-69432dd971dc}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAuthPromptAdapterFactory]),
+ classID: Components.ID("{6e134924-6c3a-4d86-81ac-69432dd971dc}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPromptAdapterFactory]),
/* ---------- nsIAuthPromptAdapterFactory ---------- */
createAdapter(oldPrompter) {
return new AuthPromptAdapter(oldPrompter);
}
};
// Takes an nsIAuthPrompt implementation, wraps it with a nsIAuthPrompt2 shell.
function AuthPromptAdapter(oldPrompter) {
this.oldPrompter = oldPrompter;
}
AuthPromptAdapter.prototype = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
- oldPrompter : null,
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
+ oldPrompter: null,
/* ---------- nsIAuthPrompt2 ---------- */
promptAuth(channel, level, authInfo, checkLabel, checkValue) {
let message = PromptUtils.makeAuthMessage(channel, authInfo);
let [username, password] = PromptUtils.getAuthInfo(authInfo);
let userParam = { value: username };
--- a/toolkit/components/prompts/test/test_bug619644.html
+++ b/toolkit/components/prompts/test/test_bug619644.html
@@ -36,28 +36,28 @@ function inittest() {
SimpleTest.waitForExplicitFinish();
}
function runtest(e) {
window.removeEventListener("message", runtest);
window.addEventListener("message", checktest);
let state = {
- msg : "Message",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "Message",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
let action = {
buttonClick: "ESC",
};
promptDone = handlePrompt(state, action);
}
--- a/toolkit/components/prompts/test/test_bug620145.html
+++ b/toolkit/components/prompts/test/test_bug620145.html
@@ -37,28 +37,28 @@ function openAlert() {
add_task(function* runTest() {
var state, action;
// The <button> in this test's HTML opens a prompt when clicked.
// Here we send the events to simulate clicking it.
info("isTabModal? " + isTabModal);
selectionTest = isTabModal;
state = {
- msg : "hello!",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "hello!",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
var button = $("button");
--- a/toolkit/components/prompts/test/test_dom_prompts.html
+++ b/toolkit/components/prompts/test/test_dom_prompts.html
@@ -15,56 +15,56 @@
<script class="testbody" type="text/javascript">
/* import-globals-from prompt_common.js */
var rv;
var state, action;
add_task(function* test_alert_ok() {
info("Starting test: Alert");
state = {
- msg : "This is the alert text.",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the alert text.",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
alert("This is the alert text.");
yield promptDone;
});
// bug 861605 made the arguments to alert/confirm optional (prompt already was).
add_task(function* test_alert_noargs() {
info("Starting test: Alert with no args");
state = {
- msg : "",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
try {
@@ -76,28 +76,28 @@ add_task(function* test_alert_noargs() {
yield promptDone;
});
add_task(function* test_confirm_ok() {
info("Starting test: Confirm");
state = {
- msg : "This is the confirm text.",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the confirm text.",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
rv = confirm("This is the confirm text.");
@@ -105,28 +105,28 @@ add_task(function* test_confirm_ok() {
yield promptDone;
});
// bug 861605 made the arguments to alert/confirm optional (prompt already was).
add_task(function* test_confirm_noargs() {
info("Starting test: Confirm with no args");
state = {
- msg : "",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
try {
@@ -139,28 +139,28 @@ add_task(function* test_confirm_noargs()
yield promptDone;
});
add_task(function* test_prompt_ok() {
info("Starting test: Prompt");
state = {
- msg : "This is the Prompt text.",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the Prompt text.",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
rv = prompt("This is the Prompt text.");
@@ -168,28 +168,28 @@ add_task(function* test_prompt_ok() {
yield promptDone;
});
// bug 861605 made the arguments to alert/confirm optional (prompt already was).
add_task(function* test_prompt_noargs() {
info("Starting test: Prompt with no args");
state = {
- msg : "",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
try {
--- a/toolkit/components/prompts/test/test_modal_prompts.html
+++ b/toolkit/components/prompts/test/test_modal_prompts.html
@@ -41,29 +41,29 @@ function* runTests() {
let textVal = {};
let passVal = {};
let flags;
let isOK, clickedButton;
// =====
info("Starting test: Alert");
state = {
- msg : "This is the alert text.",
- title : "TestTitle",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the alert text.",
+ title: "TestTitle",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
promptArgs = ["TestTitle", "This is the alert text."];
@@ -71,29 +71,29 @@ function* runTests() {
promptArgs.unshift(window);
prompter.alert.apply(null, promptArgs);
yield promptDone;
// =====
info("Starting test: AlertCheck (null checkbox label, so it's hidden)");
state = {
- msg : "This is the alertCheck text.",
- title : "TestTitle",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the alertCheck text.",
+ title: "TestTitle",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
promptArgs = ["TestTitle", "This is the alertCheck text.", null, {}];
@@ -101,29 +101,29 @@ function* runTests() {
promptArgs.unshift(window);
prompter.alertCheck.apply(null, promptArgs);
yield promptDone;
// =====
info("Starting test: AlertCheck");
state = {
- msg : "This is the alertCheck text.",
- title : "TestTitle",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the alertCheck text.",
+ title: "TestTitle",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -134,29 +134,29 @@ function* runTests() {
prompter.alertCheck.apply(null, promptArgs);
is(checkVal.value, true, "checkbox was checked");
yield promptDone;
// =====
info("Starting test: Confirm (ok)");
state = {
- msg : "This is the confirm text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the confirm text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
promptArgs = ["TestTitle", "This is the confirm text."];
@@ -165,29 +165,29 @@ function* runTests() {
isOK = prompter.confirm.apply(null, promptArgs);
is(isOK, true, "checked expected retval");
yield promptDone;
// =====
info("Starting test: Confirm (cancel)");
state = {
- msg : "This is the confirm text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the confirm text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "cancel",
};
promptDone = handlePrompt(state, action);
promptArgs = ["TestTitle", "This is the confirm text."];
@@ -196,29 +196,29 @@ function* runTests() {
isOK = prompter.confirm.apply(null, promptArgs);
is(isOK, false, "checked expected retval");
yield promptDone;
// =====
info("Starting test: ConfirmCheck (ok, null checkbox label)");
state = {
- msg : "This is the confirmCheck text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the confirmCheck text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
promptArgs = ["TestTitle", "This is the confirmCheck text.", null, {}];
@@ -227,29 +227,29 @@ function* runTests() {
isOK = prompter.confirmCheck.apply(null, promptArgs);
is(isOK, true, "checked expected retval");
yield promptDone;
// =====
info("Starting test: ConfirmCheck (cancel, null checkbox label)");
state = {
- msg : "This is the confirmCheck text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the confirmCheck text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "cancel",
};
promptDone = handlePrompt(state, action);
promptArgs = ["TestTitle", "This is the confirmCheck text.", null, {}];
@@ -258,29 +258,29 @@ function* runTests() {
isOK = prompter.confirmCheck.apply(null, promptArgs);
is(isOK, false, "checked expected retval");
yield promptDone;
// =====
info("Starting test: ConfirmCheck (ok)");
state = {
- msg : "This is the confirmCheck text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the confirmCheck text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -292,29 +292,29 @@ function* runTests() {
is(isOK, true, "checked expected retval");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: ConfirmCheck (cancel)");
state = {
- msg : "This is the confirmCheck text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the confirmCheck text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "cancel",
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -326,33 +326,33 @@ function* runTests() {
is(isOK, false, "checked expected retval");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: Prompt (ok, no default text)");
state = {
- msg : "This is the prompt text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the prompt text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- textField : "bacon",
+ buttonClick: "ok",
+ textField: "bacon",
};
promptDone = handlePrompt(state, action);
textVal.value = "";
promptArgs = ["TestTitle", "This is the prompt text.", textVal, null, {}];
if (usePromptService)
promptArgs.unshift(window);
@@ -360,29 +360,29 @@ function* runTests() {
is(isOK, true, "checked expected retval");
is(textVal.value, "bacon", "checking expected text value");
yield promptDone;
// =====
info("Starting test: Prompt (ok, default text)");
state = {
- msg : "This is the prompt text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- textValue : "kittens",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the prompt text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "kittens",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
textVal.value = "kittens";
@@ -393,29 +393,29 @@ function* runTests() {
is(isOK, true, "checked expected retval");
is(textVal.value, "kittens", "checking expected text value");
yield promptDone;
// =====
info("Starting test: Prompt (cancel, default text)");
state = {
- msg : "This is the prompt text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- textValue : "puppies",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the prompt text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "puppies",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
buttonClick: "cancel",
};
promptDone = handlePrompt(state, action);
textVal.value = "puppies";
@@ -426,33 +426,33 @@ function* runTests() {
is(isOK, false, "checked expected retval");
is(textVal.value, "puppies", "checking expected text value");
yield promptDone;
// =====
info("Starting test: Prompt (cancel, default text modified)");
state = {
- msg : "This is the prompt text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : true,
- textValue : "puppies",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the prompt text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "puppies",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "cancel",
- textField : "bacon",
+ buttonClick: "cancel",
+ textField: "bacon",
};
promptDone = handlePrompt(state, action);
textVal.value = "puppies";
promptArgs = ["TestTitle", "This is the prompt text.", textVal, null, {}];
if (usePromptService)
promptArgs.unshift(window);
@@ -460,29 +460,29 @@ function* runTests() {
is(isOK, false, "checked expected retval");
is(textVal.value, "puppies", "checking expected text value");
yield promptDone;
// =====
info("Starting test: Prompt (ok, with checkbox)");
state = {
- msg : "This is the prompt text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : false,
- textValue : "tribbles",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the prompt text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "tribbles",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -496,29 +496,29 @@ function* runTests() {
is(textVal.value, "tribbles", "checking expected text value");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: Prompt (cancel, with checkbox)");
state = {
- msg : "This is the prompt text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : true,
- checkHidden : false,
- textValue : "tribbles",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the prompt text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "tribbles",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
buttonClick: "cancel",
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -533,29 +533,29 @@ function* runTests() {
is(checkVal.value, false, "expected checkbox setting");
yield promptDone;
// =====
// Just two tests for this, since password manager already tests this extensively.
info("Starting test: PromptUsernameAndPassword (ok)");
state = {
- msg : "This is the pUAP text.",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- textValue : "usr",
- passValue : "ssh",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the pUAP text.",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "usr",
+ passValue: "ssh",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
setCheckbox: true,
textField: "newusr",
passField: "newssh",
};
@@ -573,35 +573,35 @@ function* runTests() {
is(passVal.value, "newssh", "checking expected pass value");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: PromptUsernameAndPassword (cancel)");
state = {
- msg : "This is the pUAP text.",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- textValue : "usr",
- passValue : "ssh",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "This is the pUAP text.",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "usr",
+ passValue: "ssh",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "cancel",
- setCheckbox : true,
- textField : "newusr",
- passField : "newssh",
+ buttonClick: "cancel",
+ setCheckbox: true,
+ textField: "newusr",
+ passField: "newssh",
};
promptDone = handlePrompt(state, action);
textVal.value = "usr";
passVal.value = "ssh";
checkVal.value = false;
promptArgs = ["TestTitle", "This is the pUAP text.", textVal, passVal, "Check me out!", checkVal];
@@ -613,34 +613,34 @@ function* runTests() {
is(passVal.value, "ssh", "checking expected pass value");
is(checkVal.value, false, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: PromptPassword (ok)");
state = {
- msg : "This is the promptPassword text.",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : false,
- textValue : "",
- passValue : "ssh",
- checkMsg : "Check me out!",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "This is the promptPassword text.",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "",
+ passValue: "ssh",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- setCheckbox : true,
- passField : "newssh",
+ buttonClick: "ok",
+ setCheckbox: true,
+ passField: "newssh",
};
promptDone = handlePrompt(state, action);
passVal.value = "ssh";
checkVal.value = false;
promptArgs = ["TestTitle", "This is the promptPassword text.", passVal, "Check me out!", checkVal];
if (usePromptService)
@@ -650,34 +650,34 @@ function* runTests() {
is(passVal.value, "newssh", "checking expected pass value");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: PromptPassword (cancel)");
state = {
- msg : "This is the promptPassword text.",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : false,
- checkHidden : false,
- textValue : "",
- passValue : "ssh",
- checkMsg : "Check me out!",
- checked : false,
- focused : "passField",
- defButton : "button0",
+ msg: "This is the promptPassword text.",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "",
+ passValue: "ssh",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "passField",
+ defButton: "button0",
};
action = {
- buttonClick : "cancel",
- setCheckbox : true,
- passField : "newssh",
+ buttonClick: "cancel",
+ setCheckbox: true,
+ passField: "newssh",
};
promptDone = handlePrompt(state, action);
passVal.value = "ssh";
checkVal.value = false;
promptArgs = ["TestTitle", "This is the promptPassword text.", passVal, "Check me out!", checkVal];
if (usePromptService)
@@ -687,31 +687,31 @@ function* runTests() {
is(passVal.value, "ssh", "checking expected pass value");
is(checkVal.value, false, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: ConfirmEx (ok/cancel, ok)");
state = {
- msg : "This is the confirmEx text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
- butt0Label : "OK",
- butt1Label : "Cancel",
+ msg: "This is the confirmEx text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
+ butt0Label: "OK",
+ butt1Label: "Cancel",
};
action = {
buttonClick: "ok",
};
promptDone = handlePrompt(state, action);
flags = Ci.nsIPromptService.STD_OK_CANCEL_BUTTONS;
@@ -721,31 +721,31 @@ function* runTests() {
clickedButton = prompter.confirmEx.apply(null, promptArgs);
is(clickedButton, 0, "checked expected button num click");
yield promptDone;
// =====
info("Starting test: ConfirmEx (yes/no, cancel)");
state = {
- msg : "This is the confirmEx text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
- butt0Label : "Yes",
- butt1Label : "No",
+ msg: "This is the confirmEx text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
+ butt0Label: "Yes",
+ butt1Label: "No",
};
action = {
buttonClick: "cancel",
};
promptDone = handlePrompt(state, action);
flags = Ci.nsIPromptService.STD_YES_NO_BUTTONS;
@@ -755,32 +755,32 @@ function* runTests() {
clickedButton = prompter.confirmEx.apply(null, promptArgs);
is(clickedButton, 1, "checked expected button num click");
yield promptDone;
// =====
info("Starting test: ConfirmEx (buttons from args, checkbox, ok)");
state = {
- msg : "This is the confirmEx text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "button0",
- defButton : "button0",
- butt0Label : "butt0",
- butt1Label : "butt1",
- butt2Label : "butt2",
+ msg: "This is the confirmEx text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
+ butt0Label: "butt0",
+ butt1Label: "butt1",
+ butt2Label: "butt2",
};
action = {
buttonClick: "ok",
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -797,32 +797,32 @@ function* runTests() {
is(clickedButton, 0, "checked expected button num click");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: ConfirmEx (buttons from args, checkbox, cancel)");
state = {
- msg : "This is the confirmEx text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "button1", // Default changed!
- defButton : "button1",
- butt0Label : "butt0",
- butt1Label : "butt1",
- butt2Label : "butt2",
+ msg: "This is the confirmEx text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "button1", // Default changed!
+ defButton: "button1",
+ butt0Label: "butt0",
+ butt1Label: "butt1",
+ butt2Label: "butt2",
};
action = {
buttonClick: "cancel",
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -840,32 +840,32 @@ function* runTests() {
is(clickedButton, 1, "checked expected button num click");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
info("Starting test: ConfirmEx (buttons from args, checkbox, button3)");
state = {
- msg : "This is the confirmEx text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "button2", // Default changed!
- defButton : "button2",
- butt0Label : "butt0",
- butt1Label : "butt1",
- butt2Label : "butt2",
+ msg: "This is the confirmEx text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "button2", // Default changed!
+ defButton: "button2",
+ butt0Label: "butt0",
+ butt1Label: "butt1",
+ butt2Label: "butt2",
};
action = {
buttonClick: 2,
setCheckbox: true,
};
promptDone = handlePrompt(state, action);
@@ -884,29 +884,29 @@ function* runTests() {
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
// =====
// (skipped for E10S and tabmodal tests: window is required)
info("Starting test: Alert, no window");
state = {
- msg : "This is the alert text.",
- title : "TestTitle",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "This is the alert text.",
+ title: "TestTitle",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
if (!isTabModal && !isE10S) {
promptDone = handlePrompt(state, action);
promptArgs = ["TestTitle", "This is the alert text."];
@@ -917,31 +917,31 @@ function* runTests() {
yield promptDone;
}
// =====
// (skipped for tabmodal tests: delay not supported)
info("Starting test: ConfirmEx (delay, ok)");
state = {
- msg : "This is the confirmEx delay text.",
- title : "TestTitle",
- iconClass : "question-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : null, // nothing focused until after delay fires
- defButton : "button0",
- butt0Label : "OK",
- butt1Label : "Cancel",
+ msg: "This is the confirmEx delay text.",
+ title: "TestTitle",
+ iconClass: "question-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: null, // nothing focused until after delay fires
+ defButton: "button0",
+ butt0Label: "OK",
+ butt1Label: "Cancel",
butt0Disabled: true,
};
// OS X doesn't initially focus the button, but rather the infoBody.
// The focus stays there even after the button-enable delay has fired.
if (isOSX)
state.focused = "infoBody";
@@ -964,48 +964,48 @@ function* runTests() {
// promptAuth already tested via password manager but do a few specific things here.
var channel = NetUtil.newChannel({
uri: "http://example.com",
loadUsingSystemPrincipal: true
});
var level = Ci.nsIAuthPrompt2.LEVEL_NONE;
var authinfo = {
- username : "",
- password : "",
- domain : "",
- flags : Ci.nsIAuthInformation.AUTH_HOST,
- authenticationScheme : "basic",
- realm : ""
+ username: "",
+ password: "",
+ domain: "",
+ flags: Ci.nsIAuthInformation.AUTH_HOST,
+ authenticationScheme: "basic",
+ realm: ""
};
// =====
// (promptAuth is only accessible from the prompt service)
info("Starting test: promptAuth with empty realm");
state = {
- msg : "http://example.com is requesting your username and password.",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example.com is requesting your username and password.",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- setCheckbox : true,
- textField : "username",
- passField : "password",
+ buttonClick: "ok",
+ setCheckbox: true,
+ textField: "username",
+ passField: "password",
};
if (usePromptService) {
promptDone = handlePrompt(state, action);
checkVal.value = false;
isOK = prompter.promptAuth(window, channel, level, authinfo, "Check me out!", checkVal);
is(isOK, true, "checked expected retval");
is(authinfo.username, "username", "checking filled username");
@@ -1015,38 +1015,38 @@ function* runTests() {
yield promptDone;
}
// =====
// (promptAuth is only accessible from the prompt service)
info("Starting test: promptAuth with long realm");
state = {
- msg : "http://example.com is requesting your username and password. The site " +
+ msg: "http://example.com is requesting your username and password. The site " +
"says: \u201cabcdefghi abcdefghi abcdefghi abcdefghi abcdefghi abcdefghi abcdefghi " +
"abcdefghi abcdefghi abcdefghi abcdefghi abcdefghi abcdefghi abcdefghi " +
"abcdefghi \u2026\u201d",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- setCheckbox : true,
- textField : "username",
- passField : "password",
+ buttonClick: "ok",
+ setCheckbox: true,
+ textField: "username",
+ passField: "password",
};
if (usePromptService) {
promptDone = handlePrompt(state, action);
checkVal.value = false;
var longString = "";
for (var i = 0; i < 20; i++)
longString += "abcdefghi "; // 200 chars long
@@ -1059,88 +1059,88 @@ function* runTests() {
is(authinfo.password, "password", "checking filled password");
is(checkVal.value, true, "expected checkbox setting");
yield promptDone;
}
info("Starting test: promptAuth for a cross-origin and a empty realm");
authinfo = {
- username : "",
- password : "",
- domain : "",
- flags : Ci. nsIAuthInformation.AUTH_HOST |
- Ci.nsIAuthInformation.CROSS_ORIGIN_SUB_RESOURCE,
- authenticationScheme : "basic",
- realm : ""
+ username: "",
+ password: "",
+ domain: "",
+ flags: Ci. nsIAuthInformation.AUTH_HOST |
+ Ci.nsIAuthInformation.CROSS_ORIGIN_SUB_RESOURCE,
+ authenticationScheme: "basic",
+ realm: ""
}
state = {
- msg : "http://example.com is requesting your username and password. " +
+ msg: "http://example.com is requesting your username and password. " +
"WARNING: Your password will not be sent to the website you are currently visiting!",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- setCheckbox : false,
- textField : "username",
- passField : "password",
+ buttonClick: "ok",
+ setCheckbox: false,
+ textField: "username",
+ passField: "password",
};
if (usePromptService) {
promptDone = handlePrompt(state, action);
checkVal.value = false;
isOK = prompter.promptAuth(window, channel, level, authinfo, "Check me out!", checkVal);
is(isOK, true, "checked expected retval");
is(authinfo.username, "username", "checking filled username");
is(authinfo.password, "password", "checking filled password");
is(checkVal.value, false, "expected checkbox setting");
yield promptDone;
}
info("Starting test: promptAuth for a cross-origin with realm");
authinfo = {
- username : "",
- password : "",
- domain : "",
- flags : Ci. nsIAuthInformation.AUTH_HOST | Ci.nsIAuthInformation.CROSS_ORIGIN_SUB_RESOURCE,
- authenticationScheme : "basic",
- realm : "Something!!!"
+ username: "",
+ password: "",
+ domain: "",
+ flags: Ci. nsIAuthInformation.AUTH_HOST | Ci.nsIAuthInformation.CROSS_ORIGIN_SUB_RESOURCE,
+ authenticationScheme: "basic",
+ realm: "Something!!!"
}
state = {
- msg : "http://example.com is requesting your username and password. " +
+ msg: "http://example.com is requesting your username and password. " +
"WARNING: Your password will not be sent to the website you are currently visiting!",
- title : "TestTitle",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : false,
- textValue : "",
- passValue : "",
- checkMsg : "Check me out!",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ title: "TestTitle",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: false,
+ textValue: "",
+ passValue: "",
+ checkMsg: "Check me out!",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- setCheckbox : false,
- textField : "username",
- passField : "password",
+ buttonClick: "ok",
+ setCheckbox: false,
+ textField: "username",
+ passField: "password",
};
if (usePromptService) {
promptDone = handlePrompt(state, action);
checkVal.value = false;
isOK = prompter.promptAuth(window, channel, level, authinfo, "Check me out!", checkVal);
is(isOK, true, "checked expected retval");
is(authinfo.username, "username", "checking filled username");
--- a/toolkit/components/prompts/test/test_modal_select.html
+++ b/toolkit/components/prompts/test/test_modal_select.html
@@ -53,19 +53,19 @@ function handlePrompt(state, action) {
});
}
// =====
add_task(function* test_select_empty_list() {
info("Starting test: Select (0 items, ok)");
let state = {
- msg : "This is the select text.",
- title : "TestTitle",
- items : [],
+ msg: "This is the select text.",
+ title: "TestTitle",
+ items: [],
};
let action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
let items = [];
selectVal.value = null; // outparam, just making sure.
isOK = prompter.select(window, "TestTitle", "This is the select text.", items.length, items, selectVal);
@@ -74,19 +74,19 @@ add_task(function* test_select_empty_lis
yield promptDone;
});
// =====
add_task(function* test_select_ok() {
info("Starting test: Select (3 items, ok)");
let state = {
- msg : "This is the select text.",
- title : "TestTitle",
- items : ["one", "two", "three"],
+ msg: "This is the select text.",
+ title: "TestTitle",
+ items: ["one", "two", "three"],
};
let action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
let items = ["one", "two", "three"];
selectVal.value = null; // outparam, just making sure.
isOK = prompter.select(window, "TestTitle", "This is the select text.", items.length, items, selectVal);
@@ -95,19 +95,19 @@ add_task(function* test_select_ok() {
yield promptDone;
});
// =====
add_task(function* test_select_item() {
info("Starting test: Select (3 items, selection changed, ok)");
let state = {
- msg : "This is the select text.",
- title : "TestTitle",
- items : ["one", "two", "three"],
+ msg: "This is the select text.",
+ title: "TestTitle",
+ items: ["one", "two", "three"],
};
let action = {
buttonClick: "ok",
selectItem: 1,
};
let promptDone = handlePrompt(state, action);
let items = ["one", "two", "three"];
selectVal.value = null; // outparam, just making sure.
@@ -117,19 +117,19 @@ add_task(function* test_select_item() {
yield promptDone;
});
// =====
add_task(function* test_cancel_prompt() {
info("Starting test: Select (3 items, cancel)");
let state = {
- msg : "This is the select text.",
- title : "TestTitle",
- items : ["one", "two", "three"],
+ msg: "This is the select text.",
+ title: "TestTitle",
+ items: ["one", "two", "three"],
};
let action = {
buttonClick: "cancel",
};
let promptDone = handlePrompt(state, action);
let items = ["one", "two", "three"];
selectVal.value = null; // outparam, just making sure.
isOK = prompter.select(window, "TestTitle", "This is the select text.", items.length, items, selectVal);
--- a/toolkit/components/prompts/test/test_subresources_prompts.html
+++ b/toolkit/components/prompts/test/test_subresources_prompts.html
@@ -44,28 +44,28 @@ add_task(function* runTest() {
info("Ensuring iframe1 has loaded...");
yield iframe1Loaded;
info("Ensuring iframe2 has loaded...");
yield iframe2Loaded;
let state, action;
state = {
- msg : "hello world",
- iconClass : "alert-icon",
- titleHidden : true,
- textHidden : true,
- passHidden : true,
- checkHidden : true,
- textValue : "",
- passValue : "",
- checkMsg : "",
- checked : false,
- focused : "button0",
- defButton : "button0",
+ msg: "hello world",
+ iconClass: "alert-icon",
+ titleHidden: true,
+ textHidden: true,
+ passHidden: true,
+ checkHidden: true,
+ textValue: "",
+ passValue: "",
+ checkMsg: "",
+ checked: false,
+ focused: "button0",
+ defButton: "button0",
};
action = {
buttonClick: "ok",
};
let promptDone = handlePrompt(state, action);
var button = document.querySelector("button");
@@ -113,74 +113,74 @@ add_task(function* runTestAuth() {
// cross-origin subresources load
// Force parent to not look for tab-modal prompts, as they're not
// used for auth prompts.
isTabModal = false;
let state, action;
state = {
- msg : "http://mochi.test:8888 is requesting your username " +
- "and password. The site says: “mochitest”",
- title : "Authentication Required",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://mochi.test:8888 is requesting your username " +
+ "and password. The site says: “mochitest”",
+ title: "Authentication Required",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- setCheckbox : false,
- textField : "mochiuser1",
- passField : "mochipass1",
+ buttonClick: "ok",
+ setCheckbox: false,
+ textField: "mochiuser1",
+ passField: "mochipass1",
};
let promptDone = handlePrompt(state, action);
var iframe3Loaded = onloadPromiseFor("iframe_prompt");
iframe_prompt.src = "authenticate.sjs?user=mochiuser1&pass=mochipass1";
yield promptDone;
yield iframe3Loaded;
checkEchoedAuthInfo({user: "mochiuser1", pass: "mochipass1"},
iframe_prompt.contentDocument);
// Cross-origin subresourse test.
// Force parent to not look for tab-modal prompts, as they're not used for auth prompts.
isTabModal = false;
state = {
- msg : "http://example.com is requesting your username and password. " +
- "WARNING: Your password will not be sent to the website you are currently visiting!",
- title : "Authentication Required",
- textValue : "",
- passValue : "",
- iconClass : "authentication-icon question-icon",
- titleHidden : true,
- textHidden : false,
- passHidden : false,
- checkHidden : true,
- checkMsg : "",
- checked : false,
- focused : "textField",
- defButton : "button0",
+ msg: "http://example.com is requesting your username and password. " +
+ "WARNING: Your password will not be sent to the website you are currently visiting!",
+ title: "Authentication Required",
+ textValue: "",
+ passValue: "",
+ iconClass: "authentication-icon question-icon",
+ titleHidden: true,
+ textHidden: false,
+ passHidden: false,
+ checkHidden: true,
+ checkMsg: "",
+ checked: false,
+ focused: "textField",
+ defButton: "button0",
};
action = {
- buttonClick : "ok",
- setCheckbox : false,
- textField : "mochiuser2",
- passField : "mochipass2",
+ buttonClick: "ok",
+ setCheckbox: false,
+ textField: "mochiuser2",
+ passField: "mochipass2",
};
promptDone = handlePrompt(state, action);
iframe3Loaded = onloadPromiseFor("iframe_prompt");
iframe_prompt.src = "http://example.com/tests/toolkit/components/prompts/test/authenticate.sjs?user=mochiuser2&pass=mochipass2&realm=mochitest";
yield promptDone;
yield iframe3Loaded;
--- a/toolkit/components/satchel/FormHistory.jsm
+++ b/toolkit/components/satchel/FormHistory.jsm
@@ -148,44 +148,44 @@ function sendNotification(aType, aData)
Services.obs.notifyObservers(aData, "satchel-storage-changed", aType);
}
/**
* Current database schema
*/
const dbSchema = {
- tables : {
- moz_formhistory : {
- "id" : "INTEGER PRIMARY KEY",
- "fieldname" : "TEXT NOT NULL",
- "value" : "TEXT NOT NULL",
- "timesUsed" : "INTEGER",
- "firstUsed" : "INTEGER",
- "lastUsed" : "INTEGER",
- "guid" : "TEXT",
+ tables: {
+ moz_formhistory: {
+ "id": "INTEGER PRIMARY KEY",
+ "fieldname": "TEXT NOT NULL",
+ "value": "TEXT NOT NULL",
+ "timesUsed": "INTEGER",
+ "firstUsed": "INTEGER",
+ "lastUsed": "INTEGER",
+ "guid": "TEXT",
},
moz_deleted_formhistory: {
- "id" : "INTEGER PRIMARY KEY",
- "timeDeleted" : "INTEGER",
- "guid" : "TEXT"
+ "id": "INTEGER PRIMARY KEY",
+ "timeDeleted": "INTEGER",
+ "guid": "TEXT"
}
},
- indices : {
- moz_formhistory_index : {
- table : "moz_formhistory",
- columns : [ "fieldname" ]
+ indices: {
+ moz_formhistory_index: {
+ table: "moz_formhistory",
+ columns: [ "fieldname" ]
},
- moz_formhistory_lastused_index : {
- table : "moz_formhistory",
- columns : [ "lastUsed" ]
+ moz_formhistory_lastused_index: {
+ table: "moz_formhistory",
+ columns: [ "lastUsed" ]
},
- moz_formhistory_guid_index : {
- table : "moz_formhistory",
- columns : [ "guid" ]
+ moz_formhistory_guid_index: {
+ table: "moz_formhistory",
+ columns: [ "guid" ]
},
}
};
/**
* Validating and processing API querying data
*/
@@ -278,18 +278,18 @@ function makeAddStatement(aNewData, aNow
aNewData.firstUsed = aNewData.firstUsed || aNow;
aNewData.lastUsed = aNewData.lastUsed || aNow;
return dbCreateAsyncStatement(query, aNewData, aBindingArrays);
}
function makeBumpStatement(aGuid, aNow, aBindingArrays) {
let query = "UPDATE moz_formhistory SET timesUsed = timesUsed + 1, lastUsed = :lastUsed WHERE guid = :guid";
let queryParams = {
- lastUsed : aNow,
- guid : aGuid,
+ lastUsed: aNow,
+ guid: aGuid,
};
return dbCreateAsyncStatement(query, queryParams, aBindingArrays);
}
function makeRemoveStatement(aSearchData, aBindingArrays) {
let query = "DELETE FROM moz_formhistory";
let queryTerms = makeQueryPredicates(aSearchData);
@@ -699,17 +699,17 @@ function updateFormHistoryWrite(aChanges
aCallbacks.handleCompletion(aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED ? 0 : 1);
}
},
handleError(aError) {
if (aCallbacks && aCallbacks.handleError) {
aCallbacks.handleError(aError);
}
},
- handleResult : NOOP
+ handleResult: NOOP
};
dbConnection.executeAsync(stmts, stmts.length, handlers);
}
/**
* Functions that expire entries in form history and shrinks database
* afterwards as necessary initiated by expireOldEntries.
@@ -721,17 +721,17 @@ function updateFormHistoryWrite(aChanges
* Removes entries from database.
*/
function expireOldEntriesDeletion(aExpireTime, aBeginningCount) {
log("expireOldEntriesDeletion(" + aExpireTime + "," + aBeginningCount + ")");
FormHistory.update([
{
op: "remove",
- lastUsedEnd : aExpireTime,
+ lastUsedEnd: aExpireTime,
}], {
handleCompletion() {
expireOldEntriesVacuum(aExpireTime, aBeginningCount);
},
handleError(aError) {
log("expireOldEntriesDeletionFailure");
}
});
@@ -745,38 +745,38 @@ function expireOldEntriesDeletion(aExpir
function expireOldEntriesVacuum(aExpireTime, aBeginningCount) {
FormHistory.count({}, {
handleResult(aEndingCount) {
if (aBeginningCount - aEndingCount > 500) {
log("expireOldEntriesVacuum");
let stmt = dbCreateAsyncStatement("VACUUM");
stmt.executeAsync({
- handleResult : NOOP,
+ handleResult: NOOP,
handleError(aError) {
log("expireVacuumError");
},
- handleCompletion : NOOP
+ handleCompletion: NOOP
});
}
sendNotification("formhistory-expireoldentries", aExpireTime);
},
handleError(aError) {
log("expireEndCountFailure");
}
});
}
this.FormHistory = {
get enabled() {
return Prefs.enabled;
},
- search : function formHistorySearch(aSelectTerms, aSearchData, aCallbacks) {
+ search: function formHistorySearch(aSelectTerms, aSearchData, aCallbacks) {
// if no terms selected, select everything
aSelectTerms = (aSelectTerms) ? aSelectTerms : validFields;
validateSearchData(aSearchData, "Search");
let stmt = makeSearchStatement(aSearchData, aSelectTerms);
let handlers = {
handleResult(aResultSet) {
@@ -793,55 +793,55 @@ this.FormHistory = {
},
handleError(aError) {
if (aCallbacks && aCallbacks.handleError) {
aCallbacks.handleError(aError);
}
},
- handleCompletion : function searchCompletionHandler(aReason) {
+ handleCompletion: function searchCompletionHandler(aReason) {
if (aCallbacks && aCallbacks.handleCompletion) {
aCallbacks.handleCompletion(aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED ? 0 : 1);
}
}
};
stmt.executeAsync(handlers);
},
- count : function formHistoryCount(aSearchData, aCallbacks) {
+ count: function formHistoryCount(aSearchData, aCallbacks) {
validateSearchData(aSearchData, "Count");
let stmt = makeCountStatement(aSearchData);
let handlers = {
- handleResult : function countResultHandler(aResultSet) {
+ handleResult: function countResultHandler(aResultSet) {
let row = aResultSet.getNextRow();
let count = row.getResultByName("numEntries");
if (aCallbacks && aCallbacks.handleResult) {
aCallbacks.handleResult(count);
}
},
handleError(aError) {
if (aCallbacks && aCallbacks.handleError) {
aCallbacks.handleError(aError);
}
},
- handleCompletion : function searchCompletionHandler(aReason) {
+ handleCompletion: function searchCompletionHandler(aReason) {
if (aCallbacks && aCallbacks.handleCompletion) {
aCallbacks.handleCompletion(aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED ? 0 : 1);
}
}
};
stmt.executeAsync(handlers);
},
- update : function formHistoryUpdate(aChanges, aCallbacks) {
+ update: function formHistoryUpdate(aChanges, aCallbacks) {
// Used to keep track of how many searches have been started. When that number
// are finished, updateFormHistoryWrite can be called.
let numSearches = 0;
let completedSearches = 0;
let searchFailed = false;
function validIdentifier(change) {
// The identifier is only valid if one of either the guid or the (fieldname/value) are set
@@ -910,28 +910,28 @@ this.FormHistory = {
Cr.NS_ERROR_ILLEGAL_VALUE);
}
numSearches++;
let changeToUpdate = change;
FormHistory.search(
[ "guid" ],
{
- fieldname : change.fieldname,
- value : change.value
+ fieldname: change.fieldname,
+ value: change.value
}, {
- foundResult : false,
+ foundResult: false,
handleResult(aResult) {
if (this.foundResult) {
log("Database contains multiple entries with the same fieldname/value pair.");
if (aCallbacks && aCallbacks.handleError) {
aCallbacks.handleError({
- message :
+ message:
"Database contains multiple entries with the same fieldname/value pair.",
- result : 19 // Constraint violation
+ result: 19 // Constraint violation
});
}
searchFailed = true;
return;
}
this.foundResult = true;
@@ -1042,20 +1042,20 @@ this.FormHistory = {
}
let pending = stmt.executeAsync({
handleResult(aResultSet) {
for (let row = aResultSet.getNextRow(); row; row = aResultSet.getNextRow()) {
let value = row.getResultByName("value");
let frecency = row.getResultByName("frecency");
let entry = {
- text : value,
- textLowerCase : value.toLowerCase(),
+ text: value,
+ textLowerCase: value.toLowerCase(),
frecency,
- totalScore : Math.round(frecency * row.getResultByName("boundaryBonuses"))
+ totalScore: Math.round(frecency * row.getResultByName("boundaryBonuses"))
};
if (aCallbacks && aCallbacks.handleResult) {
aCallbacks.handleResult(entry);
}
}
},
handleError(aError) {
--- a/toolkit/components/satchel/FormHistoryStartup.js
+++ b/toolkit/components/satchel/FormHistoryStartup.js
@@ -70,19 +70,19 @@ FormHistoryStartup.prototype = {
},
receiveMessage(message) {
switch (message.name) {
case "FormHistory:FormSubmitEntries": {
let entries = message.data;
let changes = entries.map(function(entry) {
return {
- op : "bump",
- fieldname : entry.name,
- value : entry.value,
+ op: "bump",
+ fieldname: entry.name,
+ value: entry.value,
}
});
FormHistory.update(changes);
break;
}
case "FormHistory:AutoCompleteSearchAsync": {
--- a/toolkit/components/satchel/formSubmitListener.js
+++ b/toolkit/components/satchel/formSubmitListener.js
@@ -9,24 +9,24 @@
var Cc = Components.classes;
var Ci = Components.interfaces;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
var satchelFormListener = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver,
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormSubmitObserver,
Ci.nsIDOMEventListener,
Ci.nsIObserver,
Ci.nsISupportsWeakReference]),
- debug : true,
- enabled : true,
- saveHttpsForms : true,
+ debug: true,
+ enabled: true,
+ saveHttpsForms: true,
init() {
Services.obs.addObserver(this, "earlyformsubmit", false);
Services.prefs.addObserver("browser.formfill.", this, false);
this.updatePrefs();
addEventListener("unload", this, false);
},
--- a/toolkit/components/satchel/nsFormAutoComplete.js
+++ b/toolkit/components/satchel/nsFormAutoComplete.js
@@ -163,57 +163,57 @@ function FormAutoComplete() {
}
/**
* FormAutoComplete
*
* Implements the nsIFormAutoComplete interface in the main process.
*/
FormAutoComplete.prototype = {
- classID : Components.ID("{c11c21b2-71c9-4f87-a0f8-5e13f50495fd}"),
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIFormAutoComplete, Ci.nsISupportsWeakReference]),
+ classID: Components.ID("{c11c21b2-71c9-4f87-a0f8-5e13f50495fd}"),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIFormAutoComplete, Ci.nsISupportsWeakReference]),
- _prefBranch : null,
- _debug : true, // mirrors browser.formfill.debug
- _enabled : true, // mirrors browser.formfill.enable preference
- _agedWeight : 2,
- _bucketSize : 1,
- _maxTimeGroupings : 25,
- _timeGroupingSize : 7 * 24 * 60 * 60 * 1000 * 1000,
- _expireDays : null,
- _boundaryWeight : 25,
- _prefixWeight : 5,
+ _prefBranch: null,
+ _debug: true, // mirrors browser.formfill.debug
+ _enabled: true, // mirrors browser.formfill.enable preference
+ _agedWeight: 2,
+ _bucketSize: 1,
+ _maxTimeGroupings: 25,
+ _timeGroupingSize: 7 * 24 * 60 * 60 * 1000 * 1000,
+ _expireDays: null,
+ _boundaryWeight: 25,
+ _prefixWeight: 5,
// Only one query via FormHistoryClient is performed at a time, and the
// most recent FormHistoryClient which will be stored in _pendingClient
// while the query is being performed. It will be cleared when the query
// finishes, is cancelled, or an error occurs. If a new query occurs while
// one is already pending, the existing one is cancelled.
- _pendingClient : null,
+ _pendingClient: null,
init() {
// Preferences. Add observer so we get notified of changes.
this._prefBranch = Services.prefs.getBranch("browser.formfill.");
this._prefBranch.addObserver("", this.observer, true);
this.observer._self = this;
this._debug = this._prefBranch.getBoolPref("debug");
this._enabled = this._prefBranch.getBoolPref("enable");
this._agedWeight = this._prefBranch.getIntPref("agedWeight");
this._bucketSize = this._prefBranch.getIntPref("bucketSize");
this._maxTimeGroupings = this._prefBranch.getIntPref("maxTimeGroupings");
this._timeGroupingSize = this._prefBranch.getIntPref("timeGroupingSize") * 1000 * 1000;
this._expireDays = this._prefBranch.getIntPref("expire_days");
},
- observer : {
- _self : null,
+ observer: {
+ _self: null,
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsISupportsWeakReference]),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
+ Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
let self = this._self;
if (topic == "nsPref:changed") {
let prefName = data;
self.log("got change to " + prefName + " preference");
switch (prefName) {
@@ -541,38 +541,38 @@ function FormAutoCompleteResult(client,
this.client = client;
this.entries = entries;
this.fieldName = fieldName;
this.searchString = searchString;
this.messageManager = messageManager;
}
FormAutoCompleteResult.prototype = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult,
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAutoCompleteResult,
Ci.nsISupportsWeakReference]),
// private
- client : null,
- entries : null,
- fieldName : null,
+ client: null,
+ entries: null,
+ fieldName: null,
_checkIndexBounds(index) {
if (index < 0 || index >= this.entries.length)
throw Components.Exception("Index out of range.", Cr.NS_ERROR_ILLEGAL_VALUE);
},
// Allow autoCompleteSearch to get at the JS object so it can
// modify some readonly properties for internal use.
get wrappedJSObject() {
return this;
},
// Interfaces from idl...
- searchString : "",
- errorDescription : "",
+ searchString: "",
+ errorDescription: "",
get defaultIndex() {
if (this.entries.length == 0)
return -1;
return 0;
},
get searchResult() {
if (this.entries.length == 0)
return Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
--- a/toolkit/components/satchel/nsInputListAutoComplete.js
+++ b/toolkit/components/satchel/nsInputListAutoComplete.js
@@ -6,17 +6,17 @@ const Ci = Components.interfaces;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/nsFormAutoCompleteResult.jsm");
function InputListAutoComplete() {}
InputListAutoComplete.prototype = {
- classID : Components.ID("{bf1e01d0-953e-11df-981c-0800200c9a66}"),
+ classID: Components.ID("{bf1e01d0-953e-11df-981c-0800200c9a66}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIInputListAutoComplete]),
autoCompleteSearch(aUntrimmedSearchString, aField) {
let [values, labels] = this.getListSuggestions(aField);
let searchResult = values.length > 0 ? Ci.nsIAutoCompleteResult.RESULT_SUCCESS
: Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
let defaultIndex = values.length > 0 ? 0 : -1;
return new FormAutoCompleteResult(aUntrimmedSearchString,
--- a/toolkit/components/satchel/test/test_bug_511615.html
+++ b/toolkit/components/satchel/test/test_bug_511615.html
@@ -119,26 +119,26 @@ function doClickWithMouseEventUnprivileg
input.dispatchEvent(upEvent);
input.dispatchEvent(ckEvent);
}
let input = $_(1, "field1");
add_task(function* test_initialize() {
yield new Promise(resolve => updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "value1" },
- { op : "add", fieldname : "field1", value : "value2" },
- { op : "add", fieldname : "field1", value : "value3" },
- { op : "add", fieldname : "field1", value : "value4" },
- { op : "add", fieldname : "field1", value : "value5" },
- { op : "add", fieldname : "field1", value : "value6" },
- { op : "add", fieldname : "field1", value : "value7" },
- { op : "add", fieldname : "field1", value : "value8" },
- { op : "add", fieldname : "field1", value : "value9" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "value1" },
+ { op: "add", fieldname: "field1", value: "value2" },
+ { op: "add", fieldname: "field1", value: "value3" },
+ { op: "add", fieldname: "field1", value: "value4" },
+ { op: "add", fieldname: "field1", value: "value5" },
+ { op: "add", fieldname: "field1", value: "value6" },
+ { op: "add", fieldname: "field1", value: "value7" },
+ { op: "add", fieldname: "field1", value: "value8" },
+ { op: "add", fieldname: "field1", value: "value9" },
], resolve));
});
add_task(function* test_untrusted_events_ignored() {
// The autocomplete popup should not open from untrusted events.
for (let triggerFn of [
() => input.focus(),
() => input.click(),
--- a/toolkit/components/satchel/test/test_bug_787624.html
+++ b/toolkit/components/satchel/test/test_bug_787624.html
@@ -61,19 +61,19 @@ function waitForNextPopup() {
return new Promise(resolve => { resolvePopupShownListener = resolve; });
}
add_task(function* test_popup_not_move_input() {
var input = $_(1, "field1");
var rect = input.getBoundingClientRect();
yield new Promise(resolve => updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "value1" },
- { op : "add", fieldname : "field1", value : "value2" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "value1" },
+ { op: "add", fieldname: "field1", value: "value2" },
], resolve));
let popupShown = waitForNextPopup();
input.focus();
doKey("down");
yield popupShown;
var newRect = input.getBoundingClientRect();
--- a/toolkit/components/satchel/test/test_datalist_with_caching.html
+++ b/toolkit/components/satchel/test/test_datalist_with_caching.html
@@ -33,18 +33,18 @@ Form History test: form field autocomple
/* import-globals-from ../../../../testing/mochitest/tests/SimpleTest/EventUtils.js */
/* import-globals-from ../../../../testing/mochitest/tests/SimpleTest/SpawnTask.js */
/* import-globals-from satchel_common.js */
var input = $_(1, "field1");
function setupFormHistory(aCallback) {
updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "Sec" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "Sec" },
], () => {
spawn_task(aCallback);
});
}
function setForm(value) {
input.value = value;
input.focus();
--- a/toolkit/components/satchel/test/test_form_autocomplete.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete.html
@@ -144,49 +144,49 @@ Form History test: form field autocomple
/** Test for Form History autocomplete **/
var input = $_(1, "field1");
const shiftModifier = Event.SHIFT_MASK;
function setupFormHistory(aCallback) {
updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "value1" },
- { op : "add", fieldname : "field1", value : "value2" },
- { op : "add", fieldname : "field1", value : "value3" },
- { op : "add", fieldname : "field1", value : "value4" },
- { op : "add", fieldname : "field2", value : "value1" },
- { op : "add", fieldname : "field3", value : "a" },
- { op : "add", fieldname : "field3", value : "aa" },
- { op : "add", fieldname : "field3", value : "aaz" },
- { op : "add", fieldname : "field3", value : "aa\xe6" }, // 0xae == latin ae pair (0xc6 == AE)
- { op : "add", fieldname : "field3", value : "az" },
- { op : "add", fieldname : "field3", value : "z" },
- { op : "add", fieldname : "field4", value : "a\xe6" },
- { op : "add", fieldname : "field4", value : "aa a\xe6" },
- { op : "add", fieldname : "field4", value : "aba\xe6" },
- { op : "add", fieldname : "field4", value : "bc d\xe6" },
- { op : "add", fieldname : "field5", value : "1" },
- { op : "add", fieldname : "field5", value : "12" },
- { op : "add", fieldname : "field5", value : "123" },
- { op : "add", fieldname : "field5", value : "1234" },
- { op : "add", fieldname : "field6", value : "value" },
- { op : "add", fieldname : "field7", value : "value" },
- { op : "add", fieldname : "field8", value : "value" },
- { op : "add", fieldname : "field9", value : "value" },
- { op : "add", fieldname : "field10", value : "42" },
- { op : "add", fieldname : "field11", value : "2010-10-10" }, // not used, since type=date doesn't have autocomplete currently
- { op : "add", fieldname : "field12", value : "21:21" }, // not used, since type=time doesn't have autocomplete currently
- { op : "add", fieldname : "field13", value : "32" }, // not used, since type=range doesn't have a drop down menu
- { op : "add", fieldname : "field14", value : "#ffffff" }, // not used, since type=color doesn't have autocomplete currently
- { op : "add", fieldname : "field15", value : "2016-08" },
- { op : "add", fieldname : "field16", value : "2016-W32" },
- { op : "add", fieldname : "field17", value : "2016-10-21T10:10" },
- { op : "add", fieldname : "searchbar-history", value : "blacklist test" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "value1" },
+ { op: "add", fieldname: "field1", value: "value2" },
+ { op: "add", fieldname: "field1", value: "value3" },
+ { op: "add", fieldname: "field1", value: "value4" },
+ { op: "add", fieldname: "field2", value: "value1" },
+ { op: "add", fieldname: "field3", value: "a" },
+ { op: "add", fieldname: "field3", value: "aa" },
+ { op: "add", fieldname: "field3", value: "aaz" },
+ { op: "add", fieldname: "field3", value: "aa\xe6" }, // 0xae == latin ae pair (0xc6 == AE)
+ { op: "add", fieldname: "field3", value: "az" },
+ { op: "add", fieldname: "field3", value: "z" },
+ { op: "add", fieldname: "field4", value: "a\xe6" },
+ { op: "add", fieldname: "field4", value: "aa a\xe6" },
+ { op: "add", fieldname: "field4", value: "aba\xe6" },
+ { op: "add", fieldname: "field4", value: "bc d\xe6" },
+ { op: "add", fieldname: "field5", value: "1" },
+ { op: "add", fieldname: "field5", value: "12" },
+ { op: "add", fieldname: "field5", value: "123" },
+ { op: "add", fieldname: "field5", value: "1234" },
+ { op: "add", fieldname: "field6", value: "value" },
+ { op: "add", fieldname: "field7", value: "value" },
+ { op: "add", fieldname: "field8", value: "value" },
+ { op: "add", fieldname: "field9", value: "value" },
+ { op: "add", fieldname: "field10", value: "42" },
+ { op: "add", fieldname: "field11", value: "2010-10-10" }, // not used, since type=date doesn't have autocomplete currently
+ { op: "add", fieldname: "field12", value: "21:21" }, // not used, since type=time doesn't have autocomplete currently
+ { op: "add", fieldname: "field13", value: "32" }, // not used, since type=range doesn't have a drop down menu
+ { op: "add", fieldname: "field14", value: "#ffffff" }, // not used, since type=color doesn't have autocomplete currently
+ { op: "add", fieldname: "field15", value: "2016-08" },
+ { op: "add", fieldname: "field16", value: "2016-W32" },
+ { op: "add", fieldname: "field17", value: "2016-10-21T10:10" },
+ { op: "add", fieldname: "searchbar-history", value: "blacklist test" },
], aCallback);
}
function setForm(value) {
input.value = value;
input.focus();
}
@@ -1021,17 +1021,17 @@ function runTest() { // eslint-disable-l
default:
ok(false, "Unexpected invocation of test #" + testNum);
SimpleTest.finish();
}
}
function addEntry(name, value) {
- updateFormHistory({ op : "add", fieldname : name, value }, runTest);
+ updateFormHistory({ op: "add", fieldname: name, value }, runTest);
}
// Runs the next test when scroll event occurs
function waitForScroll() {
addEventListener("scroll", function() {
if (!window.pageYOffset)
return;
--- a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
+++ b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
@@ -46,19 +46,19 @@ Form History test: form field autocomple
/** Test for Form History autocomplete **/
var input = $_(1, "field1");
const shiftModifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
function setupFormHistory(aCallback) {
updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "historyvalue" },
- { op : "add", fieldname : "field2", value : "othervalue" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "historyvalue" },
+ { op: "add", fieldname: "field2", value: "othervalue" },
], aCallback);
}
function setForm(value) {
input.value = value;
input.focus();
}
--- a/toolkit/components/satchel/test/test_password_autocomplete.html
+++ b/toolkit/components/satchel/test/test_password_autocomplete.html
@@ -78,26 +78,26 @@ add_task(function* test_initialize() {
is(window.location.protocol, "https:", "This test must run on HTTPS");
// Now that rememberSignons is false, create the password fields.
$_(1, "field1").type = "password";
$_(2, "field1").type = "password";
yield new Promise(resolve => updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "value1" },
- { op : "add", fieldname : "field1", value : "value2" },
- { op : "add", fieldname : "field1", value : "value3" },
- { op : "add", fieldname : "field1", value : "value4" },
- { op : "add", fieldname : "field1", value : "value5" },
- { op : "add", fieldname : "field1", value : "value6" },
- { op : "add", fieldname : "field1", value : "value7" },
- { op : "add", fieldname : "field1", value : "value8" },
- { op : "add", fieldname : "field1", value : "value9" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "value1" },
+ { op: "add", fieldname: "field1", value: "value2" },
+ { op: "add", fieldname: "field1", value: "value3" },
+ { op: "add", fieldname: "field1", value: "value4" },
+ { op: "add", fieldname: "field1", value: "value5" },
+ { op: "add", fieldname: "field1", value: "value6" },
+ { op: "add", fieldname: "field1", value: "value7" },
+ { op: "add", fieldname: "field1", value: "value8" },
+ { op: "add", fieldname: "field1", value: "value9" },
], resolve));
});
add_task(function* test_secure_noFormHistoryOrWarning() {
let input = $_(1, "field1");
// The autocomplete popup should not open under any circumstances on
// type=password with password manager disabled.
--- a/toolkit/components/satchel/test/test_popup_direction.html
+++ b/toolkit/components/satchel/test/test_popup_direction.html
@@ -30,19 +30,19 @@ registerPopupShownListener(() => resolve
function waitForNextPopup() {
return new Promise(resolve => { resolvePopupShownListener = resolve; });
}
add_task(function* test_popup_direction() {
var input = $_(1, "field1");
yield new Promise(resolve => updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "value1" },
- { op : "add", fieldname : "field1", value : "value2" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "value1" },
+ { op: "add", fieldname: "field1", value: "value2" },
], resolve));
for (let direction of ["ltr", "rtl"]) {
document.getElementById("content").style.direction = direction;
let popupShown = waitForNextPopup();
input.focus();
doKey("down");
--- a/toolkit/components/satchel/test/test_popup_enter_event.html
+++ b/toolkit/components/satchel/test/test_popup_enter_event.html
@@ -24,18 +24,18 @@ Form History test: Test for events while
/* import-globals-from satchel_common.js */
var form = document.getElementById("form1");
var input = $_(1, "field1");
var expectedValue = "value1";
function setupFormHistory(aCallback) {
updateFormHistory([
- { op : "remove" },
- { op : "add", fieldname : "field1", value : "value1" },
+ { op: "remove" },
+ { op: "add", fieldname: "field1", value: "value1" },
], aCallback);
}
registerPopupShownListener(popupShownListener);
function handleEnter(evt) {
if (evt.keyCode != KeyEvent.DOM_VK_RETURN) {
return;
--- a/toolkit/components/satchel/test/unit/test_async_expire.js
+++ b/toolkit/components/satchel/test/unit/test_async_expire.js
@@ -11,17 +11,17 @@ function triggerExpiration() {
// expiration.
Services.obs.notifyObservers(null, "formhistory-expire-now", null);
}
var checkExists = function(num) { do_check_true(num > 0); next_test(); }
var checkNotExists = function(num) { do_check_true(!num); next_test(); }
var TestObserver = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
do_check_eq(topic, "satchel-storage-changed");
if (data == "formhistory-expireoldentries") {
next_test();
}
}
--- a/toolkit/components/satchel/test/unit/test_autocomplete.js
+++ b/toolkit/components/satchel/test/unit/test_autocomplete.js
@@ -57,19 +57,19 @@ add_test(function test0() {
// insert 2 records per bucket to check alphabetical sort within
now = 1000 * Date.now();
numRecords = Math.ceil(maxTimeGroupings / bucketSize) * 2;
let changes = [ ];
for (let i = 0; i < numRecords; i += 2) {
let useDate = now - (i / 2 * bucketSize * timeGroupingSize);
- changes.push({ op : "add", fieldname: "field1", value: "value" + padLeft(numRecords - 1 - i, 2),
+ changes.push({ op: "add", fieldname: "field1", value: "value" + padLeft(numRecords - 1 - i, 2),
timesUsed: 1, firstUsed: useDate, lastUsed: useDate });
- changes.push({ op : "add", fieldname: "field1", value: "value" + padLeft(numRecords - 2 - i, 2),
+ changes.push({ op: "add", fieldname: "field1", value: "value" + padLeft(numRecords - 2 - i, 2),
timesUsed: 1, firstUsed: useDate, lastUsed: useDate });
}
updateFormHistory(changes, run_next_test);
});
add_test(function test1() {
do_log_info("Check initial state is as expected");
@@ -126,17 +126,17 @@ add_test(function test4() {
const timesUsedSamples = 20;
add_test(function test5() {
do_log_info("Begin tests with constant use dates and varying timesUsed");
let changes = [];
for (let i = 0; i < timesUsedSamples; i++) {
let timesUsed = (timesUsedSamples - i);
- let change = { op : "add", fieldname: "field2", value: "value" + (timesUsedSamples - 1 - i),
+ let change = { op: "add", fieldname: "field2", value: "value" + (timesUsedSamples - 1 - i),
timesUsed: timesUsed * timeGroupingSize, firstUsed: now, lastUsed: now };
changes.push(change);
}
updateFormHistory(changes, run_next_test);
});
add_test(function test6() {
do_log_info("Check search result ordering with empty search term");
@@ -167,19 +167,19 @@ add_test(function test7() {
});
add_test(function test8() {
do_log_info("Check that \"senior citizen\" entries get a bonus (browser.formfill.agedBonus)");
let agedDate = 1000 * (Date.now() - getFormExpiryDays() * 24 * 60 * 60 * 1000);
let changes = [ ];
- changes.push({ op : "add", fieldname: "field3", value: "old but not senior",
+ changes.push({ op: "add", fieldname: "field3", value: "old but not senior",
timesUsed: 100, firstUsed: (agedDate + 60 * 1000 * 1000), lastUsed: now });
- changes.push({ op : "add", fieldname: "field3", value: "senior citizen",
+ changes.push({ op: "add", fieldname: "field3", value: "senior citizen",
timesUsed: 100, firstUsed: (agedDate - 60 * 1000 * 1000), lastUsed: now });
updateFormHistory(changes, run_next_test);
});
add_test(function test9() {
fac.autoCompleteSearchAsync("field3", "", null, null, null, {
onSearchCompletion(aResults) {
do_check_eq(aResults.getValueAt(0), "senior citizen");
@@ -188,21 +188,21 @@ add_test(function test9() {
}
});
});
add_test(function test10() {
do_log_info("Check entries that are really old or in the future");
let changes = [ ];
- changes.push({ op : "add", fieldname: "field4", value: "date of 0",
+ changes.push({ op: "add", fieldname: "field4", value: "date of 0",
timesUsed: 1, firstUsed: 0, lastUsed: 0 });
- changes.push({ op : "add", fieldname: "field4", value: "in the future 1",
+ changes.push({ op: "add", fieldname: "field4", value: "in the future 1",
timesUsed: 1, firstUsed: 0, lastUsed: now * 2 });
- changes.push({ op : "add", fieldname: "field4", value: "in the future 2",
+ changes.push({ op: "add", fieldname: "field4", value: "in the future 2",
timesUsed: 1, firstUsed: now * 2, lastUsed: now * 2 });
updateFormHistory(changes, run_next_test);
});
add_test(function test11() {
fac.autoCompleteSearchAsync("field4", "", null, null, null, {
onSearchCompletion(aResults) {
do_check_eq(aResults.matchCount, 3);
@@ -213,17 +213,17 @@ add_test(function test11() {
var syncValues = ["sync1", "sync1a", "sync2", "sync3"]
add_test(function test12() {
do_log_info("Check old synchronous api");
let changes = [ ];
for (let value of syncValues) {
- changes.push({ op : "add", fieldname: "field5", value });
+ changes.push({ op: "add", fieldname: "field5", value });
}
updateFormHistory(changes, run_next_test);
});
add_test(function test_token_limit_DB() {
function test_token_limit_previousResult(previousResult) {
do_log_info("Check that the number of tokens used in a search is not capped to " +
"MAX_SEARCH_TOKENS when using a previousResult");
@@ -240,17 +240,17 @@ add_test(function test_token_limit_DB()
run_next_test();
}
});
}
do_log_info("Check that the number of tokens used in a search is capped to MAX_SEARCH_TOKENS " +
"for performance when querying the DB");
let changes = [ ];
- changes.push({ op : "add", fieldname: "field_token_cap",
+ changes.push({ op: "add", fieldname: "field_token_cap",
// value with 15 unique tokens
value: "a b c d e f g h i j k l m n o",
timesUsed: 1, firstUsed: 0, lastUsed: 0 });
updateFormHistory(changes, () => {
// Search for a string where the first 10 tokens match the value above but the 11th does not
// (which would prevent the result from being returned if the 11th term was used).
fac.autoCompleteSearchAsync("field_token_cap",
"a b c d e f g h i j .",
--- a/toolkit/components/satchel/test/unit/test_db_corrupt.js
+++ b/toolkit/components/satchel/test/unit/test_db_corrupt.js
@@ -41,17 +41,17 @@ add_test(function test_corruptFormHistor
add_test(function test_corruptFormHistoryDB_emptyInit() {
do_log_info("test that FormHistory initializes an empty DB in place of corrupt DB.");
FormHistory.count({}, {
handleResult(aNumEntries) {
do_check_true(aNumEntries == 0);
- FormHistory.count({ fieldname : "name-A", value : "value-A" }, {
+ FormHistory.count({ fieldname: "name-A", value: "value-A" }, {
handleResult(aNumEntries2) {
do_check_true(aNumEntries2 == 0);
run_next_test();
},
handleError(aError2) {
do_throw("DB initialized after reading a corrupt DB file found an entry.");
}
});
--- a/toolkit/components/satchel/test/unit/test_history_api.js
+++ b/toolkit/components/satchel/test/unit/test_history_api.js
@@ -197,28 +197,28 @@ add_task(function* () {
// ===== 5 =====
// Test removing by time range (single entry, not surrounding entries)
testnum++;
yield promiseCountEntries("time-A", null, checkExists); // firstUsed=1000, lastUsed=1000
yield promiseCountEntries("time-B", null, checkExists); // firstUsed=1000, lastUsed=1099
yield promiseCountEntries("time-C", null, checkExists); // firstUsed=1099, lastUsed=1099
yield promiseCountEntries("time-D", null, checkExists); // firstUsed=2001, lastUsed=2001
- yield promiseUpdate({ op : "remove", firstUsedStart: 1050, firstUsedEnd: 2000 });
+ yield promiseUpdate({ op: "remove", firstUsedStart: 1050, firstUsedEnd: 2000 });
yield promiseCountEntries("time-A", null, checkExists);
yield promiseCountEntries("time-B", null, checkExists);
yield promiseCountEntries("time-C", null, checkNotExists);
yield promiseCountEntries("time-D", null, checkExists);
yield countDeletedEntries(4);
// ===== 6 =====
// Test removing by time range (multiple entries)
testnum++;
- yield promiseUpdate({ op : "remove", firstUsedStart: 1000, firstUsedEnd: 2000 });
+ yield promiseUpdate({ op: "remove", firstUsedStart: 1000, firstUsedEnd: 2000 });
yield promiseCountEntries("time-A", null, checkNotExists);
yield promiseCountEntries("time-B", null, checkNotExists);
yield promiseCountEntries("time-C", null, checkNotExists);
yield promiseCountEntries("time-D", null, checkExists);
yield countDeletedEntries(6);
// ===== 7 =====
@@ -279,124 +279,124 @@ add_task(function* () {
// ===== 12 =====
// Update a single entry
testnum++;
results = yield promiseSearchEntries(["guid"], { fieldname: "field1", value: "value1" });
let guid = processFirstResult(results)[3];
- yield promiseUpdate({ op : "update", guid, value: "modifiedValue" });
+ yield promiseUpdate({ op: "update", guid, value: "modifiedValue" });
yield promiseCountEntries("field1", "modifiedValue", checkExists);
yield promiseCountEntries("field1", "value1", checkNotExists);
yield promiseCountEntries("field1", "value1b", checkExists);
yield promiseCountEntries(null, null, num => do_check_eq(num, 2));
// ===== 13 =====
// Add a single entry with times
testnum++;
- yield promiseUpdate({ op : "add", fieldname: "field2", value: "value2",
+ yield promiseUpdate({ op: "add", fieldname: "field2", value: "value2",
timesUsed: 20, firstUsed: 100, lastUsed: 500 });
results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
{ fieldname: "field2", value: "value2" });
[timesUsed, firstUsed, lastUsed] = processFirstResult(results);
do_check_eq(20, timesUsed);
do_check_eq(100, firstUsed);
do_check_eq(500, lastUsed);
yield promiseCountEntries(null, null, num => do_check_eq(num, 3));
// ===== 14 =====
// Bump an entry, which updates its lastUsed field
testnum++;
- yield promiseUpdate({ op : "bump", fieldname: "field2", value: "value2",
+ yield promiseUpdate({ op: "bump", fieldname: "field2", value: "value2",
timesUsed: 20, firstUsed: 100, lastUsed: 500 });
results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
{ fieldname: "field2", value: "value2" });
[timesUsed, firstUsed, lastUsed] = processFirstResult(results);
do_check_eq(21, timesUsed);
do_check_eq(100, firstUsed);
do_check_true(lastUsed > 500);
yield promiseCountEntries(null, null, num => do_check_eq(num, 3));
// ===== 15 =====
// Bump an entry that does not exist
testnum++;
- yield promiseUpdate({ op : "bump", fieldname: "field3", value: "value3",
+ yield promiseUpdate({ op: "bump", fieldname: "field3", value: "value3",
timesUsed: 10, firstUsed: 50, lastUsed: 400 });
results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
{ fieldname: "field3", value: "value3" });
[timesUsed, firstUsed, lastUsed] = processFirstResult(results);
do_check_eq(10, timesUsed);
do_check_eq(50, firstUsed);
do_check_eq(400, lastUsed);
yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
// ===== 16 =====
// Bump an entry with a guid
testnum++;
results = yield promiseSearchEntries(["guid"], { fieldname: "field3", value: "value3" });
guid = processFirstResult(results)[3];
- yield promiseUpdate({ op : "bump", guid, timesUsed: 20, firstUsed: 55, lastUsed: 400 });
+ yield promiseUpdate({ op: "bump", guid, timesUsed: 20, firstUsed: 55, lastUsed: 400 });
results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
{ fieldname: "field3", value: "value3" });
[timesUsed, firstUsed, lastUsed] = processFirstResult(results);
do_check_eq(11, timesUsed);
do_check_eq(50, firstUsed);
do_check_true(lastUsed > 400);
yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
// ===== 17 =====
// Remove an entry
testnum++;
yield countDeletedEntries(7);
results = yield promiseSearchEntries(["guid"], { fieldname: "field1", value: "value1b" });
guid = processFirstResult(results)[3];
- yield promiseUpdate({ op : "remove", guid});
+ yield promiseUpdate({ op: "remove", guid});
yield promiseCountEntries("field1", "modifiedValue", checkExists);
yield promiseCountEntries("field1", "value1b", checkNotExists);
yield promiseCountEntries(null, null, num => do_check_eq(num, 3));
yield countDeletedEntries(8);
yield checkTimeDeleted(guid, timeDeleted => do_check_true(timeDeleted > 10000));
// ===== 18 =====
// Add yet another single entry
testnum++;
- yield promiseUpdate({ op : "add", fieldname: "field4", value: "value4",
+ yield promiseUpdate({ op: "add", fieldname: "field4", value: "value4",
timesUsed: 5, firstUsed: 230, lastUsed: 600 });
yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
// ===== 19 =====
// Remove an entry by time
testnum++;
- yield promiseUpdate({ op : "remove", firstUsedStart: 60, firstUsedEnd: 250 });
+ yield promiseUpdate({ op: "remove", firstUsedStart: 60, firstUsedEnd: 250 });
yield promiseCountEntries("field1", "modifiedValue", checkExists);
yield promiseCountEntries("field2", "value2", checkNotExists);
yield promiseCountEntries("field3", "value3", checkExists);
yield promiseCountEntries("field4", "value4", checkNotExists);
yield promiseCountEntries(null, null, num => do_check_eq(num, 2));
yield countDeletedEntries(10);
// ===== 20 =====
// Bump multiple existing entries at once
testnum++;
- yield promiseUpdate([{ op : "add", fieldname: "field5", value: "value5",
+ yield promiseUpdate([{ op: "add", fieldname: "field5", value: "value5",
timesUsed: 5, firstUsed: 230, lastUsed: 600 },
- { op : "add", fieldname: "field6", value: "value6",
+ { op: "add", fieldname: "field6", value: "value6",
timesUsed: 12, firstUsed: 430, lastUsed: 700 }]);
yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
yield promiseUpdate([
- { op : "bump", fieldname: "field5", value: "value5" },
- { op : "bump", fieldname: "field6", value: "value6" }]);
+ { op: "bump", fieldname: "field5", value: "value5" },
+ { op: "bump", fieldname: "field6", value: "value6" }]);
results = yield promiseSearchEntries(["fieldname", "timesUsed", "firstUsed", "lastUsed"], { });
do_check_eq(6, results[2].timesUsed);
do_check_eq(13, results[3].timesUsed);
do_check_eq(230, results[2].firstUsed);
do_check_eq(430, results[3].firstUsed);
do_check_true(results[2].lastUsed > 600);
do_check_true(results[3].lastUsed > 700);
@@ -406,32 +406,32 @@ add_task(function* () {
// ===== 21 =====
// Check update fails if form history is disabled and the operation is not a
// pure removal.
testnum++;
Services.prefs.setBoolPref("browser.formfill.enable", false);
// Cannot use arrow functions, see bug 1237961.
Assert.rejects(promiseUpdate(
- { op : "bump", fieldname: "field5", value: "value5" }),
+ { op: "bump", fieldname: "field5", value: "value5" }),
function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
"bumping when form history is disabled should fail");
Assert.rejects(promiseUpdate(
- { op : "add", fieldname: "field5", value: "value5" }),
+ { op: "add", fieldname: "field5", value: "value5" }),
function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
"Adding when form history is disabled should fail");
Assert.rejects(promiseUpdate([
- { op : "update", fieldname: "field5", value: "value5" },
- { op : "remove", fieldname: "field5", value: "value5" }
+ { op: "update", fieldname: "field5", value: "value5" },
+ { op: "remove", fieldname: "field5", value: "value5" }
]),
function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
"mixed operations when form history is disabled should fail");
Assert.rejects(promiseUpdate([
null, undefined, "", 1, {},
- { op : "remove", fieldname: "field5", value: "value5" }
+ { op: "remove", fieldname: "field5", value: "value5" }
]),
function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
"Invalid entries when form history is disabled should fail");
// Remove should work though.
yield promiseUpdate([{ op: "remove", fieldname: "field5", value: null },
{ op: "remove", fieldname: null, value: null }]);
Services.prefs.clearUserPref("browser.formfill.enable");
--- a/toolkit/components/satchel/test/unit/test_notify.js
+++ b/toolkit/components/satchel/test/unit/test_notify.js
@@ -4,17 +4,17 @@
* Tests notifications dispatched when modifying form history.
*
*/
var expectedNotification;
var expectedData;
var TestObserver = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
observe(subject, topic, data) {
do_check_eq(topic, "satchel-storage-changed");
do_check_eq(data, expectedNotification);
switch (data) {
case "formhistory-add":
case "formhistory-update":
--- a/toolkit/components/search/tests/xpcshell/test_json_cache.js
+++ b/toolkit/components/search/tests/xpcshell/test_json_cache.js
@@ -145,17 +145,17 @@ var EXPECTED_ENGINE = {
engine: {
name: "Test search engine",
alias: null,
description: "A test search engine (based on Google search)",
searchForm: "http://www.google.com/",
wrappedJSObject: {
_extensionID: "test-addon-id@mozilla.org",
"_iconURL": "data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA",
- _urls : [
+ _urls: [
{
type: "application/x-suggestions+json",
method: "GET",
template: "http://suggestqueries.google.com/complete/search?output=firefox&client=firefox" +
"&hl={moz:locale}&q={searchTerms}",
params: "",
},
{
--- a/toolkit/components/telemetry/TelemetrySession.jsm
+++ b/toolkit/components/telemetry/TelemetrySession.jsm
@@ -668,17 +668,17 @@ this.TelemetrySession = Object.freeze({
var Impl = {
_histograms: {},
_initialized: false,
_logger: null,
_prevValues: {},
_slowSQLStartup: {},
_hasWindowRestoredObserver: false,
_hasXulWindowVisibleObserver: false,
- _startupIO : {},
+ _startupIO: {},
// The previous build ID, if this is the first run with a new build.
// Null if this is the first run, or the previous build ID is unknown.
_previousBuildId: null,
// Telemetry payloads sent by child processes.
// Each element is in the format {source: <weak-ref>, payload: <object>},
// where source is a weak reference to the child process,
// and payload is the telemetry payload from that child process.
_childTelemetry: [],
--- a/toolkit/components/telemetry/tests/unit/head.js
+++ b/toolkit/components/telemetry/tests/unit/head.js
@@ -229,17 +229,17 @@ function fakeMonotonicNow(ms) {
const m = Cu.import("resource://gre/modules/TelemetrySession.jsm", {});
m.Policy.monotonicNow = () => ms;
return ms;
}
// Fake the timeout functions for TelemetryController sending.
function fakePingSendTimer(set, clear) {
let module = Cu.import("resource://gre/modules/TelemetrySend.jsm", {});
- let obj = Cu.cloneInto({set, clear}, module, {cloneFunctions:true});
+ let obj = Cu.cloneInto({set, clear}, module, {cloneFunctions: true});
module.Policy.setSchedulerTickTimeout = obj.set;
module.Policy.clearSchedulerTickTimeout = obj.clear;
}
function fakeMidnightPingFuzzingDelay(delayMs) {
let module = Cu.import("resource://gre/modules/TelemetrySend.jsm", {});
module.Policy.midnightPingFuzzingDelay = () => delayMs;
}
--- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
@@ -1375,17 +1375,17 @@ add_task(function* test_defaultSearchEng
// Manually force the notification.
// TODO: remove this when bug 1165341 is resolved.
Services.obs.notifyObservers(null, "browser-search-engine-modified", "engine-current");
// Then check that no default engine is reported if none is available.
data = TelemetryEnvironment.currentEnvironment;
checkEnvironmentData(data);
Assert.equal(data.settings.defaultSearchEngine, "NONE");
- Assert.deepEqual(data.settings.defaultSearchEngineData, {name:"NONE"});
+ Assert.deepEqual(data.settings.defaultSearchEngineData, {name: "NONE"});
// Add a new search engine (this will have no engine identifier).
const SEARCH_ENGINE_ID = "telemetry_default";
const SEARCH_ENGINE_URL = "http://www.example.org/?search={searchTerms}";
Services.search.addEngineWithDetails(SEARCH_ENGINE_ID, "", null, "", "get", SEARCH_ENGINE_URL);
// Register a new change listener and then wait for the search engine change to be notified.
let deferred = PromiseUtils.defer();
@@ -1431,17 +1431,17 @@ add_task(function* test_defaultSearchEng
null, null, false);
});
Services.search.defaultEngine = engine;
yield promise;
TelemetryEnvironment.unregisterChangeListener("testWatch_SearchDefault");
data = TelemetryEnvironment.currentEnvironment;
checkEnvironmentData(data);
Assert.deepEqual(data.settings.defaultSearchEngineData,
- {"name":"engine-telemetry", "loadPath":"[other]/engine.xml", "origin":"verified"});
+ {"name": "engine-telemetry", "loadPath": "[other]/engine.xml", "origin": "verified"});
// Now break this engine's load path hash.
promise = new Promise(resolve => {
TelemetryEnvironment.registerChangeListener("testWatch_SearchDefault", resolve);
});
engine.wrappedJSObject.setAttr("loadPathHash", "broken");
Services.obs.notifyObservers(null, "browser-search-engine-modified", "engine-current");
yield promise;
--- a/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
+++ b/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
@@ -377,40 +377,40 @@ function checkPayload(payload, reason, s
Assert.ok(!(IGNORE_CLONED_HISTOGRAM in payload.histograms));
// Flag histograms should automagically spring to life.
const expected_flag = {
range: [1, 2],
bucket_count: 3,
histogram_type: 3,
- values: {0:1, 1:0},
+ values: {0: 1, 1: 0},
sum: 0
};
let flag = payload.histograms[TELEMETRY_TEST_FLAG];
Assert.equal(uneval(flag), uneval(expected_flag));
// We should have a test count.
const expected_count = {
range: [1, 2],
bucket_count: 3,
histogram_type: 4,
- values: {0:1, 1:0},
+ values: {0: 1, 1: 0},
sum: 1,
};
let count = payload.histograms[TELEMETRY_TEST_COUNT];
Assert.equal(uneval(count), uneval(expected_count));
// There should be one successful report from the previous telemetry ping.
if (successfulPings > 0) {
const expected_tc = {
range: [1, 2],
bucket_count: 3,
histogram_type: 2,
- values: {0:2, 1:successfulPings, 2:0},
+ values: {0: 2, 1: successfulPings, 2: 0},
sum: successfulPings
};
let tc = payload.histograms[TELEMETRY_SUCCESS];
Assert.equal(uneval(tc), uneval(expected_tc));
}
// The ping should include data from memory reporters. We can't check that
// this data is correct, because we can't control the values returned by the
@@ -443,24 +443,24 @@ function checkPayload(payload, reason, s
Assert.ok(!(TELEMETRY_TEST_KEYED_FLAG in keyedHistograms));
Assert.ok(TELEMETRY_TEST_KEYED_COUNT in keyedHistograms);
const expected_keyed_count = {
"a": {
range: [1, 2],
bucket_count: 3,
histogram_type: 4,
- values: {0:2, 1:0},
+ values: {0: 2, 1: 0},
sum: 2,
},
"b": {
range: [1, 2],
bucket_count: 3,
histogram_type: 4,
- values: {0:1, 1:0},
+ values: {0: 1, 1: 0},
sum: 1,
},
};
Assert.deepEqual(expected_keyed_count, keyedHistograms[TELEMETRY_TEST_KEYED_COUNT]);
Assert.ok("processes" in payload, "The payload must have a processes section.");
Assert.ok("parent" in payload.processes, "There must be at least a parent process.");
checkScalars(payload.processes);
--- a/toolkit/components/thumbnails/PageThumbs.jsm
+++ b/toolkit/components/thumbnails/PageThumbs.jsm
@@ -106,18 +106,18 @@ const TaskUtils = {
* accessing them if already cached.
*/
this.PageThumbs = {
_initialized: false,
/**
* The calculated width and height of the thumbnails.
*/
- _thumbnailWidth : 0,
- _thumbnailHeight : 0,
+ _thumbnailWidth: 0,
+ _thumbnailHeight: 0,
/**
* The scheme to use for thumbnail urls.
*/
get scheme() {
return "moz-page-thumb";
},
--- a/toolkit/components/tooltiptext/TooltipTextProvider.js
+++ b/toolkit/components/tooltiptext/TooltipTextProvider.js
@@ -135,14 +135,14 @@ TooltipTextProvider.prototype = {
directionOut.value = direction;
return true;
}
return false;
});
},
- classID : Components.ID("{f376627f-0bbc-47b8-887e-fc92574cc91f}"),
+ classID: Components.ID("{f376627f-0bbc-47b8-887e-fc92574cc91f}"),
QueryInterface: XPCOMUtils.generateQI([Ci.nsITooltipTextProvider]),
};
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([TooltipTextProvider]);
--- a/toolkit/components/viewconfig/content/config.js
+++ b/toolkit/components/viewconfig/content/config.js
@@ -58,18 +58,18 @@ var view = {
getRowProperties(index) { return ""; },
getCellProperties(index, col) {
if (index in gPrefView)
return gLockProps[gPrefView[index].lockCol];
return "";
},
getColumnProperties(col) { return ""; },
- treebox : null,
- selection : null,
+ treebox: null,
+ selection: null,
isContainer(index) { return false; },
isContainerOpen(index) { return false; },
isContainerEmpty(index) { return false; },
isSorted() { return true; },
canDrop(index, orientation) { return false; },
drop(row, orientation) {},
setTree(out) { this.treebox = out; },
getParentIndex(rowIndex) { return -1; },
--- a/toolkit/components/viewsource/ViewSourceBrowser.jsm
+++ b/toolkit/components/viewsource/ViewSourceBrowser.jsm
@@ -245,17 +245,17 @@ ViewSourceBrowser.prototype = {
let window = Services.wm.getMostRecentWindow(null);
let ok = Services.prompt.prompt(
window,
this.bundle.GetStringFromName("goToLineTitle"),
this.bundle.GetStringFromName("goToLineText"),
input,
null,
- {value:0});
+ {value: 0});
if (!ok)
return;
let line = parseInt(input.value, 10);
if (!(line > 0)) {
Services.prompt.alert(window,
--- a/toolkit/components/windowcreator/tests/unit/test_wwauthpromptfactory.js
+++ b/toolkit/components/windowcreator/tests/unit/test_wwauthpromptfactory.js
@@ -25,17 +25,17 @@ var TestPromptFactory = {
throw Components.results.NS_ERROR_NO_AGGREGATION;
return this.QueryInterface(iid);
},
lockFactory: function tPF_lockf(lock) {
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
},
- getPrompt : function tPF_getPrompt(aWindow, aIID) {
+ getPrompt: function tPF_getPrompt(aWindow, aIID) {
if (aIID.equals(Ci.nsIAuthPrompt) ||
aIID.equals(Ci.nsIAuthPrompt2)) {
authPromptRequestReceived = true;
return {};
}
throw Components.results.NS_ERROR_NO_INTERFACE;
}
--- a/toolkit/components/xulstore/XULStore.js
+++ b/toolkit/components/xulstore/XULStore.js
@@ -316,18 +316,18 @@ XULStore.prototype = {
}
};
function nsStringEnumerator(items) {
this._items = items;
}
nsStringEnumerator.prototype = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIStringEnumerator]),
- _nextIndex : 0,
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIStringEnumerator]),
+ _nextIndex: 0,
hasMore() {
return this._nextIndex < this._items.length;
},
getNext() {
if (!this.hasMore())
throw Cr.NS_ERROR_NOT_AVAILABLE;
return this._items[this._nextIndex++];
},
--- a/toolkit/content/aboutProfiles.js
+++ b/toolkit/content/aboutProfiles.js
@@ -244,17 +244,17 @@ function removeProfile(profile) {
let buttonPressed = Services.prompt.confirmEx(window, title, msg,
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0) +
(Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1) +
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_2),
bundle.GetStringFromName("dontDeleteFiles"),
null,
bundle.GetStringFromName("deleteFiles"),
- null, {value:0});
+ null, {value: 0});
if (buttonPressed == 1) {
return;
}
if (buttonPressed == 2) {
deleteFiles = true;
}
}
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -129,17 +129,17 @@ var snapshotFormatters = {
} else {
let minutesPassed = Math.max(Math.round(timePassed / (60 * 1000)), 1);
let minutesPassedString = strings.GetStringFromName("crashesTimeMinutes");
formattedDate = PluralForm.get(minutesPassed, minutesPassedString)
.replace("#1", minutesPassed);
}
return $.new("tr", [
$.new("td", [
- $.new("a", crash.id, null, {href : reportURL + crash.id})
+ $.new("a", crash.id, null, {href: reportURL + crash.id})
]),
$.new("td", formattedDate)
]);
}));
},
extensions: function extensions(data) {
$.append($("extensions-tbody"), data.map(function(extension) {
@@ -166,17 +166,17 @@ var snapshotFormatters = {
$.append($("experiments-tbody"), data.map(function(experiment) {
return $.new("tr", [
$.new("td", experiment.name),
$.new("td", experiment.id),
$.new("td", experiment.description),
$.new("td", experiment.active),
$.new("td", experiment.endDate),
$.new("td", [
- $.new("a", experiment.detailURL, null, {href : experiment.detailURL, })
+ $.new("a", experiment.detailURL, null, {href: experiment.detailURL, })
]),
$.new("td", experiment.branch),
]);
}));
},
modifiedPreferences: function modifiedPreferences(data) {
$.append($("prefs-tbody"), sortedArrayFromObject(data).map(
@@ -679,19 +679,19 @@ function assembleFromGraphicsFailure(i,
// Non-asserting - the message is substring(9)
what = "Error";
message = message.substring(9);
} else if (message.search(/\[GFX1\]: /) == 0) {
// Asserting - the message is substring(8)
what = "Assert";
message = message.substring(8);
}
- let assembled = {"index" : index,
- "header" : ("(#" + index + ") " + what),
- "message" : message};
+ let assembled = {"index": index,
+ "header": ("(#" + index + ") " + what),
+ "message": message};
return assembled;
}
function sortedArrayFromObject(obj) {
let tuples = [];
for (let prop in obj)
tuples.push([prop, obj[prop]]);
tuples.sort(([prop1, v1], [prop2, v2]) => prop1.localeCompare(prop2));
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -1065,18 +1065,18 @@ function SymbolicationRequest_handleSymb
};
/**
* Send a request to the symbolication server to symbolicate this stack.
*/
SymbolicationRequest.prototype.fetchSymbols =
function SymbolicationRequest_fetchSymbols() {
let symbolServerURI =
Preferences.get(PREF_SYMBOL_SERVER_URI, DEFAULT_SYMBOL_SERVER_URI);
- let request = {"memoryMap" : this.memoryMap, "stacks" : this.stacks,
- "version" : 3};
+ let request = {"memoryMap": this.memoryMap, "stacks": this.stacks,
+ "version": 3};
let requestJSON = JSON.stringify(request);
this.symbolRequest = new XMLHttpRequest();
this.symbolRequest.open("POST", symbolServerURI, true);
this.symbolRequest.setRequestHeader("Content-type", "application/json");
this.symbolRequest.setRequestHeader("Content-length",
requestJSON.length);
this.symbolRequest.setRequestHeader("Connection", "close");
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -454,23 +454,23 @@ function internalSave(aURL, aDocument, a
if (isPrivate === undefined) {
isPrivate = aInitiatingDocument instanceof Components.interfaces.nsIDOMDocument
? PrivateBrowsingUtils.isContentWindowPrivate(aInitiatingDocument.defaultView)
: aInitiatingDocument.isPrivate;
}
var persistArgs = {
sourceURI,
- sourceReferrer : aReferrer,
- sourceDocument : useSaveDocument ? aDocument : null,
- targetContentType : (saveAsType == kSaveAsType_Text) ? "text/plain" : null,
- targetFile : file,
- sourceCacheKey : aCacheKey,
- sourcePostData : nonCPOWDocument ? getPostData(aDocument) : null,
- bypassCache : aShouldBypassCache,
+ sourceReferrer: aReferrer,
+ sourceDocument: useSaveDocument ? aDocument : null,
+ targetContentType: (saveAsType == kSaveAsType_Text) ? "text/plain" : null,
+ targetFile: file,
+ sourceCacheKey: aCacheKey,
+ sourcePostData: nonCPOWDocument ? getPostData(aDocument) : null,
+ bypassCache: aShouldBypassCache,
isPrivate,
};
// Start the actual save process
internalPersist(persistArgs);
}
}
--- a/toolkit/content/findUtils.js
+++ b/toolkit/content/findUtils.js
@@ -7,17 +7,17 @@
Components.utils.import("resource://gre/modules/Services.jsm");
var gFindBundle;
function nsFindInstData() {}
nsFindInstData.prototype =
{
// set the next three attributes on your object to override the defaults
- browser : null,
+ browser: null,
get rootSearchWindow() { return this._root || this.window.content; },
set rootSearchWindow(val) { this._root = val; },
get currentSearchWindow() {
if (this._current)
return this._current;
@@ -38,18 +38,18 @@ nsFindInstData.prototype =
findInFrames.rootSearchFrame = this.rootSearchWindow;
findInFrames.currentSearchFrame = this.currentSearchWindow;
// always search in frames for now. We could add a checkbox to the dialog for this.
findInst.searchFrames = true;
},
window,
- _root : null,
- _current : null
+ _root: null,
+ _current: null
}
// browser is the <browser> element
// rootSearchWindow is the window to constrain the search to (normally window.content)
// currentSearchWindow is the frame to start searching (can be, and normally, rootSearchWindow)
function findInPage(findInstData) {
// is the dialog up already?
if ("findDialog" in window && window.findDialog)
--- a/toolkit/content/tests/browser/browser_audioCompeting_onlyForActiveAgent.js
+++ b/toolkit/content/tests/browser/browser_audioCompeting_onlyForActiveAgent.js
@@ -1,15 +1,15 @@
const PAGE = "https://example.com/browser/toolkit/content/tests/browser/file_multiplePlayingAudio.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function wait_for_event(browser, event) {
return BrowserTestUtils.waitForEvent(browser, event, false, (event) => {
is(event.originalTarget, browser, "Event must be dispatched to correct browser.");
return true;
});
}
--- a/toolkit/content/tests/browser/browser_block_autoplay_media.js
+++ b/toolkit/content/tests/browser/browser_block_autoplay_media.js
@@ -1,15 +1,15 @@
const PAGE = "https://example.com/browser/toolkit/content/tests/browser/file_multipleAudio.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function check_audio_suspended(suspendedType) {
var autoPlay = content.document.getElementById("autoplay");
if (!autoPlay) {
ok(false, "Can't get the audio element!");
}
--- a/toolkit/content/tests/browser/browser_block_autoplay_media_pausedAfterPlay.js
+++ b/toolkit/content/tests/browser/browser_block_autoplay_media_pausedAfterPlay.js
@@ -1,16 +1,16 @@
const PAGE_SHOULD_PLAY = "https://example.com/browser/toolkit/content/tests/browser/file_blockMedia_shouldPlay.html";
const PAGE_SHOULD_NOT_PLAY = "https://example.com/browser/toolkit/content/tests/browser/file_blockMedia_shouldNotPlay.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function check_audio_suspended(suspendedType) {
var audio = content.document.getElementById("testAudio");
if (!audio) {
ok(false, "Can't get the audio element!");
}
--- a/toolkit/content/tests/browser/browser_block_autoplay_playAfterTabVisible.js
+++ b/toolkit/content/tests/browser/browser_block_autoplay_playAfterTabVisible.js
@@ -1,15 +1,15 @@
const PAGE = "https://example.com/browser/toolkit/content/tests/browser/file_nonAutoplayAudio.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function check_audio_suspended(suspendedType) {
var audio = content.document.getElementById("testAudio");
if (!audio) {
ok(false, "Can't get the audio element!");
}
--- a/toolkit/content/tests/browser/browser_block_playMediaInMuteTab.js
+++ b/toolkit/content/tests/browser/browser_block_playMediaInMuteTab.js
@@ -1,15 +1,15 @@
const PAGE = "https://example.com/browser/toolkit/content/tests/browser/file_nonAutoplayAudio.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function wait_for_event(browser, event) {
return BrowserTestUtils.waitForEvent(browser, event, false, (event) => {
is(event.originalTarget, browser, "Event must be dispatched to correct browser.");
return true;
});
}
--- a/toolkit/content/tests/browser/browser_block_silentAudioTrack_media.js
+++ b/toolkit/content/tests/browser/browser_block_silentAudioTrack_media.js
@@ -1,15 +1,15 @@
const PAGE = "https://example.com/browser/toolkit/content/tests/browser/file_silentAudioTrack.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function disable_non_test_mouse(disable) {
let utils = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
utils.disableNonTestMouseEvents(disable);
}
--- a/toolkit/content/tests/browser/browser_bug295977_autoscroll_overflow.js
+++ b/toolkit/content/tests/browser/browser_bug295977_autoscroll_overflow.js
@@ -159,17 +159,17 @@ body > div > div {width: 1000px;height:
// Close the autoscroll popup by synthesizing Esc.
EventUtils.synthesizeKey("VK_ESCAPE", {});
let scrollVert = test.expected & expectScrollVert;
let scrollHori = test.expected & expectScrollHori;
yield ContentTask.spawn(gBrowser.selectedBrowser,
{ scrollVert,
scrollHori,
- elemid : test.elem,
+ elemid: test.elem,
checkWindow: test.testwindow },
function* (args) {
let msg = "";
if (args.checkWindow) {
if (!((args.scrollVert && content.scrollY > 0) ||
(!args.scrollVert && content.scrollY == 0))) {
msg += "Failed: ";
}
--- a/toolkit/content/tests/browser/browser_mediaPlayback_suspended.js
+++ b/toolkit/content/tests/browser/browser_mediaPlayback_suspended.js
@@ -1,15 +1,15 @@
const PAGE = "https://example.com/browser/toolkit/content/tests/browser/file_mediaPlayback2.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function wait_for_event(browser, event) {
return BrowserTestUtils.waitForEvent(browser, event, false, (event) => {
is(event.originalTarget, browser, "Event must be dispatched to correct browser.");
return true;
});
}
--- a/toolkit/content/tests/browser/browser_mediaPlayback_suspended_multipleAudio.js
+++ b/toolkit/content/tests/browser/browser_mediaPlayback_suspended_multipleAudio.js
@@ -1,15 +1,15 @@
const PAGE = "https://example.com/browser/toolkit/content/tests/browser/file_multipleAudio.html";
var SuspendedType = {
- NONE_SUSPENDED : 0,
- SUSPENDED_PAUSE : 1,
- SUSPENDED_BLOCK : 2,
- SUSPENDED_PAUSE_DISPOSABLE : 3
+ NONE_SUSPENDED: 0,
+ SUSPENDED_PAUSE: 1,
+ SUSPENDED_BLOCK: 2,
+ SUSPENDED_PAUSE_DISPOSABLE: 3
};
function wait_for_event(browser, event) {
return BrowserTestUtils.waitForEvent(browser, event, false, (event) => {
is(event.originalTarget, browser, "Event must be dispatched to correct browser.");
return true;
});
}
--- a/toolkit/content/tests/mochitest/test_autocomplete_change_after_focus.html
+++ b/toolkit/content/tests/mochitest/test_autocomplete_change_after_focus.html
@@ -18,18 +18,18 @@ https://bugzilla.mozilla.org/show_bug.cg
yield new Promise(resolve => SimpleTest.waitForFocus(resolve));
});
add_task(function* setup() {
yield new Promise(resolve => {
let chromeScript = SpecialPowers.loadChromeScript(function() {
const {FormHistory} = Components.utils.import("resource://gre/modules/FormHistory.jsm", null);
FormHistory.update([
- { op : "bump", fieldname: "field1", value: "Default text option" },
- { op : "bump", fieldname: "field1", value: "New value option" },
+ { op: "bump", fieldname: "field1", value: "Default text option" },
+ { op: "bump", fieldname: "field1", value: "New value option" },
], {
handleCompletion() {
sendAsyncMessage("Test:Resume");
},
});
});
chromeScript.addMessageListener("Test:Resume", function resumeListener() {
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -1518,17 +1518,17 @@
var isEnabled = this.mPrefs.getBoolPref(kPrefShortcutEnabled);
if (!isEnabled)
return;
// Toggle browse with caret mode
var browseWithCaretOn = this.mPrefs.getBoolPref(kPrefCaretBrowsingOn, false);
var warn = this.mPrefs.getBoolPref(kPrefWarnOnEnable, true);
if (warn && !browseWithCaretOn) {
- var checkValue = {value:false};
+ var checkValue = {value: false};
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService);
var buttonPressed = promptService.confirmEx(window,
this.mStrBundle.GetStringFromName("browsewithcaret.checkWindowTitle"),
this.mStrBundle.GetStringFromName("browsewithcaret.checkLabel"),
// Make "No" the default:
promptService.STD_YES_NO_BUTTONS | promptService.BUTTON_POS_1_DEFAULT,
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -190,51 +190,51 @@
<implementation>
<constructor>
<![CDATA[
this.isTouchControls = false;
this.randomID = 0;
this.Utils = {
- debug : false,
- video : null,
- videocontrols : null,
- controlBar : null,
- playButton : null,
- muteButton : null,
- volumeControl : null,
- durationLabel : null,
- positionLabel : null,
- scrubber : null,
- progressBar : null,
- bufferBar : null,
- statusOverlay : null,
- controlsSpacer : null,
- clickToPlay : null,
- controlsOverlay : null,
- fullscreenButton : null,
- layoutControls : null,
+ debug: false,
+ video: null,
+ videocontrols: null,
+ controlBar: null,
+ playButton: null,
+ muteButton: null,
+ volumeControl: null,
+ durationLabel: null,
+ positionLabel: null,
+ scrubber: null,
+ progressBar: null,
+ bufferBar: null,
+ statusOverlay: null,
+ controlsSpacer: null,
+ clickToPlay: null,
+ controlsOverlay: null,
+ fullscreenButton: null,
+ layoutControls: null,
currentTextTrackIndex: 0,
textTracksCount: 0,
- randomID : 0,
- videoEvents : ["play", "pause", "ended", "volumechange", "loadeddata",
- "loadstart", "timeupdate", "progress",
- "playing", "waiting", "canplay", "canplaythrough",
- "seeking", "seeked", "emptied", "loadedmetadata",
- "error", "suspend", "stalled",
- "mozexitvideosuspend"],
+ randomID: 0,
+ videoEvents: ["play", "pause", "ended", "volumechange", "loadeddata",
+ "loadstart", "timeupdate", "progress",
+ "playing", "waiting", "canplay", "canplaythrough",
+ "seeking", "seeked", "emptied", "loadedmetadata",
+ "error", "suspend", "stalled",
+ "mozexitvideosuspend"],
showHours: false,
- firstFrameShown : false,
- timeUpdateCount : 0,
- maxCurrentTimeSeen : 0,
+ firstFrameShown: false,
+ timeUpdateCount: 0,
+ maxCurrentTimeSeen: 0,
isPausedByDragging: false,
- _isAudioOnly : false,
+ _isAudioOnly: false,
get isAudioOnly() { return this._isAudioOnly; },
set isAudioOnly(val) {
this._isAudioOnly = val;
this.setFullscreenButtonState();
if (!this.isTopLevelSyntheticDocument) {
return;
@@ -249,17 +249,17 @@
},
get isControlBarHidden() {
return this.controlBar.hidden ||
this.controlBar.hideByAdjustment ||
this.controlBar.getAttribute("fadeout") === "true";
},
- suppressError : false,
+ suppressError: false,
setupStatusFader(immediate) {
// Since the play button will be showing, we don't want to
// show the throbber behind it. The throbber here will
// only show if needed after the play button has been pressed.
if (!this.clickToPlay.hidden) {
this.startFadeOut(this.statusOverlay, true);
return;
@@ -997,36 +997,36 @@
var endTime = 0;
if (index >= 0) {
endTime = Math.round(buffered.end(index) * 1000);
}
this.bufferBar.max = duration;
this.bufferBar.value = endTime;
},
- _controlsHiddenByTimeout : false,
- _showControlsTimeout : 0,
+ _controlsHiddenByTimeout: false,
+ _showControlsTimeout: 0,
SHOW_CONTROLS_TIMEOUT_MS: 500,
_showControlsFn() {
if (Utils.video.matches("video:hover")) {
Utils.startFadeIn(Utils.controlBar, false);
Utils._showControlsTimeout = 0;
Utils._controlsHiddenByTimeout = false;
}
},
- _hideControlsTimeout : 0,
+ _hideControlsTimeout: 0,
_hideControlsFn() {
if (!Utils.scrubber.isDragging) {
Utils.startFade(Utils.controlBar, false);
Utils._hideControlsTimeout = 0;
Utils._controlsHiddenByTimeout = true;
}
},
- HIDE_CONTROLS_TIMEOUT_MS : 2000,
+ HIDE_CONTROLS_TIMEOUT_MS: 2000,
onMouseMove(event) {
// Pause playing video when the mouse is dragging over the control bar.
if (this.scrubber.startToDrag) {
this.scrubber.isDragging = true;
this.pauseVideoDuringDragging();
}
// If the controls are static, don't change anything.
@@ -1658,18 +1658,18 @@
},
get isTopLevelSyntheticDocument() {
let doc = this.video.ownerDocument;
let win = doc.defaultView;
return doc.mozSyntheticDocument && win === win.top;
},
- controlBarMinHeight : 40,
- adjustedVideoSize : {},
+ controlBarMinHeight: 40,
+ adjustedVideoSize: {},
adjustControlSize() {
if (this.videocontrols.isTouchControls) {
return;
}
let controlHidden = this.isControlBarHidden;
if (this.layoutControls.some(control => control.resized)) {
@@ -2183,19 +2183,19 @@
</vbox>
</xbl:content>
<implementation>
<constructor>
<![CDATA[
this.randomID = 0;
this.Utils = {
- randomID : 0,
- videoEvents : ["play",
- "playing"],
+ randomID: 0,
+ videoEvents: ["play",
+ "playing"],
controlListeners: [],
terminateEventListeners() {
for (let event of this.videoEvents) {
this.video.removeEventListener(event, this, { mozSystemGroup: true });
}
for (let element of this.controlListeners) {
element.item.removeEventListener(element.event, element.func,
--- a/toolkit/modules/FileUtils.jsm
+++ b/toolkit/modules/FileUtils.jsm
@@ -11,25 +11,25 @@ const Cc = Components.classes;
const Ci = Components.interfaces;
const Cr = Components.results;
XPCOMUtils.defineLazyServiceGetter(this, "gDirService",
"@mozilla.org/file/directory_service;1",
"nsIProperties");
this.FileUtils = {
- MODE_RDONLY : 0x01,
- MODE_WRONLY : 0x02,
- MODE_RDWR : 0x04,
- MODE_CREATE : 0x08,
- MODE_APPEND : 0x10,
- MODE_TRUNCATE : 0x20,
+ MODE_RDONLY: 0x01,
+ MODE_WRONLY: 0x02,
+ MODE_RDWR: 0x04,
+ MODE_CREATE: 0x08,
+ MODE_APPEND: 0x10,
+ MODE_TRUNCATE: 0x20,
- PERMS_FILE : 0o644,
- PERMS_DIRECTORY : 0o755,
+ PERMS_FILE: 0o644,
+ PERMS_DIRECTORY: 0o755,
/**
* Gets a file at the specified hierarchy under a nsIDirectoryService key.
* @param key
* The Directory Service Key to start from
* @param pathArray
* An array of path components to locate beneath the directory
* specified by |key|. The last item in this array must be the
--- a/toolkit/modules/PageMenu.jsm
+++ b/toolkit/modules/PageMenu.jsm
@@ -241,17 +241,17 @@ PageMenu.prototype = {
}
}
// This object is expected to be used from a parent process.
this.PageMenuParent = function PageMenuParent() {
}
PageMenuParent.prototype = {
- __proto__ : PageMenu.prototype,
+ __proto__: PageMenu.prototype,
/*
* Given a target node and popup, add the context menu to the popup. This is
* intended to be called when a single process is used. This is equivalent to
* calling PageMenuChild.build and PageMenuParent.addToPopup in sequence.
*
* Returns true if custom menu items were present.
*/
@@ -277,17 +277,17 @@ PageMenuParent.prototype = {
}
}
// This object is expected to be used from a child process.
this.PageMenuChild = function PageMenuChild() {
}
PageMenuChild.prototype = {
- __proto__ : PageMenu.prototype,
+ __proto__: PageMenu.prototype,
/*
* Given a target node, return a JSON object for the custom menu commands. The
* object will consist of a hierarchical structure of menus, menuitems or
* separators. Supported properties of each are:
* Menu: children, label, type="menu"
* Menuitems: checkbox, checked, disabled, icon, label, type="menuitem"
* Separators: type="separator"
--- a/toolkit/modules/RemoteWebProgress.jsm
+++ b/toolkit/modules/RemoteWebProgress.jsm
@@ -20,17 +20,17 @@ function RemoteWebProgressRequest(spec,
this.wrappedJSObject = this;
this._uri = newURI(spec);
this._originalURI = newURI(originalSpec);
this._requestCPOW = requestCPOW;
}
RemoteWebProgressRequest.prototype = {
- QueryInterface : XPCOMUtils.generateQI([Ci.nsIChannel]),
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIChannel]),
get URI() { return this._uri.clone(); },
get originalURI() { return this._originalURI.clone(); }
};
function RemoteWebProgress(aManager, aIsTopLevel) {
this.wrappedJSObject = this;
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -588,17 +588,17 @@ var dataProviders = {
if (AppConstants.MOZ_CRASHREPORTER) {
dataProviders.crashes = function crashes(done) {
let CrashReports = Cu.import("resource://gre/modules/CrashReports.jsm").CrashReports;
let reports = CrashReports.getReports();
let now = new Date();
let reportsNew = reports.filter(report => (now - report.date < Troubleshoot.kMaxCrashAge));
let reportsSubmitted = reportsNew.filter(report => (!report.pending));
let reportsPendingCount = reportsNew.length - reportsSubmitted.length;
- let data = {submitted : reportsSubmitted, pending : reportsPendingCount};
+ let data = {submitted: reportsSubmitted, pending: reportsPendingCount};
done(data);
}
}
if (AppConstants.MOZ_SANDBOX) {
dataProviders.sandbox = function sandbox(done) {
let data = {};
if (AppConstants.platform == "linux") {
--- a/toolkit/modules/addons/WebRequestContent.js
+++ b/toolkit/modules/addons/WebRequestContent.js
@@ -75,17 +75,16 @@ var ContentPolicy = {
unregister() {
let catMan = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
catMan.deleteCategoryEntry("content-policy", this._contractID, false);
},
shouldLoad(policyType, contentLocation, requestOrigin,
node, mimeTypeGuess, extra, requestPrincipal) {
-
// Loads of TYPE_DOCUMENT and TYPE_SUBDOCUMENT perform a ConPol check
// within docshell as well as within the ContentSecurityManager. To avoid
// duplicate evaluations we ignore ConPol checks performed within docShell.
if (extra instanceof Ci.nsISupportsString) {
if (extra.data === "conPolCheckFromDocShell") {
return Ci.nsIContentPolicy.ACCEPT;
}
}
--- a/toolkit/modules/tests/xpcshell/test_Log.js
+++ b/toolkit/modules/tests/xpcshell/test_Log.js
@@ -399,23 +399,23 @@ add_task(function* log_message_with_para
'Text with no subs: {"a":"b","c":"d"}');
// If we substitute one parameter but not the other,
// we ignore any params that aren't substituted.
do_check_eq(formatMessage("Text with partial sub ${a}", {a: "b", c: "d"}),
"Text with partial sub b");
// We don't format internal fields stored in params.
- do_check_eq(formatMessage("Params with _ ${}", {a: "b", _c: "d", _level:20, _message:"froo",
- _time:123456, _namespace:"here.there"}),
+ do_check_eq(formatMessage("Params with _ ${}", {a: "b", _c: "d", _level: 20, _message: "froo",
+ _time: 123456, _namespace: "here.there"}),
'Params with _ {"a":"b","_c":"d"}');
// Don't print an empty params holder if all params are internal.
- do_check_eq(formatMessage("All params internal", {_level:20, _message:"froo",
- _time:123456, _namespace:"here.there"}),
+ do_check_eq(formatMessage("All params internal", {_level: 20, _message: "froo",
+ _time: 123456, _namespace: "here.there"}),
"All params internal");
// Format params with null and undefined values.
do_check_eq(formatMessage("Null ${n} undefined ${u}", {n: null, u: undefined}),
"Null null undefined undefined");
// Format params with number, bool, and Object/String type.
do_check_eq(formatMessage("number ${n} boolean ${b} boxed Boolean ${bx} String ${s}",
@@ -540,17 +540,17 @@ add_task(function* test_structured_basic
* Test that all the basic logger methods pass the message and params through to the appender.
*/
add_task(function* log_message_with_params() {
let log = Log.repository.getLogger("error.logger");
let mockFormatter = { format: msg => msg };
let appender = new MockAppender(mockFormatter);
log.addAppender(appender);
- let testParams = {a:1, b:2};
+ let testParams = {a: 1, b: 2};
log.fatal("Test fatal", testParams);
log.error("Test error", testParams);
log.warn("Test warn", testParams);
log.info("Test info", testParams);
log.config("Test config", testParams);
log.debug("Test debug", testParams);
log.trace("Test trace", testParams);
do_check_eq(appender.messages.length, 7);
--- a/toolkit/mozapps/extensions/content/update.js
+++ b/toolkit/mozapps/extensions/content/update.js
@@ -440,21 +440,21 @@ var gFoundPage = {
"installButtonText", true,
null, false);
document.getElementById("found").setAttribute("next", "installing");
document.documentElement.getButton("next").disabled = !oneChecked;
}
};
var gInstallingPage = {
- _installs : [],
- _errors : [],
- _strings : null,
- _currentInstall : -1,
- _installing : false,
+ _installs: [],
+ _errors: [],
+ _strings: null,
+ _currentInstall: -1,
+ _installing: false,
// Initialize fields we need for installing and tracking progress,
// and start iterating through the installations
startInstalls(aInstallList) {
if (!gUpdateWizard.xpinstallEnabled) {
return;
}
--- a/toolkit/mozapps/extensions/internal/AddonRepository.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonRepository.jsm
@@ -706,17 +706,17 @@ this.AddonRepository = {
* terms. If the corresponding preference is not defined, defaults to
* about:blank.
*
* @param aSearchTerms
* Search terms used to search the repository
*/
getSearchURL(aSearchTerms) {
let url = this._formatURLPref(PREF_GETADDONS_BROWSESEARCHRESULTS, {
- TERMS : encodeURIComponent(aSearchTerms)
+ TERMS: encodeURIComponent(aSearchTerms)
});
return (url != null) ? url : "about:blank";
},
/**
* Cancels the search in progress. If there is no search in progress this
* does nothing.
*/
@@ -756,17 +756,17 @@ this.AddonRepository = {
* (Optional) timeout in milliseconds to abandon the XHR request
* if we have not received a response from the server.
*/
_beginGetAddons(aIDs, aCallback, aSendPerformance, aTimeout) {
let ids = aIDs.slice(0);
let params = {
API_VERSION,
- IDS : ids.map(encodeURIComponent).join(",")
+ IDS: ids.map(encodeURIComponent).join(",")
};
let pref = PREF_GETADDONS_BYIDS;
if (aSendPerformance) {
let type = Services.prefs.getPrefType(PREF_GETADDONS_BYIDS_PERFORMANCE);
if (type == Services.prefs.PREF_STRING) {
pref = PREF_GETADDONS_BYIDS_PERFORMANCE;
@@ -868,17 +868,17 @@ this.AddonRepository = {
* @param aCallback
* The callback to pass results to
*/
retrieveRecommendedAddons(aMaxResults, aCallback) {
let url = this._formatURLPref(PREF_GETADDONS_GETRECOMMENDED, {
API_VERSION,
// Get twice as many results to account for potential filtering
- MAX_RESULTS : 2 * aMaxResults
+ MAX_RESULTS: 2 * aMaxResults
});
let handleResults = (aElements, aTotalResults) => {
this._getLocalAddonIds(aLocalAddonIds => {
// aTotalResults irrelevant
this._parseAddons(aElements, -1, aLocalAddonIds);
});
}
@@ -901,20 +901,20 @@ this.AddonRepository = {
let compatMode = "normal";
if (!AddonManager.checkCompatibility)
compatMode = "ignore";
else if (AddonManager.strictCompatibility)
compatMode = "strict";
let substitutions = {
API_VERSION,
- TERMS : encodeURIComponent(aSearchTerms),
+ TERMS: encodeURIComponent(aSearchTerms),
// Get twice as many results to account for potential filtering
- MAX_RESULTS : 2 * aMaxResults,
- COMPATIBILITY_MODE : compatMode,
+ MAX_RESULTS: 2 * aMaxResults,
+ COMPATIBILITY_MODE: compatMode,
};
let url = this._formatURLPref(PREF_GETADDONS_GETSEARCHRESULTS, substitutions);
let handleResults = (aElements, aTotalResults) => {
this._getLocalAddonIds(aLocalAddonIds => {
this._parseAddons(aElements, aTotalResults, aLocalAddonIds);
});
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -209,24 +209,24 @@ const STATIC_BLOCKLIST_PATTERNS = [
blockID: "i162" },
{ creator: "Mozilla.org",
level: Blocklist.STATE_BLOCKED,
blockID: "i162" }
];
const BOOTSTRAP_REASONS = {
- APP_STARTUP : 1,
- APP_SHUTDOWN : 2,
- ADDON_ENABLE : 3,
- ADDON_DISABLE : 4,
- ADDON_INSTALL : 5,
- ADDON_UNINSTALL : 6,
- ADDON_UPGRADE : 7,
- ADDON_DOWNGRADE : 8
+ APP_STARTUP: 1,
+ APP_SHUTDOWN: 2,
+ ADDON_ENABLE: 3,
+ ADDON_DISABLE: 4,
+ ADDON_INSTALL: 5,
+ ADDON_UNINSTALL: 6,
+ ADDON_UPGRADE: 7,
+ ADDON_DOWNGRADE: 8
};
// Map new string type identifiers to old style nsIUpdateItem types
// Type 32 was previously used for multipackage xpi files so it should
// not be re-used since old files with that type may be floating around.
const TYPES = {
extension: 2,
theme: 4,
@@ -7968,19 +7968,19 @@ function DirectoryInstallLocation(aName,
return;
if (!aDirectory.isDirectory())
throw new Error("Location must be a directory.");
this._readAddons();
}
DirectoryInstallLocation.prototype = {
- _name : "",
- _directory : null,
- _IDToFileMap : null, // mapping from add-on ID to nsIFile
+ _name: "",
+ _directory: null,
+ _IDToFileMap: null, // mapping from add-on ID to nsIFile
/**
* Reads a directory linked to in a file.
*
* @param file
* The file containing the directory path
* @return An nsIFile object representing the linked directory.
*/
@@ -8981,20 +8981,20 @@ function WinRegInstallLocation(aName, aR
return;
}
this._readAddons(key);
key.close();
}
WinRegInstallLocation.prototype = {
- _name : "",
- _rootKey : null,
- _scope : null,
- _IDToFileMap : null, // mapping from ID to nsIFile
+ _name: "",
+ _rootKey: null,
+ _scope: null,
+ _IDToFileMap: null, // mapping from ID to nsIFile
/**
* Retrieves the path of this Application's data key in the registry.
*/
get _appKeyPath() {
let appVendor = Services.appinfo.vendor;
let appName = Services.appinfo.name;
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_locked.js
@@ -259,17 +259,17 @@ add_task(function* run_test_1() {
shutdownManager();
do_print("Locking " + gExtensionsJSON.path);
let options = {
winShare: 0
};
if (OS.Constants.libc.O_EXLOCK)
options.unixFlags = OS.Constants.libc.O_EXLOCK;
- let file = yield OS.File.open(gExtensionsJSON.path, {read:true, write:true, existing:true}, options);
+ let file = yield OS.File.open(gExtensionsJSON.path, {read: true, write: true, existing: true}, options);
let filePermissions = gExtensionsJSON.permissions;
if (!OS.Constants.Win) {
gExtensionsJSON.permissions = 0;
}
startupManager(false);
// Shouldn't have seen any startup changes
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_locked2.js
@@ -153,17 +153,17 @@ add_task(function*() {
shutdownManager();
do_print("Locking " + gExtensionsJSON.path);
let options = {
winShare: 0
};
if (OS.Constants.libc.O_EXLOCK)
options.unixFlags = OS.Constants.libc.O_EXLOCK;
- let file = yield OS.File.open(gExtensionsJSON.path, {read:true, write:true, existing:true}, options);
+ let file = yield OS.File.open(gExtensionsJSON.path, {read: true, write: true, existing: true}, options);
let filePermissions = gExtensionsJSON.permissions;
if (!OS.Constants.Win) {
gExtensionsJSON.permissions = 0;
}
startupManager(false);
check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js
@@ -260,17 +260,17 @@ add_task(function* run_test_1() {
shutdownManager();
do_print("Locking " + gExtensionsJSON.path);
let options = {
winShare: 0
};
if (OS.Constants.libc.O_EXLOCK)
options.unixFlags = OS.Constants.libc.O_EXLOCK;
- let file = yield OS.File.open(gExtensionsJSON.path, {read:true, write:true, existing:true}, options);
+ let file = yield OS.File.open(gExtensionsJSON.path, {read: true, write: true, existing: true}, options);
let filePermissions = gExtensionsJSON.permissions;
if (!OS.Constants.Win) {
gExtensionsJSON.permissions = 0;
}
startupManager(false);
// Shouldn't have seen any startup changes
--- a/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
+++ b/toolkit/mozapps/extensions/test/xpinstall/bug645699.html
@@ -7,23 +7,23 @@
<title>InstallTrigger tests</title>
<script type="text/javascript">
/* globals InstallTrigger */
/* exported startInstall */
function startInstall() {
var whiteUrl = "https://example.org/";
try {
- Object.defineProperty(window, "location", { value : { href : whiteUrl } });
+ Object.defineProperty(window, "location", { value: { href: whiteUrl } });
throw new Error("Object.defineProperty(window, 'location', ...) should have thrown");
} catch (exc) {
if (!(exc instanceof TypeError))
throw exc;
}
- Object.defineProperty(document, "documentURIObject", { spec : { href : whiteUrl } });
+ Object.defineProperty(document, "documentURIObject", { spec: { href: whiteUrl } });
InstallTrigger.install({
"Unsigned XPI": "http://example.com/browser/toolkit/mozapps/extensions/test/xpinstall/amosigned.xpi"
});
}
</script>
</head>
<body onload="startInstall()">
--- a/toolkit/mozapps/preferences/removemp.js
+++ b/toolkit/mozapps/preferences/removemp.js
@@ -1,20 +1,20 @@
// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var gRemovePasswordDialog = {
- _token : null,
- _bundle : null,
- _prompt : null,
- _okButton : null,
- _password : null,
+ _token: null,
+ _bundle: null,
+ _prompt: null,
+ _okButton: null,
+ _password: null,
init() {
this._prompt = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService);
this._bundle = document.getElementById("bundlePreferences");
this._okButton = document.documentElement.getButton("accept");
this._okButton.label = this._bundle.getString("pw_remove_button");
--- a/toolkit/profile/content/profileSelection.js
+++ b/toolkit/profile/content/profileSelection.js
@@ -178,17 +178,17 @@ function RenameProfile() {
var oldName = selectedProfile.name;
var newName = {value: oldName};
var dialogTitle = gProfileManagerBundle.getString("renameProfileTitle");
var msg =
gProfileManagerBundle.getFormattedString("renameProfilePrompt", [oldName]);
- if (Services.prompt.prompt(window, dialogTitle, msg, newName, null, {value:0})) {
+ if (Services.prompt.prompt(window, dialogTitle, msg, newName, null, {value: 0})) {
newName = newName.value;
// User hasn't changed the profile name. Treat as if cancel was pressed.
if (newName == oldName)
return false;
try {
selectedProfile.name = newName;
@@ -230,17 +230,17 @@ function ConfirmDelete() {
var buttonPressed = Services.prompt.confirmEx(window, dialogTitle, dialogText,
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0) +
(Services.prompt.BUTTON_TITLE_CANCEL * Services.prompt.BUTTON_POS_1) +
(Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_2),
gProfileManagerBundle.getString("dontDeleteFiles"),
null,
gProfileManagerBundle.getString("deleteFiles"),
- null, {value:0});
+ null, {value: 0});
if (buttonPressed == 1)
return false;
if (buttonPressed == 2)
deleteFiles = true;
}
selectedProfile.remove(deleteFiles);
--- a/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/recommended.js
+++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/recommended.js
@@ -65,18 +65,21 @@ module.exports = {
// Require function* name()
// "generator-star-spacing": ["error", {"before": false, "after": true}],
// Two space indent
// "indent": ["error", 2, { "SwitchCase": 1 }],
// Space after colon not before in property declarations
- // "key-spacing": ["error", { "beforeColon": false, "afterColon": true,
- // "mode": "minimum" }],
+ "key-spacing": ["error", {
+ "beforeColon": false,
+ "afterColon": true,
+ "mode": "minimum"
+ }],
// Require spaces before and after keywords
"keyword-spacing": "error",
// Unix linebreaks
"linebreak-style": ["error", "unix"],
// Don't enforce the maximum depth that blocks can be nested. The complexity
--- a/tools/lint/eslint/eslint-plugin-mozilla/package.json
+++ b/tools/lint/eslint/eslint-plugin-mozilla/package.json
@@ -1,11 +1,11 @@
{
"name": "eslint-plugin-mozilla",
- "version": "0.2.32",
+ "version": "0.2.33",
"description": "A collection of rules that help enforce JavaScript coding standard in the Mozilla project.",
"keywords": [
"eslint",
"eslintplugin",
"eslint-plugin",
"mozilla",
"firefox"
],