diff --git a/.eslintignore b/.eslintignore index d73ee0e8283b..d3d29953c78c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -55,8 +55,6 @@ b2g/locales/en-US/b2g-l10n.js browser/app/** browser/branding/**/firefox-branding.js browser/base/content/test/general/file_csp_block_all_mixedcontent.html -# Gzipped test file. -browser/base/content/test/general/gZipOfflineChild.html browser/base/content/test/urlbar/file_blank_but_not_blank.html browser/base/content/newtab/** # Test files that are really json not js, and don't need to be linted. diff --git a/.eslintrc.js b/.eslintrc.js index d41c52c98797..cc1b438d9d9c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -21,12 +21,6 @@ module.exports = { "no-implied-eval": "error", "no-eval": "error", }, - // The html plugin is enabled via a command line option on eslint. To avoid - // bad interactions with the xml preprocessor in eslint-plugin-mozilla, we - // turn off processing of the html plugin for .xml files. - "settings": { - "html/xml-extensions": [ ".xhtml" ] - }, "env": { "es6": true }, diff --git a/browser/base/content/test/appUpdate/downloadPage.html b/browser/base/content/test/appUpdate/downloadPage.html index 2a753e09a56b..ddfd8e4eb301 100644 --- a/browser/base/content/test/appUpdate/downloadPage.html +++ b/browser/base/content/test/appUpdate/downloadPage.html @@ -10,4 +10,4 @@ Download - + diff --git a/browser/base/content/test/general/app_bug575561.html b/browser/base/content/test/general/app_bug575561.html index bab739624b4f..a60c7c87e6a5 100644 --- a/browser/base/content/test/general/app_bug575561.html +++ b/browser/base/content/test/general/app_bug575561.html @@ -15,4 +15,4 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=575561 data: URI - + diff --git a/browser/base/content/test/general/browser_bug678392-1.html b/browser/base/content/test/general/browser_bug678392-1.html index 7d4ca2bf0109..c3b235dd062e 100644 --- a/browser/base/content/test/general/browser_bug678392-1.html +++ b/browser/base/content/test/general/browser_bug678392-1.html @@ -9,4 +9,4 @@ bug 678392 test page 1 - + \ No newline at end of file diff --git a/browser/base/content/test/general/browser_bug678392-2.html b/browser/base/content/test/general/browser_bug678392-2.html index 92910311bbbd..9b18efcf74d6 100644 --- a/browser/base/content/test/general/browser_bug678392-2.html +++ b/browser/base/content/test/general/browser_bug678392-2.html @@ -9,4 +9,4 @@ bug 678392 test page 2 - + \ No newline at end of file diff --git a/browser/base/content/test/general/close_beforeunload_opens_second_tab.html b/browser/base/content/test/general/close_beforeunload_opens_second_tab.html index 239fb4c81e28..243307a0e3e7 100644 --- a/browser/base/content/test/general/close_beforeunload_opens_second_tab.html +++ b/browser/base/content/test/general/close_beforeunload_opens_second_tab.html @@ -1,3 +1,3 @@ Open second tab - + diff --git a/browser/base/content/test/general/subtst_contextmenu_input.html b/browser/base/content/test/general/subtst_contextmenu_input.html index e4ff455cebe3..c5be977eadbd 100644 --- a/browser/base/content/test/general/subtst_contextmenu_input.html +++ b/browser/base/content/test/general/subtst_contextmenu_input.html @@ -26,4 +26,4 @@ - + diff --git a/browser/components/customizableui/test/support/test_967000_charEncoding_page.html b/browser/components/customizableui/test/support/test_967000_charEncoding_page.html index addfd041cda6..c8d35115c279 100644 --- a/browser/components/customizableui/test/support/test_967000_charEncoding_page.html +++ b/browser/components/customizableui/test/support/test_967000_charEncoding_page.html @@ -8,4 +8,4 @@ This is a test page - + diff --git a/browser/components/originattributes/test/browser/file_favicon.html b/browser/components/originattributes/test/browser/file_favicon.html index f294b4775865..b571134e1b7b 100644 --- a/browser/components/originattributes/test/browser/file_favicon.html +++ b/browser/components/originattributes/test/browser/file_favicon.html @@ -8,4 +8,4 @@ Favicon!! - + \ No newline at end of file diff --git a/browser/components/originattributes/test/browser/file_favicon_cache.html b/browser/components/originattributes/test/browser/file_favicon_cache.html index 7008c926e375..2a7343b8ee4c 100644 --- a/browser/components/originattributes/test/browser/file_favicon_cache.html +++ b/browser/components/originattributes/test/browser/file_favicon_cache.html @@ -8,4 +8,4 @@ Third Party Favicon!! - + \ No newline at end of file diff --git a/browser/components/originattributes/test/browser/file_favicon_thirdParty.html b/browser/components/originattributes/test/browser/file_favicon_thirdParty.html index 63d94835e62b..4a2dd680a523 100644 --- a/browser/components/originattributes/test/browser/file_favicon_thirdParty.html +++ b/browser/components/originattributes/test/browser/file_favicon_thirdParty.html @@ -8,4 +8,4 @@ Third Party Favicon!! - + \ No newline at end of file diff --git a/browser/components/originattributes/test/mochitest/file_empty.html b/browser/components/originattributes/test/mochitest/file_empty.html index 15648ec5aa60..bc98b4d2ebe5 100644 --- a/browser/components/originattributes/test/mochitest/file_empty.html +++ b/browser/components/originattributes/test/mochitest/file_empty.html @@ -1,2 +1,2 @@

