--- a/browser/components/extensions/test/browser/head.js
+++ b/browser/components/extensions/test/browser/head.js
@@ -105,23 +105,22 @@ function promisePossiblyInaccurateConten
for (let prop of props) {
res[prop] = obj[prop];
}
return res;
}
return {
window: copyProps(content,
- ["innerWidth", "innerHeight", "outerWidth", "outerHeight",
- "scrollX", "scrollY", "scrollMaxX", "scrollMaxY"]),
+ ["innerWidth", "innerHeight", "outerWidth", "outerHeight",
+ "scrollX", "scrollY", "scrollMaxX", "scrollMaxY"]),
body: copyProps(content.document.body,
- ["clientWidth", "clientHeight", "scrollWidth", "scrollHeight"]),
+ ["clientWidth", "clientHeight", "scrollWidth", "scrollHeight"]),
root: copyProps(content.document.documentElement,
- ["clientWidth", "clientHeight", "scrollWidth", "scrollHeight"]),
-
+ ["clientWidth", "clientHeight", "scrollWidth", "scrollHeight"]),
isStandards: content.document.compatMode !== "BackCompat",
};
});
}
function delay(ms = 0) {
return new Promise(resolve => setTimeout(resolve, ms));
}
--- a/browser/components/migration/FirefoxProfileMigrator.js
+++ b/browser/components/migration/FirefoxProfileMigrator.js
@@ -125,18 +125,18 @@ FirefoxProfileMigrator.prototype._getRes
}
};
}.bind(this);
let types = MigrationUtils.resourceTypes;
let places = getFileResource(types.HISTORY, ["places.sqlite"]);
let cookies = getFileResource(types.COOKIES, ["cookies.sqlite"]);
let passwords = getFileResource(types.PASSWORDS,
- ["signons.sqlite", "logins.json", "key3.db",
- "signedInUser.json"]);
+ ["signons.sqlite", "logins.json", "key3.db",
+ "signedInUser.json"]);
let formData = getFileResource(types.FORMDATA, ["formhistory.sqlite"]);
let bookmarksBackups = getFileResource(types.OTHERDATA,
[PlacesBackups.profileRelativeFolderPath]);
let dictionary = getFileResource(types.OTHERDATA, ["persdict.dat"]);
let sessionCheckpoints = this._getFileObject(sourceProfileDir, "sessionCheckpoints.json");
let sessionFile = this._getFileObject(sourceProfileDir, "sessionstore.js");
let session;
--- a/browser/components/migration/SafariProfileMigrator.js
+++ b/browser/components/migration/SafariProfileMigrator.js
@@ -324,19 +324,19 @@ SearchStrings.prototype = {
function migrateSearchStrings(aDict) {
if (!aDict)
throw new Error("Could not get preferences dictionary");
if (aDict.has("RecentSearchStrings")) {
let recentSearchStrings = aDict.get("RecentSearchStrings");
if (recentSearchStrings && recentSearchStrings.length > 0) {
let changes = recentSearchStrings.map((searchString) => (
- {op: "add",
- fieldname: "searchbar-history",
- value: searchString}));
+ {op: "add",
+ fieldname: "searchbar-history",
+ value: searchString}));
FormHistory.update(changes);
}
}
}.bind(this), aCallback));
}
};
function SafariProfileMigrator() {
--- a/devtools/client/animationinspector/animation-controller.js
+++ b/devtools/client/animationinspector/animation-controller.js
@@ -80,17 +80,17 @@ var getServerTraits = Task.async(functio
let config = [
{ name: "hasToggleAll", actor: "animations",
method: "toggleAll" },
{ name: "hasToggleSeveral", actor: "animations",
method: "toggleSeveral" },
{ name: "hasSetCurrentTime", actor: "animationplayer",
method: "setCurrentTime" },
{ name: "hasMutationEvents", actor: "animations",
- method: "stopAnimationPlayerUpdates" },
+ method: "stopAnimationPlayerUpdates" },
{ name: "hasSetPlaybackRate", actor: "animationplayer",
method: "setPlaybackRate" },
{ name: "hasSetPlaybackRates", actor: "animations",
method: "setPlaybackRates" },
{ name: "hasTargetNode", actor: "domwalker",
method: "getNodeFromActor" },
{ name: "hasSetCurrentTimes", actor: "animations",
method: "setCurrentTimes" },
--- a/devtools/client/animationinspector/animation-panel.js
+++ b/devtools/client/animationinspector/animation-panel.js
@@ -55,17 +55,18 @@ var AnimationsPanel = {
// If the server doesn't support toggling all animations at once, hide the
// whole global toolbar.
if (!AnimationsController.traits.hasToggleAll) {
$("#global-toolbar").style.display = "none";
}
// Binding functions that need to be called in scope.
- for (let functionName of ["onKeyDown", "onPickerStarted",
+ for (let functionName of [
+ "onKeyDown", "onPickerStarted",
"onPickerStopped", "refreshAnimationsUI", "onToggleAllClicked",
"onTabNavigated", "onTimelineDataChanged", "onTimelinePlayClicked",
"onTimelineRewindClicked", "onRateChanged"]) {
this[functionName] = this[functionName].bind(this);
}
let hUtils = gToolbox.highlighterUtils;
this.togglePicker = hUtils.togglePicker.bind(hUtils);
--- a/devtools/client/animationinspector/test/doc_timing_combination_animation.html
+++ b/devtools/client/animationinspector/test/doc_timing_combination_animation.html
@@ -18,18 +18,18 @@
const delayList = [0, 50000, -50000];
const endDelayList = [0, 50000, -50000];
delayList.forEach(delay => {
endDelayList.forEach(endDelay => {
const el = document.createElement("div");
document.body.appendChild(el);
el.animate({ opacity: [0, 1] },
- { duration: 200000,
- iterations: 1,
- fill: "both",
- delay: delay,
- endDelay: endDelay });
+ { duration: 200000,
+ iterations: 1,
+ fill: "both",
+ delay: delay,
+ endDelay: endDelay });
});
});
</script>
</body>
</html>
--- a/devtools/client/inspector/layout/components/Accordion.js
+++ b/devtools/client/inspector/layout/components/Accordion.js
@@ -60,17 +60,17 @@ const Accordion = React.createClass({
onClick: () => this.handleHeaderClick(i) },
span({ className: arrowClassName }),
item.header
),
(created[i] || opened[i]) ?
div(
{ className: "_content",
- style: { display: opened[i] ? "block" : "none" }
+ style: { display: opened[i] ? "block" : "none" }
},
React.createElement(item.component, item.componentProps || {})
) :
null
);
},
render: function () {
--- a/devtools/client/inspector/markup/views/element-editor.js
+++ b/devtools/client/inspector/markup/views/element-editor.js
@@ -19,17 +19,18 @@ const {parseAttribute} =
require("devtools/client/shared/node-attribute-parser");
const {getCssProperties} = require("devtools/shared/fronts/css-properties");
// Page size for pageup/pagedown
const COLLAPSE_DATA_URL_REGEX = /^data.+base64/;
const COLLAPSE_DATA_URL_LENGTH = 60;
// Contains only void (without end tag) HTML elements
-const HTML_VOID_ELEMENTS = [ "area", "base", "br", "col", "command", "embed",
+const HTML_VOID_ELEMENTS = [
+ "area", "base", "br", "col", "command", "embed",
"hr", "img", "input", "keygen", "link", "meta", "param", "source",
"track", "wbr" ];
/**
* Creates an editor for an Element node.
*
* @param {MarkupContainer} container
* The container owning this editor.
--- a/devtools/client/inspector/rules/test/head.js
+++ b/devtools/client/inspector/rules/test/head.js
@@ -104,19 +104,19 @@ function executeInContent(name, data = {
* The selector used to obtain the element.
* @param {String} pseudo
* pseudo id to query, or null.
* @param {String} name
* name of the property.
*/
function* getComputedStyleProperty(selector, pseudo, propName) {
return yield executeInContent("Test:GetComputedStylePropertyValue",
- {selector,
- pseudo,
- name: propName});
+ {selector,
+ pseudo,
+ name: propName});
}
/**
* Get an element's inline style property value.
* @param {TestActor} testActor
* @param {String} selector
* The selector used to obtain the element.
* @param {String} name
@@ -141,20 +141,20 @@ function getStyle(testActor, selector, p
* name of the property.
* @param {String} expected
* expected value of property
* @param {String} name
* the name used in test message
*/
function* waitForComputedStyleProperty(selector, pseudo, name, expected) {
return yield executeInContent("Test:WaitForComputedStylePropertyValue",
- {selector,
- pseudo,
- expected,
- name});
+ {selector,
+ pseudo,
+ expected,
+ name});
}
/**
* Given an inplace editable element, click to switch it to edit mode, wait for
* focus
*
* @return a promise that resolves to the inplace-editor element when ready
*/
--- a/devtools/client/inspector/shared/test/head.js
+++ b/devtools/client/inspector/shared/test/head.js
@@ -147,20 +147,22 @@ function executeInContent(name, data = {
* @param {String} selector
* The selector used to obtain the element.
* @param {String} pseudo
* pseudo id to query, or null.
* @param {String} name
* name of the property.
*/
function* getComputedStyleProperty(selector, pseudo, propName) {
- return yield executeInContent("Test:GetComputedStylePropertyValue",
- {selector,
- pseudo,
- name: propName});
+ let data = {
+ selector,
+ pseudo,
+ name: propName
+ };
+ return yield executeInContent("Test:GetComputedStylePropertyValue", data);
}
/**
* Send an async message to the frame script and wait until the requested
* computed style property has the expected value.
*
* @param {String} selector
* The selector used to obtain the element.
@@ -169,21 +171,23 @@ function* getComputedStyleProperty(selec
* @param {String} prop
* name of the property.
* @param {String} expected
* expected value of property
* @param {String} name
* the name used in test message
*/
function* waitForComputedStyleProperty(selector, pseudo, name, expected) {
- return yield executeInContent("Test:WaitForComputedStylePropertyValue",
- {selector,
- pseudo,
- expected,
- name});
+ let data = {
+ selector,
+ pseudo,
+ expected,
+ name
+ };
+ return yield executeInContent("Test:WaitForComputedStylePropertyValue", data);
}
/**
* Given an inplace editable element, click to switch it to edit mode, wait for
* focus
*
* @return a promise that resolves to the inplace-editor element when ready
*/
--- a/devtools/client/inspector/test/browser_inspector_breadcrumbs.js
+++ b/devtools/client/inspector/test/browser_inspector_breadcrumbs.js
@@ -3,31 +3,31 @@
http://creativecommons.org/publicdomain/zero/1.0/ */
"use strict";
// Test that the breadcrumbs widget content is correct.
const TEST_URI = URL_ROOT + "doc_inspector_breadcrumbs.html";
const NODES = [
{selector: "#i1111", ids: "i1 i11 i111 i1111", nodeName: "div",
- title: "div#i1111"},
+ title: "div#i1111"},
{selector: "#i22", ids: "i2 i22", nodeName: "div",
- title: "div#i22"},
+ title: "div#i22"},
{selector: "#i2111", ids: "i2 i21 i211 i2111", nodeName: "div",
- title: "div#i2111"},
+ title: "div#i2111"},
{selector: "#i21", ids: "i2 i21 i211 i2111", nodeName: "div",
- title: "div#i21"},
+ title: "div#i21"},
{selector: "#i22211", ids: "i2 i22 i222 i2221 i22211", nodeName: "div",
- title: "div#i22211"},
+ title: "div#i22211"},
{selector: "#i22", ids: "i2 i22 i222 i2221 i22211", nodeName: "div",
- title: "div#i22"},
+ title: "div#i22"},
{selector: "#i3", ids: "i3", nodeName: "article",
- title: "article#i3"},
+ title: "article#i3"},
{selector: "clipPath", ids: "vector clip", nodeName: "clipPath",
- title: "clipPath#clip"},
+ title: "clipPath#clip"},
];
add_task(function* () {
let { inspector } = yield openInspectorForURL(TEST_URI);
let breadcrumbs = inspector.panelDoc.getElementById("inspector-breadcrumbs");
let container = breadcrumbs.querySelector(".html-arrowscrollbox-inner");
for (let node of NODES) {
--- a/devtools/client/inspector/test/browser_inspector_breadcrumbs_namespaced.js
+++ b/devtools/client/inspector/test/browser_inspector_breadcrumbs_namespaced.js
@@ -19,19 +19,19 @@ const XHTML = `
</body>
</html>
`;
const TEST_URI = "data:application/xhtml+xml;charset=utf-8," + encodeURI(XHTML);
const NODES = [
{selector: "clipPath", nodes: ["svg:svg", "svg:clipPath"],
- nodeName: "svg:clipPath", title: "svg:clipPath#clip"},
+ nodeName: "svg:clipPath", title: "svg:clipPath#clip"},
{selector: "circle", nodes: ["svg:svg", "svg:circle"],
- nodeName: "svg:circle", title: "svg:circle"},
+ nodeName: "svg:circle", title: "svg:circle"},
];
add_task(function* () {
let { inspector } = yield openInspectorForURL(TEST_URI);
let container = inspector.panelDoc.getElementById("inspector-breadcrumbs");
for (let node of NODES) {
info("Testing node " + node.selector);
--- a/devtools/client/jsonview/components/search-box.js
+++ b/devtools/client/jsonview/components/search-box.js
@@ -39,17 +39,17 @@ define(function (require, exports, modul
doSearch: function (searchBox) {
this.props.actions.onSearch(searchBox.value);
},
render: function () {
return (
input({className: "searchBox",
- placeholder: Locale.$STR("jsonViewer.filterJSON"),
- onChange: this.onSearch})
+ placeholder: Locale.$STR("jsonViewer.filterJSON"),
+ onChange: this.onSearch})
);
},
});
// Exports from this module
exports.SearchBox = SearchBox;
});
--- a/devtools/client/performance/views/details-js-flamegraph.js
+++ b/devtools/client/performance/views/details-js-flamegraph.js
@@ -67,24 +67,24 @@ var JsFlameGraphView = Heritage.extend(D
invertTree: PerformanceController.getOption("invert-flame-graph"),
flattenRecursion: PerformanceController.getOption("flatten-tree-recursion"),
contentOnly: !PerformanceController.getOption("show-platform-data"),
showIdleBlocks: PerformanceController.getOption("show-idle-blocks")
&& L10N.getStr("table.idle")
});
this.graph.setData({ data,
- bounds: {
- startTime: 0,
- endTime: duration
- },
- visible: {
- startTime: interval.startTime || 0,
- endTime: interval.endTime || duration
- }
+ bounds: {
+ startTime: 0,
+ endTime: duration
+ },
+ visible: {
+ startTime: interval.startTime || 0,
+ endTime: interval.endTime || duration
+ }
});
this.graph.focus();
this.emit(EVENTS.UI_JS_FLAMEGRAPH_RENDERED);
},
/**
--- a/devtools/client/performance/views/details-memory-flamegraph.js
+++ b/devtools/client/performance/views/details-memory-flamegraph.js
@@ -64,17 +64,18 @@ var MemoryFlameGraphView = Heritage.exte
let thread = RecordingUtils.getProfileThreadFromAllocations(allocations);
let data = FlameGraphUtils.createFlameGraphDataFromThread(thread, {
invertStack: PerformanceController.getOption("invert-flame-graph"),
flattenRecursion: PerformanceController.getOption("flatten-tree-recursion"),
showIdleBlocks: PerformanceController.getOption("show-idle-blocks")
&& L10N.getStr("table.idle")
});
- this.graph.setData({ data,
+ this.graph.setData({
+ data,
bounds: {
startTime: 0,
endTime: duration
},
visible: {
startTime: interval.startTime || 0,
endTime: interval.endTime || duration
}
--- a/devtools/client/responsive.html/components/device-selector.js
+++ b/devtools/client/responsive.html/components/device-selector.js
@@ -70,22 +70,24 @@ module.exports = createClass({
if (selectedDevice) {
selectClass += " selected";
}
let state = devices.listState;
let listContent;
if (state == Types.deviceListState.LOADED) {
- listContent = [dom.option({
- value: "",
- title: "",
- disabled: true,
- hidden: true,
- }, getStr("responsive.noDeviceSelected")),
+ listContent = [
+ dom.option({
+ value: "",
+ title: "",
+ disabled: true,
+ hidden: true,
+ },
+ getStr("responsive.noDeviceSelected")),
options.map(device => {
return dom.option({
key: device.name,
value: device.name,
title: "",
}, device.name);
}),
dom.option({
--- a/devtools/client/shared/inplace-editor.js
+++ b/devtools/client/shared/inplace-editor.js
@@ -1325,19 +1325,18 @@ InplaceEditor.prototype = {
// Get the last query to be completed before the caret.
let match = /([^\s,.\/]+$)/.exec(query);
if (match) {
startCheckQuery = match[0];
} else {
startCheckQuery = "";
}
- list =
- ["!important",
- ...this._getCSSValuesForPropertyName(this.property.name)];
+ list = ["!important",
+ ...this._getCSSValuesForPropertyName(this.property.name)];
if (query == "") {
// Do not suggest '!important' without any manually typed character.
list.splice(0, 1);
}
} else if (this.contentType == CONTENT_TYPES.CSS_MIXED &&
/^\s*style\s*=/.test(query)) {
// Check if the style attribute is closed before the selection.
@@ -1351,19 +1350,18 @@ InplaceEditor.prototype = {
// Detecting if cursor is at property or value;
let match = query.match(/([:;"'=]?)\s*([^"';:=]+)?$/);
if (match && match.length >= 2) {
if (match[1] == ":") {
// We are in CSS value completion
let propertyName =
query.match(/[;"'=]\s*([^"';:= ]+)\s*:\s*[^"';:=]*$/)[1];
- list =
- ["!important;",
- ...this._getCSSValuesForPropertyName(propertyName)];
+ list = ["!important;",
+ ...this._getCSSValuesForPropertyName(propertyName)];
let matchLastQuery = /([^\s,.\/]+$)/.exec(match[2] || "");
if (matchLastQuery) {
startCheckQuery = matchLastQuery[0];
} else {
startCheckQuery = "";
}
if (!match[2]) {
// Don't suggest '!important' without any manually typed character
--- a/devtools/client/shared/node-attribute-parser.js
+++ b/devtools/client/shared/node-attribute-parser.js
@@ -65,19 +65,19 @@ const ATTRIBUTE_TYPES = [
{namespaceURI: HTML_NS, attributeName: "formaction", tagName: "button", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "formaction", tagName: "input", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "headers", tagName: "td", type: TYPE_IDREF_LIST},
{namespaceURI: HTML_NS, attributeName: "headers", tagName: "th", type: TYPE_IDREF_LIST},
{namespaceURI: HTML_NS, attributeName: "href", tagName: "a", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "href", tagName: "area", type: TYPE_URI},
{namespaceURI: "*", attributeName: "href", tagName: "link", type: TYPE_CSS_RESOURCE_URI,
/* eslint-enable */
- isValid: (namespaceURI, tagName, attributes) => {
- return getAttribute(attributes, "rel") === "stylesheet";
- }},
+ isValid: (namespaceURI, tagName, attributes) => {
+ return getAttribute(attributes, "rel") === "stylesheet";
+ }},
/* eslint-disable max-len */
{namespaceURI: "*", attributeName: "href", tagName: "link", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "href", tagName: "base", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "icon", tagName: "menuitem", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "list", tagName: "input", type: TYPE_IDREF},
{namespaceURI: HTML_NS, attributeName: "longdesc", tagName: "img", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "longdesc", tagName: "frame", type: TYPE_URI},
{namespaceURI: HTML_NS, attributeName: "longdesc", tagName: "iframe", type: TYPE_URI},
--- a/devtools/client/shared/test/browser_flame-graph-03a.js
+++ b/devtools/client/shared/test/browser_flame-graph-03a.js
@@ -127,12 +127,12 @@ function dragStop(graph, x, y = 1) {
var HORIZONTAL_AXIS = 1;
var VERTICAL_AXIS = 2;
function scroll(graph, wheel, axis, x, y = 1) {
x /= window.devicePixelRatio;
y /= window.devicePixelRatio;
graph._onMouseMove({ testX: x, testY: y });
graph._onMouseWheel({ testX: x, testY: y, axis, detail: wheel,
- HORIZONTAL_AXIS,
- VERTICAL_AXIS
+ HORIZONTAL_AXIS,
+ VERTICAL_AXIS
});
}
--- a/devtools/client/shared/test/browser_flame-graph-03b.js
+++ b/devtools/client/shared/test/browser_flame-graph-03b.js
@@ -81,12 +81,12 @@ function testGraph(graph) {
var HORIZONTAL_AXIS = 1;
var VERTICAL_AXIS = 2;
function scroll(graph, wheel, axis, x, y = 1) {
x /= window.devicePixelRatio;
y /= window.devicePixelRatio;
graph._onMouseMove({ testX: x, testY: y });
graph._onMouseWheel({ testX: x, testY: y, axis, detail: wheel,
- HORIZONTAL_AXIS,
- VERTICAL_AXIS
+ HORIZONTAL_AXIS,
+ VERTICAL_AXIS
});
}
--- a/devtools/client/shared/test/browser_mdn-docs-03.js
+++ b/devtools/client/shared/test/browser_mdn-docs-03.js
@@ -42,216 +42,216 @@ const TEST_DATA = [{
description: "Valid syntax, string value.",
example: "name: stringValue;",
expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, numeric value.",
- example: "name: 1;",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, numeric value.",
+ example: "name: 1;",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "1"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, url value.",
- example: "name: url(./name);",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, url value.",
+ example: "name: url(./name);",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "url(./name)"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, space before ':'.",
- example: "name : stringValue;",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, space before ':'.",
+ example: "name : stringValue;",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: " "},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, space before ';'.",
- example: "name: stringValue ;",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, space before ';'.",
+ example: "name: stringValue ;",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: " "},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, trailing space.",
- example: "name: stringValue; ",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, trailing space.",
+ example: "name: stringValue; ",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"},
{type: "text", text: " "}
]}, {
- description: "Valid syntax, leading space.",
- example: " name: stringValue;",
- expected: [{type: "text", text: " "},
+ description: "Valid syntax, leading space.",
+ example: " name: stringValue;",
+ expected: [{type: "text", text: " "},
{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, two spaces.",
- example: "name: stringValue;",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, two spaces.",
+ example: "name: stringValue;",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, no spaces.",
- example: "name:stringValue;",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, no spaces.",
+ example: "name:stringValue;",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, two-part value.",
- example: "name: stringValue 1;",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, two-part value.",
+ example: "name: stringValue 1;",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: " "},
{type: "property-value", text: "1"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, two declarations.",
- example: "name: stringValue;\n" +
- "name: 1;",
- expected: [{type: "property-name", text: "name"},
+ description: "Valid syntax, two declarations.",
+ example: "name: stringValue;\n" +
+ "name: 1;",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"},
{type: "text", text: "\n"},
{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "1"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, commented, numeric value.",
- example: "/* comment */\n" +
- "name: 1;",
- expected: [{type: "comment", text: "/* comment */"},
+ description: "Valid syntax, commented, numeric value.",
+ example: "/* comment */\n" +
+ "name: 1;",
+ expected: [{type: "comment", text: "/* comment */"},
{type: "text", text: "\n"},
{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "1"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, multiline commented, string value.",
- example: "/* multiline \n" +
+ description: "Valid syntax, multiline commented, string value.",
+ example: "/* multiline \n" +
"comment */\n" +
"name: stringValue;",
- expected: [{type: "comment", text: "/* multiline \ncomment */"},
+ expected: [{type: "comment", text: "/* multiline \ncomment */"},
{type: "text", text: "\n"},
{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, commented, two declarations.",
- example: "/* comment 1 */\n" +
+ description: "Valid syntax, commented, two declarations.",
+ example: "/* comment 1 */\n" +
"name: 1;\n" +
"/* comment 2 */\n" +
"name: stringValue;",
- expected: [{type: "comment", text: "/* comment 1 */"},
+ expected: [{type: "comment", text: "/* comment 1 */"},
{type: "text", text: "\n"},
{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "1"},
{type: "text", text: ";"},
{type: "text", text: "\n"},
{type: "comment", text: "/* comment 2 */"},
{type: "text", text: "\n"},
{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, multiline.",
- example: "name: \n" +
+ description: "Valid syntax, multiline.",
+ example: "name: \n" +
"stringValue;",
- expected: [{type: "property-name", text: "name"},
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " \n"},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Valid syntax, multiline, two declarations.",
- example: "name: \n" +
+ description: "Valid syntax, multiline, two declarations.",
+ example: "name: \n" +
"stringValue \n" +
"stringValue2;",
- expected: [{type: "property-name", text: "name"},
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " \n"},
{type: "property-value", text: "stringValue"},
{type: "text", text: " \n"},
{type: "property-value", text: "stringValue2"},
{type: "text", text: ";"}
]}, {
- description: "Invalid: not CSS at all.",
- example: "not CSS at all",
- expected: [{type: "property-name", text: "not"},
+ description: "Invalid: not CSS at all.",
+ example: "not CSS at all",
+ expected: [{type: "property-name", text: "not"},
{type: "text", text: " "},
{type: "property-name", text: "CSS"},
{type: "text", text: " "},
{type: "property-name", text: "at"},
{type: "text", text: " "},
{type: "property-name", text: "all"}
]}, {
- description: "Invalid: switched ':' and ';'.",
- example: "name; stringValue:",
- expected: [{type: "property-name", text: "name"},
+ description: "Invalid: switched ':' and ';'.",
+ example: "name; stringValue:",
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ";"},
{type: "text", text: " "},
{type: "property-name", text: "stringValue"},
{type: "text", text: ":"}
]}, {
- description: "Invalid: unterminated comment.",
- example: "/* unterminated comment\n" +
+ description: "Invalid: unterminated comment.",
+ example: "/* unterminated comment\n" +
"name: stringValue;",
- expected: [{type: "comment", text: "/* unterminated comment\nname: stringValue;"}
+ expected: [{type: "comment", text: "/* unterminated comment\nname: stringValue;"}
]}, {
- description: "Invalid: bad comment syntax.",
- example: "// invalid comment\n" +
+ description: "Invalid: bad comment syntax.",
+ example: "// invalid comment\n" +
"name: stringValue;",
- expected: [{type: "text", text: "/"},
+ expected: [{type: "text", text: "/"},
{type: "text", text: "/"},
{type: "text", text: " "},
{type: "property-name", text: "invalid"},
{type: "text", text: " "},
{type: "property-name", text: "comment"},
{type: "text", text: "\n"},
{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: ";"}
]}, {
- description: "Invalid: no trailing ';'.",
- example: "name: stringValue\n" +
+ description: "Invalid: no trailing ';'.",
+ example: "name: stringValue\n" +
"name: stringValue2",
- expected: [{type: "property-name", text: "name"},
+ expected: [{type: "property-name", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue"},
{type: "text", text: "\n"},
{type: "property-value", text: "name"},
{type: "text", text: ":"},
{type: "text", text: " "},
{type: "property-value", text: "stringValue2"},
--- a/devtools/client/shared/test/browser_outputparser.js
+++ b/devtools/client/shared/test/browser_outputparser.js
@@ -67,94 +67,94 @@ function makeColorTest(name, value, segm
}
function testParseCssProperty(doc, parser) {
let tests = [
makeColorTest("border", "1px solid red",
["1px solid ", {name: "red"}]),
makeColorTest("background-image",
- "linear-gradient(to right, #F60 10%, rgba(0,0,0,1))",
- ["linear-gradient(to right, ", {name: "#F60"},
- " 10%, ", {name: "rgba(0,0,0,1)"},
- ")"]),
+ "linear-gradient(to right, #F60 10%, rgba(0,0,0,1))",
+ ["linear-gradient(to right, ", {name: "#F60"},
+ " 10%, ", {name: "rgba(0,0,0,1)"},
+ ")"]),
// In "arial black", "black" is a font, not a color.
makeColorTest("font-family", "arial black", ["arial black"]),
makeColorTest("box-shadow", "0 0 1em red",
["0 0 1em ", {name: "red"}]),
makeColorTest("box-shadow",
- "0 0 1em red, 2px 2px 0 0 rgba(0,0,0,.5)",
- ["0 0 1em ", {name: "red"},
- ", 2px 2px 0 0 ",
- {name: "rgba(0,0,0,.5)"}]),
+ "0 0 1em red, 2px 2px 0 0 rgba(0,0,0,.5)",
+ ["0 0 1em ", {name: "red"},
+ ", 2px 2px 0 0 ",
+ {name: "rgba(0,0,0,.5)"}]),
makeColorTest("content", "\"red\"", ["\"red\""]),
// Invalid property names should not cause exceptions.
makeColorTest("hellothere", "'red'", ["'red'"]),
makeColorTest("filter",
- "blur(1px) drop-shadow(0 0 0 blue) url(red.svg#blue)",
- ["<span data-filters=\"blur(1px) drop-shadow(0 0 0 blue) ",
- "url(red.svg#blue)\"><span>",
- "blur(1px) drop-shadow(0 0 0 ",
- {name: "blue"},
- ") url(red.svg#blue)</span></span>"]),
+ "blur(1px) drop-shadow(0 0 0 blue) url(red.svg#blue)",
+ ["<span data-filters=\"blur(1px) drop-shadow(0 0 0 blue) ",
+ "url(red.svg#blue)\"><span>",
+ "blur(1px) drop-shadow(0 0 0 ",
+ {name: "blue"},
+ ") url(red.svg#blue)</span></span>"]),
makeColorTest("color", "currentColor", ["currentColor"]),
// Test a very long property.
makeColorTest("background-image",
- /* eslint-disable max-len */
- "linear-gradient(to left, transparent 0, transparent 5%,#F00 0, #F00 10%,#FF0 0, #FF0 15%,#0F0 0, #0F0 20%,#0FF 0, #0FF 25%,#00F 0, #00F 30%,#800 0, #800 35%,#880 0, #880 40%,#080 0, #080 45%,#088 0, #088 50%,#008 0, #008 55%,#FFF 0, #FFF 60%,#EEE 0, #EEE 65%,#CCC 0, #CCC 70%,#999 0, #999 75%,#666 0, #666 80%,#333 0, #333 85%,#111 0, #111 90%,#000 0, #000 95%,transparent 0, transparent 100%)",
- /* eslint-enable max-len */
- ["linear-gradient(to left, ", {name: "transparent"},
- " 0, ", {name: "transparent"},
- " 5%,", {name: "#F00"},
- " 0, ", {name: "#F00"},
- " 10%,", {name: "#FF0"},
- " 0, ", {name: "#FF0"},
- " 15%,", {name: "#0F0"},
- " 0, ", {name: "#0F0"},
- " 20%,", {name: "#0FF"},
- " 0, ", {name: "#0FF"},
- " 25%,", {name: "#00F"},
- " 0, ", {name: "#00F"},
- " 30%,", {name: "#800"},
- " 0, ", {name: "#800"},
- " 35%,", {name: "#880"},
- " 0, ", {name: "#880"},
- " 40%,", {name: "#080"},
- " 0, ", {name: "#080"},
- " 45%,", {name: "#088"},
- " 0, ", {name: "#088"},
- " 50%,", {name: "#008"},
- " 0, ", {name: "#008"},
- " 55%,", {name: "#FFF"},
- " 0, ", {name: "#FFF"},
- " 60%,", {name: "#EEE"},
- " 0, ", {name: "#EEE"},
- " 65%,", {name: "#CCC"},
- " 0, ", {name: "#CCC"},
- " 70%,", {name: "#999"},
- " 0, ", {name: "#999"},
- " 75%,", {name: "#666"},
- " 0, ", {name: "#666"},
- " 80%,", {name: "#333"},
- " 0, ", {name: "#333"},
- " 85%,", {name: "#111"},
- " 0, ", {name: "#111"},
- " 90%,", {name: "#000"},
- " 0, ", {name: "#000"},
- " 95%,", {name: "transparent"},
- " 0, ", {name: "transparent"},
- " 100%)"]),
+ /* eslint-disable max-len */
+ "linear-gradient(to left, transparent 0, transparent 5%,#F00 0, #F00 10%,#FF0 0, #FF0 15%,#0F0 0, #0F0 20%,#0FF 0, #0FF 25%,#00F 0, #00F 30%,#800 0, #800 35%,#880 0, #880 40%,#080 0, #080 45%,#088 0, #088 50%,#008 0, #008 55%,#FFF 0, #FFF 60%,#EEE 0, #EEE 65%,#CCC 0, #CCC 70%,#999 0, #999 75%,#666 0, #666 80%,#333 0, #333 85%,#111 0, #111 90%,#000 0, #000 95%,transparent 0, transparent 100%)",
+ /* eslint-enable max-len */
+ ["linear-gradient(to left, ", {name: "transparent"},
+ " 0, ", {name: "transparent"},
+ " 5%,", {name: "#F00"},
+ " 0, ", {name: "#F00"},
+ " 10%,", {name: "#FF0"},
+ " 0, ", {name: "#FF0"},
+ " 15%,", {name: "#0F0"},
+ " 0, ", {name: "#0F0"},
+ " 20%,", {name: "#0FF"},
+ " 0, ", {name: "#0FF"},
+ " 25%,", {name: "#00F"},
+ " 0, ", {name: "#00F"},
+ " 30%,", {name: "#800"},
+ " 0, ", {name: "#800"},
+ " 35%,", {name: "#880"},
+ " 0, ", {name: "#880"},
+ " 40%,", {name: "#080"},
+ " 0, ", {name: "#080"},
+ " 45%,", {name: "#088"},
+ " 0, ", {name: "#088"},
+ " 50%,", {name: "#008"},
+ " 0, ", {name: "#008"},
+ " 55%,", {name: "#FFF"},
+ " 0, ", {name: "#FFF"},
+ " 60%,", {name: "#EEE"},
+ " 0, ", {name: "#EEE"},
+ " 65%,", {name: "#CCC"},
+ " 0, ", {name: "#CCC"},
+ " 70%,", {name: "#999"},
+ " 0, ", {name: "#999"},
+ " 75%,", {name: "#666"},
+ " 0, ", {name: "#666"},
+ " 80%,", {name: "#333"},
+ " 0, ", {name: "#333"},
+ " 85%,", {name: "#111"},
+ " 0, ", {name: "#111"},
+ " 90%,", {name: "#000"},
+ " 0, ", {name: "#000"},
+ " 95%,", {name: "transparent"},
+ " 0, ", {name: "transparent"},
+ " 100%)"]),
];
let target = doc.querySelector("div");
ok(target, "captain, we have the div");
for (let test of tests) {
info(test.desc);
--- a/devtools/client/shared/test/browser_theme.js
+++ b/devtools/client/shared/test/browser_theme.js
@@ -81,22 +81,24 @@ function testGetColor() {
is(getColor("highlight-blue", "metal"), BLUE_LIGHT,
"if provided and not found, defaults to light theme.");
is(getColor("somecomponents"), null, "if a type cannot be found, should return null.");
setTheme(originalTheme);
}
function testColorExistence() {
- const vars = ["body-background", "sidebar-background", "contrast-background",
- "tab-toolbar-background", "toolbar-background", "selection-background",
- "selection-color", "selection-background-semitransparent", "splitter-color", "comment",
- "body-color", "body-color-alt", "content-color1", "content-color2", "content-color3",
- "highlight-green", "highlight-blue", "highlight-bluegrey", "highlight-purple",
- "highlight-lightorange", "highlight-orange", "highlight-red", "highlight-pink"
+ const vars = [
+ "body-background", "sidebar-background", "contrast-background",
+ "tab-toolbar-background", "toolbar-background", "selection-background",
+ "selection-color", "selection-background-semitransparent", "splitter-color",
+ "comment", "body-color", "body-color-alt", "content-color1", "content-color2",
+ "content-color3", "highlight-green", "highlight-blue", "highlight-bluegrey",
+ "highlight-purple", "highlight-lightorange", "highlight-orange", "highlight-red",
+ "highlight-pink"
];
for (let type of vars) {
ok(getColor(type, "light"), `${type} is a valid color in light theme`);
ok(getColor(type, "dark"), `${type} is a valid color in light theme`);
ok(getColor(type, "firebug"), `${type} is a valid color in light theme`);
}
}
--- a/devtools/client/shared/test/unit/test_parseDeclarations.js
+++ b/devtools/client/shared/test/unit/test_parseDeclarations.js
@@ -322,20 +322,21 @@ const TEST_DATA = [
expected: [{name: "color", value: "red", priority: "",
offsets: [3, 30], commentOffsets: [0, 33]}]
},
// HTML comments are ignored.
{
parseComments: true,
input: "<!-- color: red; --> color: blue;",
- expected: [{name: "color", value: "red", priority: "",
- offsets: [5, 16]},
- {name: "color", value: "blue", priority: "",
- offsets: [21, 33]}]
+ expected: [
+ {name: "color", value: "red", priority: "",
+ offsets: [5, 16]},
+ {name: "color", value: "blue", priority: "",
+ offsets: [21, 33]}]
},
// Don't error on an empty comment.
{
parseComments: true,
input: "/**/",
expected: []
},
--- a/devtools/client/shared/widgets/Spectrum.js
+++ b/devtools/client/shared/widgets/Spectrum.js
@@ -206,17 +206,17 @@ Spectrum.prototype = {
set rgb(color) {
this.hsv = Spectrum.rgbToHsv(color[0], color[1], color[2], color[3]);
},
get rgb() {
let rgb = Spectrum.hsvToRgb(this.hsv[0], this.hsv[1], this.hsv[2],
this.hsv[3]);
return [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2]),
- Math.round(rgb[3] * 100) / 100];
+ Math.round(rgb[3] * 100) / 100];
},
get rgbNoSatVal() {
let rgb = Spectrum.hsvToRgb(this.hsv[0], 1, 1);
return [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2]), rgb[3]];
},
get rgbCssString() {
--- a/devtools/client/sourceeditor/test/browser_editor_find_again.js
+++ b/devtools/client/sourceeditor/test/browser_editor_find_again.js
@@ -180,33 +180,33 @@ add_task(function* () {
{line: 2, ch: 9}],
["line",
{line: 3, ch: 10}],
["line",
{line: 4, ch: 11}],
["ne 3",
{line: 2, ch: 11}],
["line 1",
- {line: 0, ch: 9}],
+ {line: 0, ch: 9}],
// Testing find prev
["line",
- {line: 4, ch: 11},
- true],
+ {line: 4, ch: 11},
+ true],
["line",
- {line: 3, ch: 10},
- true],
+ {line: 3, ch: 10},
+ true],
["line",
- {line: 2, ch: 9},
- true],
+ {line: 2, ch: 9},
+ true],
["line",
- {line: 1, ch: 8},
- true],
+ {line: 1, ch: 8},
+ true],
["line",
- {line: 0, ch: 7},
- true]
+ {line: 0, ch: 7},
+ true]
];
for (let v of testVectors) {
yield testFindAgain(ed, ...v);
}
yield testSearchBoxTextIsSelected(ed);
--- a/devtools/client/storage/test/browser_storage_delete.js
+++ b/devtools/client/storage/test/browser_storage_delete.js
@@ -5,27 +5,27 @@
/* import-globals-from ../../framework/test/shared-head.js */
"use strict";
// Test deleting storage items
const TEST_CASES = [
[["localStorage", "http://test1.example.org"],
- "ls1", "name"],
+ "ls1", "name"],
[["sessionStorage", "http://test1.example.org"],
- "ss1", "name"],
+ "ss1", "name"],
[
["cookies", "test1.example.org"],
getCookieId("c1", "test1.example.org", "/browser"), "name"
],
[["indexedDB", "http://test1.example.org", "idb1 (default)", "obj1"],
- 1, "name"],
+ 1, "name"],
[["Cache", "http://test1.example.org", "plop"],
- MAIN_DOMAIN + "404_cached_file.js", "url"],
+ MAIN_DOMAIN + "404_cached_file.js", "url"],
];
add_task(function* () {
yield openTabAndSetupStorage(MAIN_DOMAIN + "storage-listings.html");
let contextMenu = gPanelWindow.document.getElementById("storage-table-popup");
let menuDeleteItem = contextMenu.querySelector("#storage-table-popup-delete");
--- a/devtools/client/storage/test/browser_storage_delete_all.js
+++ b/devtools/client/storage/test/browser_storage_delete_all.js
@@ -38,17 +38,17 @@ add_task(function* () {
yield checkState(beforeState);
info("do the delete");
const deleteHosts = [
[["localStorage", "https://sectest1.example.org"], "iframe-s-ls1", "name"],
[["sessionStorage", "https://sectest1.example.org"], "iframe-s-ss1", "name"],
[["indexedDB", "http://test1.example.org", "idb1 (default)", "obj1"], 1, "name"],
[["Cache", "http://test1.example.org", "plop"],
- MAIN_DOMAIN + "404_cached_file.js", "url"],
+ MAIN_DOMAIN + "404_cached_file.js", "url"],
];
for (let [store, rowName, cellToClick] of deleteHosts) {
let storeName = store.join(" > ");
yield selectTreeItem(store);
let eventWait = gUI.once("store-objects-cleared");
--- a/devtools/client/styleeditor/test/browser_styleeditor_bug_740541_iframes.js
+++ b/devtools/client/styleeditor/test/browser_styleeditor_bug_740541_iframes.js
@@ -52,21 +52,20 @@ add_task(function* () {
const SIMPLE = TEST_BASE_HTTP + "simple.css";
const SIMPLE_DOCUMENT = TEST_BASE_HTTP + "simple.html";
const TESTCASE_URI = makeDocument(
[makeStylesheet(".a")],
[makeDocument([],
- [FOUR,
- DOCUMENT_WITH_INLINE_STYLE]),
- makeDocument([makeStylesheet(".b"),
- SIMPLE],
- [makeDocument([makeStylesheet(".c")],
+ [FOUR,
+ DOCUMENT_WITH_INLINE_STYLE]),
+ makeDocument([makeStylesheet(".b"), SIMPLE],
+ [makeDocument([makeStylesheet(".c")],
[])]),
makeDocument([SIMPLE], []),
SIMPLE_DOCUMENT
]);
const EXPECTED_STYLE_SHEET_COUNT = 12;
let { ui } = yield openStyleEditorForURL(TESTCASE_URI);
--- a/devtools/shared/DevToolsUtils.js
+++ b/devtools/shared/DevToolsUtils.js
@@ -397,21 +397,21 @@ DevToolsUtils.defineLazyGetter(this, "Ne
*
* If an error occurs, the promise is rejected with that error.
*
* XXX: It may be better to use nsITraceableChannel to get to the sources
* without relying on caching when we can (not for eval, etc.):
* http://www.softwareishard.com/blog/firebug/nsitraceablechannel-intercept-http-traffic/
*/
function mainThreadFetch(urlIn, aOptions = { loadFromCache: true,
- policy: Ci.nsIContentPolicy.TYPE_OTHER,
- window: null,
- charset: null,
- principal: null,
- cacheKey: null }) {
+ policy: Ci.nsIContentPolicy.TYPE_OTHER,
+ window: null,
+ charset: null,
+ principal: null,
+ cacheKey: null }) {
// Create a channel.
let url = urlIn.split(" -> ").pop();
let channel;
try {
channel = newChannelForURL(url, aOptions);
} catch (ex) {
return promise.reject(ex);
}
--- a/devtools/shared/tests/unit/test_csslexer.js
+++ b/devtools/shared/tests/unit/test_csslexer.js
@@ -100,28 +100,28 @@ function test_lexer(cssText, tokenTypes)
equal(i, tokenTypes.length);
// Ensure that the reported offsets cover all the text.
equal(reconstructed, cssText);
}
var LEX_TESTS = [
["simple", ["ident:simple"]],
["simple: { hi; }",
- ["ident:simple", "symbol::",
- "whitespace", "symbol:{",
- "whitespace", "ident:hi",
- "symbol:;", "whitespace",
- "symbol:}"]],
+ ["ident:simple", "symbol::",
+ "whitespace", "symbol:{",
+ "whitespace", "ident:hi",
+ "symbol:;", "whitespace",
+ "symbol:}"]],
["/* whatever */", ["comment"]],
["'string'", ["string:string"]],
['"string"', ["string:string"]],
["rgb(1,2,3)", ["function:rgb", "number",
- "symbol:,", "number",
- "symbol:,", "number",
- "symbol:)"]],
+ "symbol:,", "number",
+ "symbol:,", "number",
+ "symbol:)"]],
["@media", ["at:media"]],
["#hibob", ["id:hibob"]],
["#123", ["hash:123"]],
["23px", ["dimension:px"]],
["23%", ["percentage"]],
["url(http://example.com)", ["url:http://example.com"]],
["url('http://example.com')", ["url:http://example.com"]],
["url( 'http://example.com' )",
--- a/toolkit/components/extensions/Schemas.jsm
+++ b/toolkit/components/extensions/Schemas.jsm
@@ -1824,19 +1824,19 @@ this.Schemas = {
throw new Error(`Unexpected type ${schema.type}`);
}
return type.parseSchema(schema, path, allowedProperties);
},
parseFunction(path, fun) {
let f = new FunctionEntry(fun, path, fun.name,
this.parseSchema(fun, path,
- ["name", "unsupported", "returns",
- "permissions",
- "allowAmbiguousOptionalArguments"]),
+ ["name", "unsupported", "returns",
+ "permissions",
+ "allowAmbiguousOptionalArguments"]),
fun.unsupported || false,
fun.allowAmbiguousOptionalArguments || false,
fun.returns || null,
fun.permissions || null);
return f;
},
loadType(namespaceName, type) {
@@ -1902,18 +1902,18 @@ this.Schemas = {
// We ignore these properties for now.
/* eslint-disable no-unused-vars */
let returns = event.returns;
let filters = event.filters;
/* eslint-enable no-unused-vars */
let type = this.parseSchema(event, [namespaceName],
- ["name", "unsupported", "permissions",
- "extraParameters", "returns", "filters"]);
+ ["name", "unsupported", "permissions",
+ "extraParameters", "returns", "filters"]);
let e = new Event(event, [namespaceName], event.name, type, extras,
event.unsupported || false,
event.permissions || null);
this.register(namespaceName, event.name, e);
},
init() {
--- a/toolkit/components/extensions/ext-downloads.js
+++ b/toolkit/components/extensions/ext-downloads.js
@@ -35,20 +35,20 @@ const DOWNLOAD_ITEM_FIELDS = ["id", "url
"byExtensionId", "byExtensionName"];
// Fields that we generate onChanged events for.
const DOWNLOAD_ITEM_CHANGE_FIELDS = ["endTime", "state", "paused", "canResume",
"error", "exists"];
// From https://fetch.spec.whatwg.org/#forbidden-header-name
const FORBIDDEN_HEADERS = ["ACCEPT-CHARSET", "ACCEPT-ENCODING",
- "ACCESS-CONTROL-REQUEST-HEADERS", "ACCESS-CONTROL-REQUEST-METHOD",
- "CONNECTION", "CONTENT-LENGTH", "COOKIE", "COOKIE2", "DATE", "DNT",
- "EXPECT", "HOST", "KEEP-ALIVE", "ORIGIN", "REFERER", "TE", "TRAILER",
- "TRANSFER-ENCODING", "UPGRADE", "VIA"];
+ "ACCESS-CONTROL-REQUEST-HEADERS", "ACCESS-CONTROL-REQUEST-METHOD",
+ "CONNECTION", "CONTENT-LENGTH", "COOKIE", "COOKIE2", "DATE", "DNT",
+ "EXPECT", "HOST", "KEEP-ALIVE", "ORIGIN", "REFERER", "TE", "TRAILER",
+ "TRANSFER-ENCODING", "UPGRADE", "VIA"];
const FORBIDDEN_PREFIXES = /^PROXY-|^SEC-/i;
class DownloadItem {
constructor(id, download, extension) {
this.id = id;
this.download = download;
this.extension = extension;
--- a/toolkit/components/narrate/test/NarrateTestUtils.jsm
+++ b/toolkit/components/narrate/test/NarrateTestUtils.jsm
@@ -136,13 +136,13 @@ this.NarrateTestUtils = {
ok(!$(".narrate-word-highlight"), "No more word highlights exist");
},
getWordHighlights(window) {
let $$ = window.document.querySelectorAll.bind(window.document);
let nodes = Array.from($$(".narrate-word-highlight"));
return nodes.map(node => {
return { word: node.dataset.word,
- left: Number(node.style.left.replace(/px$/, "")),
- top: Number(node.style.top.replace(/px$/, ""))};
+ left: Number(node.style.left.replace(/px$/, "")),
+ top: Number(node.style.top.replace(/px$/, ""))};
});
}
};
--- a/toolkit/components/reader/AboutReader.jsm
+++ b/toolkit/components/reader/AboutReader.jsm
@@ -84,19 +84,21 @@ var AboutReader = function(mm, win, arti
if (gIsFirefoxDesktop) {
// we're ready for any external setup, send a signal for that.
this._mm.sendAsyncMessage("Reader:OnSetup");
}
let colorSchemeValues = JSON.parse(Services.prefs.getCharPref("reader.color_scheme.values"));
let colorSchemeOptions = colorSchemeValues.map((value) => {
- return { name: gStrings.GetStringFromName("aboutReader.colorScheme." + value),
- value,
- itemClass: value + "-button" };
+ return {
+ name: gStrings.GetStringFromName("aboutReader.colorScheme." + value),
+ value,
+ itemClass: value + "-button"
+ };
});
let colorScheme = Services.prefs.getCharPref("reader.color_scheme");
this._setupSegmentedButton("color-scheme-buttons", colorSchemeOptions, colorScheme, this._setColorSchemePref.bind(this));
this._setColorSchemePref(colorScheme);
let fontTypeSample = gStrings.GetStringFromName("aboutReader.fontTypeSample");
let fontTypeOptions = [
--- a/toolkit/modules/addons/WebNavigationContent.js
+++ b/toolkit/modules/addons/WebNavigationContent.js
@@ -20,18 +20,18 @@ function loadListener(event) {
addEventListener("DOMContentLoaded", loadListener);
addMessageListener("Extension:DisableWebNavigation", () => {
removeEventListener("DOMContentLoaded", loadListener);
});
var FormSubmitListener = {
QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
- Ci.nsIFormSubmitObserver,
- Ci.nsISupportsWeakReference]),
+ Ci.nsIFormSubmitObserver,
+ Ci.nsISupportsWeakReference]),
init() {
this.formSubmitWindows = new WeakSet();
Services.obs.addObserver(FormSubmitListener, "earlyformsubmit", false);
},
uninit() {
Services.obs.removeObserver(FormSubmitListener, "earlyformsubmit", false);
this.formSubmitWindows = new WeakSet();
--- a/toolkit/modules/addons/WebRequest.jsm
+++ b/toolkit/modules/addons/WebRequest.jsm
@@ -530,18 +530,18 @@ HttpObserverManager = {
observeActivity(channel, activityType, activitySubtype /* , aTimestamp, aExtraSizeData, aExtraStringData */) {
let channelData = getData(channel);
let lastActivity = channelData.lastActivity || 0;
if (activitySubtype === nsIHttpActivityObserver.ACTIVITY_SUBTYPE_RESPONSE_COMPLETE &&
lastActivity && lastActivity !== this.GOOD_LAST_ACTIVITY) {
let loadContext = this.getLoadContext(channel);
if (!this.errorCheck(channel, loadContext, channelData)) {
this.runChannelListener(channel, loadContext, "onError",
- {error: this.activityErrorsMap.get(lastActivity) ||
- `NS_ERROR_NET_UNKNOWN_${lastActivity}`});
+ {error: this.activityErrorsMap.get(lastActivity) ||
+ `NS_ERROR_NET_UNKNOWN_${lastActivity}`});
}
} else if (lastActivity !== this.GOOD_LAST_ACTIVITY &&
lastActivity !== nsIHttpActivityObserver.ACTIVITY_SUBTYPE_TRANSACTION_CLOSE) {
channelData.lastActivity = activitySubtype;
}
},
shouldRunListener(policyType, uri, filter) {