I'm just a support file

-

I get loaded to do permission testing.

+

I get loaded to do permission testing.

\ No newline at end of file diff --git a/browser/components/privatebrowsing/test/browser/empty_file.html b/browser/components/privatebrowsing/test/browser/empty_file.html index 0dc101b53359..42682b474622 100644 --- a/browser/components/privatebrowsing/test/browser/empty_file.html +++ b/browser/components/privatebrowsing/test/browser/empty_file.html @@ -1 +1 @@ - + \ No newline at end of file diff --git a/browser/components/privatebrowsing/test/browser/file_favicon.html b/browser/components/privatebrowsing/test/browser/file_favicon.html index f294b4775865..b571134e1b7b 100644 --- a/browser/components/privatebrowsing/test/browser/file_favicon.html +++ b/browser/components/privatebrowsing/test/browser/file_favicon.html @@ -8,4 +8,4 @@ Favicon!! - + \ No newline at end of file diff --git a/browser/components/safebrowsing/content/test/empty_file.html b/browser/components/safebrowsing/content/test/empty_file.html index 0dc101b53359..42682b474622 100644 --- a/browser/components/safebrowsing/content/test/empty_file.html +++ b/browser/components/safebrowsing/content/test/empty_file.html @@ -1 +1 @@ - + \ No newline at end of file diff --git a/browser/components/sessionstore/test/browser_662743_sample.html b/browser/components/sessionstore/test/browser_662743_sample.html index 0fd49417cc33..de48fa0c9fcd 100644 --- a/browser/components/sessionstore/test/browser_662743_sample.html +++ b/browser/components/sessionstore/test/browser_662743_sample.html @@ -12,4 +12,4 @@ - + \ No newline at end of file diff --git a/browser/components/sessionstore/test/browser_formdata_format_sample.html b/browser/components/sessionstore/test/browser_formdata_format_sample.html index ed71702a1bf8..f991e36575f9 100644 --- a/browser/components/sessionstore/test/browser_formdata_format_sample.html +++ b/browser/components/sessionstore/test/browser_formdata_format_sample.html @@ -4,4 +4,4 @@

Input fields

- + \ No newline at end of file diff --git a/browser/components/sessionstore/test/restore_redirect_js.html b/browser/components/sessionstore/test/restore_redirect_js.html index f0130847b63a..1f5f0e54cac2 100644 --- a/browser/components/sessionstore/test/restore_redirect_js.html +++ b/browser/components/sessionstore/test/restore_redirect_js.html @@ -7,4 +7,4 @@ var newLocation = window.location.toString().replace("restore_redirect_js.html", window.location.replace(newLocation); - + \ No newline at end of file diff --git a/browser/extensions/formautofill/content/manageProfiles.xhtml b/browser/extensions/formautofill/content/manageProfiles.xhtml index 5befb0a551cc..ffc7fed734f5 100644 --- a/browser/extensions/formautofill/content/manageProfiles.xhtml +++ b/browser/extensions/formautofill/content/manageProfiles.xhtml @@ -21,4 +21,4 @@ - + \ No newline at end of file diff --git a/browser/extensions/webcompat-reporter/test/browser/test.html b/browser/extensions/webcompat-reporter/test/browser/test.html index dae5be3842b5..53a2677f108d 100644 --- a/browser/extensions/webcompat-reporter/test/browser/test.html +++ b/browser/extensions/webcompat-reporter/test/browser/test.html @@ -2,4 +2,4 @@ + \ No newline at end of file diff --git a/browser/extensions/webcompat-reporter/test/browser/webcompat.html b/browser/extensions/webcompat-reporter/test/browser/webcompat.html index fb1daa969f3e..619f68a8b108 100644 --- a/browser/extensions/webcompat-reporter/test/browser/webcompat.html +++ b/browser/extensions/webcompat-reporter/test/browser/webcompat.html @@ -45,4 +45,4 @@ window.addEventListener("message", function(event) { getBlobAsDataURL(event.data).then(setPreviewBG).then(sendReceivedEvent); }); - + \ No newline at end of file diff --git a/devtools/client/animationinspector/test/doc_keyframes.html b/devtools/client/animationinspector/test/doc_keyframes.html index 71babf36470f..6057ce0576ef 100644 --- a/devtools/client/animationinspector/test/doc_keyframes.html +++ b/devtools/client/animationinspector/test/doc_keyframes.html @@ -54,4 +54,4 @@
- + diff --git a/devtools/client/animationinspector/test/doc_pseudo_elements.html b/devtools/client/animationinspector/test/doc_pseudo_elements.html index e56ac008d1ae..587608b19d9d 100644 --- a/devtools/client/animationinspector/test/doc_pseudo_elements.html +++ b/devtools/client/animationinspector/test/doc_pseudo_elements.html @@ -58,4 +58,4 @@ - + \ No newline at end of file diff --git a/devtools/client/inspector/markup/test/doc_markup_anonymous.html b/devtools/client/inspector/markup/test/doc_markup_anonymous.html index d6adba07b35a..0ede3ca5ffa7 100644 --- a/devtools/client/inspector/markup/test/doc_markup_anonymous.html +++ b/devtools/client/inspector/markup/test/doc_markup_anonymous.html @@ -31,4 +31,4 @@ } - + \ No newline at end of file diff --git a/devtools/client/inspector/markup/test/doc_markup_flashing.html b/devtools/client/inspector/markup/test/doc_markup_flashing.html index 82df5b05d54b..3bb8cf1d2c3b 100644 --- a/devtools/client/inspector/markup/test/doc_markup_flashing.html +++ b/devtools/client/inspector/markup/test/doc_markup_flashing.html @@ -12,4 +12,4 @@ - + \ No newline at end of file diff --git a/devtools/client/inspector/markup/test/doc_markup_search.html b/devtools/client/inspector/markup/test/doc_markup_search.html index e4c6fa02cd1e..08c047bcce2a 100644 --- a/devtools/client/inspector/markup/test/doc_markup_search.html +++ b/devtools/client/inspector/markup/test/doc_markup_search.html @@ -8,4 +8,4 @@ - + \ No newline at end of file diff --git a/devtools/client/inspector/markup/test/doc_markup_whitespace.html b/devtools/client/inspector/markup/test/doc_markup_whitespace.html index b0b999f1b23c..9071c802d0a8 100644 --- a/devtools/client/inspector/markup/test/doc_markup_whitespace.html +++ b/devtools/client/inspector/markup/test/doc_markup_whitespace.html @@ -22,4 +22,4 @@ - + diff --git a/devtools/client/inspector/rules/test/doc_invalid_sourcemap.html b/devtools/client/inspector/rules/test/doc_invalid_sourcemap.html index cd3a74817feb..2e6422becd82 100644 --- a/devtools/client/inspector/rules/test/doc_invalid_sourcemap.html +++ b/devtools/client/inspector/rules/test/doc_invalid_sourcemap.html @@ -8,4 +8,4 @@
invalid source map
- + diff --git a/devtools/client/inspector/test/doc_inspector_add_node.html b/devtools/client/inspector/test/doc_inspector_add_node.html index e1205a79ba68..d024b2a998bd 100644 --- a/devtools/client/inspector/test/doc_inspector_add_node.html +++ b/devtools/client/inspector/test/doc_inspector_add_node.html @@ -19,4 +19,4 @@ - + diff --git a/devtools/client/inspector/test/doc_inspector_csp.html b/devtools/client/inspector/test/doc_inspector_csp.html index 9ddfe82096bd..49af7e53b654 100644 --- a/devtools/client/inspector/test/doc_inspector_csp.html +++ b/devtools/client/inspector/test/doc_inspector_csp.html @@ -7,4 +7,4 @@ This HTTP response has CSP headers. - + diff --git a/devtools/client/inspector/test/doc_inspector_embed.html b/devtools/client/inspector/test/doc_inspector_embed.html index af84dd31c2a2..1d286ade002c 100644 --- a/devtools/client/inspector/test/doc_inspector_embed.html +++ b/devtools/client/inspector/test/doc_inspector_embed.html @@ -3,4 +3,4 @@ - + diff --git a/devtools/client/inspector/test/doc_inspector_highlighter-geometry_02.html b/devtools/client/inspector/test/doc_inspector_highlighter-geometry_02.html index 59c3b88571b3..4392c90427ba 100644 --- a/devtools/client/inspector/test/doc_inspector_highlighter-geometry_02.html +++ b/devtools/client/inspector/test/doc_inspector_highlighter-geometry_02.html @@ -117,4 +117,4 @@ - + \ No newline at end of file diff --git a/devtools/client/inspector/test/doc_inspector_highlighter_dom.html b/devtools/client/inspector/test/doc_inspector_highlighter_dom.html index dc04828e4114..fab0c8803ab6 100644 --- a/devtools/client/inspector/test/doc_inspector_highlighter_dom.html +++ b/devtools/client/inspector/test/doc_inspector_highlighter_dom.html @@ -17,4 +17,4 @@ - + diff --git a/devtools/client/inspector/test/doc_inspector_search-svg.html b/devtools/client/inspector/test/doc_inspector_search-svg.html index a78a20ff7a12..f762b2288f5e 100644 --- a/devtools/client/inspector/test/doc_inspector_search-svg.html +++ b/devtools/client/inspector/test/doc_inspector_search-svg.html @@ -13,4 +13,4 @@ - + diff --git a/devtools/client/inspector/test/doc_inspector_select-last-selected-01.html b/devtools/client/inspector/test/doc_inspector_select-last-selected-01.html index a78e281ca396..fbe1251cb320 100644 --- a/devtools/client/inspector/test/doc_inspector_select-last-selected-01.html +++ b/devtools/client/inspector/test/doc_inspector_select-last-selected-01.html @@ -18,4 +18,4 @@ - + \ No newline at end of file diff --git a/devtools/client/inspector/test/doc_inspector_select-last-selected-02.html b/devtools/client/inspector/test/doc_inspector_select-last-selected-02.html index 4c7c4e7d1ecd..2fbef312c52b 100644 --- a/devtools/client/inspector/test/doc_inspector_select-last-selected-02.html +++ b/devtools/client/inspector/test/doc_inspector_select-last-selected-02.html @@ -7,4 +7,4 @@
- + \ No newline at end of file diff --git a/devtools/client/responsive.html/test/browser/geolocation.html b/devtools/client/responsive.html/test/browser/geolocation.html index 12b1100c4e95..03d105a1917b 100644 --- a/devtools/client/responsive.html/test/browser/geolocation.html +++ b/devtools/client/responsive.html/test/browser/geolocation.html @@ -10,4 +10,4 @@ navigator.geolocation.getCurrentPosition(function (pos) {}); - + \ No newline at end of file diff --git a/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.html b/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.html index 11c789c5084a..070792b9af6f 100644 --- a/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.html +++ b/devtools/client/shared/test/browser_layoutHelpers-getBoxQuads.html @@ -62,4 +62,4 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus porttitor luctus sem id scelerisque. Cras quis velit sed risus euismod lacinia. Donec viverra enim eu ligula efficitur, quis vulputate metus cursus. Duis sed interdum risus. Ut blandit velit vitae faucibus efficitur. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed vitae dolor metus. Aliquam sed velit sit amet libero vestibulum aliquam vel a lorem. Integer eget ex eget justo auctor ullamcorper.
-Praesent tristique maximus lacus, nec ultricies neque ultrices non. Phasellus vel lobortis justo. +Praesent tristique maximus lacus, nec ultricies neque ultrices non. Phasellus vel lobortis justo. \ No newline at end of file diff --git a/devtools/client/shared/test/html-mdn-css-basic-testing.html b/devtools/client/shared/test/html-mdn-css-basic-testing.html index 43df8d80fe9b..182fa6d9b913 100644 --- a/devtools/client/shared/test/html-mdn-css-basic-testing.html +++ b/devtools/client/shared/test/html-mdn-css-basic-testing.html @@ -18,4 +18,4 @@ this: is-the-part-we-want; - + \ No newline at end of file diff --git a/devtools/client/shared/test/html-mdn-css-no-summary-or-syntax.html b/devtools/client/shared/test/html-mdn-css-no-summary-or-syntax.html index e2a416b9db40..8e1a7c3f6520 100644 --- a/devtools/client/shared/test/html-mdn-css-no-summary-or-syntax.html +++ b/devtools/client/shared/test/html-mdn-css-no-summary-or-syntax.html @@ -9,4 +9,4 @@

This is not the summary or the syntax.

- + \ No newline at end of file diff --git a/devtools/client/shared/test/html-mdn-css-no-summary.html b/devtools/client/shared/test/html-mdn-css-no-summary.html index e64922842415..3af52b4f6d17 100644 --- a/devtools/client/shared/test/html-mdn-css-no-summary.html +++ b/devtools/client/shared/test/html-mdn-css-no-summary.html @@ -18,4 +18,4 @@ this: is-the-part-we-want; - + \ No newline at end of file diff --git a/devtools/client/shared/test/html-mdn-css-syntax-old-style.html b/devtools/client/shared/test/html-mdn-css-syntax-old-style.html index 2f4fbe48cedb..281267cc4062 100644 --- a/devtools/client/shared/test/html-mdn-css-syntax-old-style.html +++ b/devtools/client/shared/test/html-mdn-css-syntax-old-style.html @@ -20,4 +20,4 @@ this: is-the-part-we-want; - + \ No newline at end of file diff --git a/devtools/client/styleeditor/test/media-rules-sourcemaps.html b/devtools/client/styleeditor/test/media-rules-sourcemaps.html index ba18c35503ea..4876ef795952 100644 --- a/devtools/client/styleeditor/test/media-rules-sourcemaps.html +++ b/devtools/client/styleeditor/test/media-rules-sourcemaps.html @@ -9,4 +9,4 @@ Testing style editor media sidebar with source maps - + \ No newline at end of file diff --git a/devtools/client/styleeditor/test/media-rules.html b/devtools/client/styleeditor/test/media-rules.html index a439fefaa54a..edc45ccae08f 100644 --- a/devtools/client/styleeditor/test/media-rules.html +++ b/devtools/client/styleeditor/test/media-rules.html @@ -10,4 +10,4 @@ Testing style editor media sidebar - + \ No newline at end of file diff --git a/devtools/client/styleeditor/test/nostyle.html b/devtools/client/styleeditor/test/nostyle.html index 951945a72bd4..f6a6769e69bf 100644 --- a/devtools/client/styleeditor/test/nostyle.html +++ b/devtools/client/styleeditor/test/nostyle.html @@ -2,4 +2,4 @@
Page with no stylesheets
- + \ No newline at end of file diff --git a/devtools/server/tests/mochitest/test_webconsole-node-grip.html b/devtools/server/tests/mochitest/test_webconsole-node-grip.html index 3e9481ae2103..2d21a33aafbb 100644 --- a/devtools/server/tests/mochitest/test_webconsole-node-grip.html +++ b/devtools/server/tests/mochitest/test_webconsole-node-grip.html @@ -65,4 +65,4 @@ async function testInTreeTextNode(consoleClient) {
- + \ No newline at end of file diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 55dffa631a46..bf94747fc2f6 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -19,9 +19,9 @@ } }, "ajv": { - "version": "4.11.8", + "version": "4.11.6", "from": "ajv@>=4.7.0 <5.0.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz" + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.6.tgz" }, "ajv-keywords": { "version": "1.5.1", @@ -80,7 +80,7 @@ }, "brace-expansion": { "version": "1.1.7", - "from": "brace-expansion@>=1.1.7 <2.0.0", + "from": "brace-expansion@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz" }, "buffer-shims": { @@ -149,9 +149,9 @@ "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz" }, "debug": { - "version": "2.6.6", + "version": "2.6.3", "from": "debug@>=2.1.1 <3.0.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.6.tgz" + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz" }, "deep-is": { "version": "0.1.3", @@ -191,14 +191,14 @@ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz" }, "domhandler": { - "version": "2.4.1", + "version": "2.3.0", "from": "domhandler@>=2.3.0 <3.0.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz" + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz" }, "domutils": { - "version": "1.6.2", + "version": "1.5.1", "from": "domutils@>=1.5.1 <2.0.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz" + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" }, "entities": { "version": "1.1.1", @@ -261,9 +261,9 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz" }, "eslint-plugin-html": { - "version": "2.0.3", - "from": "eslint-plugin-html@2.0.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-2.0.3.tgz" + "version": "1.5.2", + "from": "eslint-plugin-html@1.5.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-1.5.2.tgz" }, "eslint-plugin-react": { "version": "6.10.3", @@ -278,9 +278,9 @@ } }, "espree": { - "version": "3.4.3", + "version": "3.4.1", "from": "espree@>=3.4.0 <4.0.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz" + "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.1.tgz" }, "esprima": { "version": "3.1.3", @@ -405,9 +405,9 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz" }, "ignore": { - "version": "3.3.0", + "version": "3.2.7", "from": "ignore@>=3.2.0 <4.0.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.0.tgz" + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.2.7.tgz" }, "imurmurhash": { "version": "0.1.4", @@ -435,9 +435,9 @@ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz" }, "interpret": { - "version": "1.0.3", + "version": "1.0.2", "from": "interpret@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz" }, "is-callable": { "version": "1.1.3", @@ -525,9 +525,9 @@ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz" }, "jsx-ast-utils": { - "version": "1.4.1", + "version": "1.4.0", "from": "jsx-ast-utils@>=1.3.4 <2.0.0", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz" + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.0.tgz" }, "levn": { "version": "0.3.0", @@ -540,9 +540,9 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz" }, "minimatch": { - "version": "3.0.4", + "version": "3.0.3", "from": "minimatch@>=3.0.2 <4.0.0", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz" }, "minimist": { "version": "0.0.8", @@ -555,9 +555,9 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" }, "ms": { - "version": "0.7.3", - "from": "ms@0.7.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz" + "version": "0.7.2", + "from": "ms@0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz" }, "mute-stream": { "version": "0.0.5", @@ -680,9 +680,9 @@ "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz" }, "resolve": { - "version": "1.3.3", + "version": "1.3.2", "from": "resolve@>=1.1.6 <2.0.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz" + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz" }, "resolve-from": { "version": "1.0.1", diff --git a/package.json b/package.json index 75be7989ab75..a0f899a6a9b9 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "license": "MPL-2.0", "dependencies": { "eslint": "3.19.0", - "eslint-plugin-html": "2.0.3", + "eslint-plugin-html": "1.5.2", "eslint-plugin-react": "6.10.3", "escope": "^3.6.0", "espree": "^3.4.0", diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html index 6c7a5473cbde..d033f5b00be0 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html +++ b/security/manager/ssl/tests/mochitest/mixedcontent/iframeMetaRedirect.html @@ -5,4 +5,4 @@ Redirecting by meta tag... - + \ No newline at end of file diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html index 6c7b45ac73d8..523b97f59441 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html +++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_bug521461.html @@ -21,7 +21,7 @@ window.location = "https://example.com/tests/security/manager/ssl/tests/mochitest/mixedcontent/nocontent.sjs"; window.setTimeout(function() { isSecurityState("insecure", "location.href doesn't effect the security state"); - is(document.body.innerHTML, "This is an unsecure page!\n", "Document has not changed content"); + is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content"); finish(); }, 1000); } @@ -29,11 +29,11 @@ function afterNavigationTest() { isSecurityState("insecure", "still not secure after navigation"); - is(document.body.innerHTML, "This is an unsecure page!\n", "Document has not changed content"); + is(document.body.innerHTML, "This is an unsecure page!", "Document has not changed content"); finish(); } -This is an unsecure page! +This is an unsecure page! \ No newline at end of file diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html index 8bfd2c63b6d2..5e408b2aae78 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html +++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlDelayedUnsecurePicture.html @@ -31,7 +31,7 @@ function afterNavigationTest() { - is(document.getElementById("buddy").innerHTML, "\n", "innerHTML back to previous"); + is(document.getElementById("buddy").innerHTML, "", "innerHTML back to previous"); isSecurityState("secure"); finish(); } @@ -39,4 +39,4 @@ - + \ No newline at end of file diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html index ff8e667980b7..ff3592542968 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html +++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_innerHtmlUnsecurePicture.html @@ -29,7 +29,7 @@ function afterNavigationTest() { - is(document.getElementById("buddy").innerHTML, "\n", "innerHTML back to previous"); + is(document.getElementById("buddy").innerHTML, "", "innerHTML back to previous"); isSecurityState("secure"); finish(); } @@ -37,4 +37,4 @@ - + \ No newline at end of file diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html index db0b16a90561..2885264371d9 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html +++ b/security/manager/ssl/tests/mochitest/mixedcontent/test_unsecureIframeMetaRedirect.html @@ -35,4 +35,4 @@ - + \ No newline at end of file diff --git a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html b/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html index 48100a939e46..2acf635e85d3 100644 --- a/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html +++ b/security/manager/ssl/tests/unit/test_signed_apps/gentestfiles/unsigned_app_1/index.html @@ -2,5 +2,5 @@ Simple App

This is a Simple App. - - + + diff --git a/toolkit/components/extensions/test/mochitest/file_remote_frame.html b/toolkit/components/extensions/test/mochitest/file_remote_frame.html index f1b9240092ad..8e4520b9f569 100644 --- a/toolkit/components/extensions/test/mochitest/file_remote_frame.html +++ b/toolkit/components/extensions/test/mochitest/file_remote_frame.html @@ -17,4 +17,4 @@ window.parent.postMessage(response, "*"); - + \ No newline at end of file diff --git a/toolkit/components/places/tests/browser/461710_link_page-2.html b/toolkit/components/places/tests/browser/461710_link_page-2.html index 9ecdb3064b4d..1fc3e0959d74 100644 --- a/toolkit/components/places/tests/browser/461710_link_page-2.html +++ b/toolkit/components/places/tests/browser/461710_link_page-2.html @@ -10,4 +10,4 @@

Link to the second visited page

- + \ No newline at end of file diff --git a/toolkit/components/places/tests/browser/461710_link_page-3.html b/toolkit/components/places/tests/browser/461710_link_page-3.html index 8e3a0e57324f..5966618032bb 100644 --- a/toolkit/components/places/tests/browser/461710_link_page-3.html +++ b/toolkit/components/places/tests/browser/461710_link_page-3.html @@ -10,4 +10,4 @@

Link to the third visited page

- + \ No newline at end of file diff --git a/toolkit/components/places/tests/browser/461710_link_page.html b/toolkit/components/places/tests/browser/461710_link_page.html index 4a3851754691..6bea506284ac 100644 --- a/toolkit/components/places/tests/browser/461710_link_page.html +++ b/toolkit/components/places/tests/browser/461710_link_page.html @@ -10,4 +10,4 @@

Link to the visited page

- + \ No newline at end of file diff --git a/toolkit/components/places/tests/browser/461710_visited_page.html b/toolkit/components/places/tests/browser/461710_visited_page.html index 92e5c378d013..90e65116b6ba 100644 --- a/toolkit/components/places/tests/browser/461710_visited_page.html +++ b/toolkit/components/places/tests/browser/461710_visited_page.html @@ -6,4 +6,4 @@

This page is marked as visited

- + \ No newline at end of file diff --git a/toolkit/components/printing/tests/simplifyArticleSample.html b/toolkit/components/printing/tests/simplifyArticleSample.html index 70b172cf63ba..14dc08f4328a 100644 --- a/toolkit/components/printing/tests/simplifyArticleSample.html +++ b/toolkit/components/printing/tests/simplifyArticleSample.html @@ -13,4 +13,4 @@

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetu

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetu

- + \ No newline at end of file diff --git a/toolkit/components/viewsource/test/browser/file_bug464222.html b/toolkit/components/viewsource/test/browser/file_bug464222.html index f3b00949c719..4f2a43f0d48c 100644 --- a/toolkit/components/viewsource/test/browser/file_bug464222.html +++ b/toolkit/components/viewsource/test/browser/file_bug464222.html @@ -1 +1 @@ -I'm a link +I'm a link \ No newline at end of file diff --git a/toolkit/components/windowwatcher/test/file_storage_copied.html b/toolkit/components/windowwatcher/test/file_storage_copied.html index e32709315a9f..250c7891a891 100644 --- a/toolkit/components/windowwatcher/test/file_storage_copied.html +++ b/toolkit/components/windowwatcher/test/file_storage_copied.html @@ -10,4 +10,4 @@ by way of postMessage. - + \ No newline at end of file diff --git a/toolkit/components/windowwatcher/test/file_test_dialog.html b/toolkit/components/windowwatcher/test/file_test_dialog.html index 063133ef7a7a..b323ba526798 100644 --- a/toolkit/components/windowwatcher/test/file_test_dialog.html +++ b/toolkit/components/windowwatcher/test/file_test_dialog.html @@ -11,4 +11,4 @@ passed. - + \ No newline at end of file diff --git a/toolkit/components/windowwatcher/test/test_blank_named_window.html b/toolkit/components/windowwatcher/test/test_blank_named_window.html index 727cb991c0dc..55c696742e2d 100644 --- a/toolkit/components/windowwatcher/test/test_blank_named_window.html +++ b/toolkit/components/windowwatcher/test/test_blank_named_window.html @@ -42,4 +42,4 @@ name result in new windows being opened. }); - + \ No newline at end of file diff --git a/toolkit/components/windowwatcher/test/test_dialog_arguments.html b/toolkit/components/windowwatcher/test/test_dialog_arguments.html index a88c1b65ff16..ade46a78a8ae 100644 --- a/toolkit/components/windowwatcher/test/test_dialog_arguments.html +++ b/toolkit/components/windowwatcher/test/test_dialog_arguments.html @@ -35,4 +35,4 @@ Test that arguments can be passed to dialogs.
- + \ No newline at end of file diff --git a/toolkit/components/windowwatcher/test/test_modal_windows.html b/toolkit/components/windowwatcher/test/test_modal_windows.html index f0323d9feb57..dbc7dd2c99e0 100644 --- a/toolkit/components/windowwatcher/test/test_modal_windows.html +++ b/toolkit/components/windowwatcher/test/test_modal_windows.html @@ -53,4 +53,4 @@ that is opened reports itself as being modal.
- + \ No newline at end of file diff --git a/toolkit/components/windowwatcher/test/test_named_window.html b/toolkit/components/windowwatcher/test/test_named_window.html index af3103148ba4..2c39a7fd35b9 100644 --- a/toolkit/components/windowwatcher/test/test_named_window.html +++ b/toolkit/components/windowwatcher/test/test_named_window.html @@ -88,4 +88,4 @@ window. }); - + \ No newline at end of file diff --git a/toolkit/components/windowwatcher/test/test_storage_copied.html b/toolkit/components/windowwatcher/test/test_storage_copied.html index e2c153a8e758..b6b510f982ea 100644 --- a/toolkit/components/windowwatcher/test/test_storage_copied.html +++ b/toolkit/components/windowwatcher/test/test_storage_copied.html @@ -41,4 +41,4 @@ same domain as the opener. }); - + \ No newline at end of file diff --git a/toolkit/content/tests/browser/file_nonAutoplayAudio.html b/toolkit/content/tests/browser/file_nonAutoplayAudio.html index 4d2641021a13..7c13016ddcac 100644 --- a/toolkit/content/tests/browser/file_nonAutoplayAudio.html +++ b/toolkit/content/tests/browser/file_nonAutoplayAudio.html @@ -4,4 +4,4 @@ - + \ No newline at end of file diff --git a/toolkit/content/tests/browser/file_webAudio.html b/toolkit/content/tests/browser/file_webAudio.html index fdb1ecda9292..eb254432ce56 100644 --- a/toolkit/content/tests/browser/file_webAudio.html +++ b/toolkit/content/tests/browser/file_webAudio.html @@ -21,4 +21,4 @@ - + \ No newline at end of file diff --git a/tools/lint/eslint/manifest.tt b/tools/lint/eslint/manifest.tt index 44d38dd97e66..83379f227ba7 100644 --- a/tools/lint/eslint/manifest.tt +++ b/tools/lint/eslint/manifest.tt @@ -1,8 +1,8 @@ [ { - "size": 3020742, + "size": 3009784, "visibility": "public", - "digest": "ff65beda308192c9831a9c290182a5a314da3f4783f0e473ad4aa23f073773fee0b4b51ff39dbd6c3d4d88cd3aac5c0c6ee5ad91d0cf8c6facbf12a6505b8746", + "digest": "4819d3b7faf0f6bbbbf213246e7a5158f27fcaae9bd352f18d3476775931b1daca1bc4e20c589b3e8559d01e5022a4fd3708a96f2e480e354a4f9b247eab1ba6", "algorithm": "sha512", "filename": "eslint.tar.gz" }