mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 21:00:42 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
79 lines
2.2 KiB
JavaScript
79 lines
2.2 KiB
JavaScript
// -*- 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/. */
|
|
"use strict";
|
|
|
|
// This file and Readability-readerable.js are merged together into
|
|
// Readerable.jsm.
|
|
|
|
/* exported Readerable */
|
|
/* import-globals-from Readability-readerable.js */
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
|
|
function isNodeVisible(node) {
|
|
return node.clientHeight > 0 && node.clientWidth > 0;
|
|
}
|
|
|
|
var Readerable = {
|
|
get isEnabledForParseOnLoad() {
|
|
return this.isEnabled || this.isForceEnabled;
|
|
},
|
|
|
|
/**
|
|
* Decides whether or not a document is reader-able without parsing the whole thing.
|
|
*
|
|
* @param doc A document to parse.
|
|
* @return boolean Whether or not we should show the reader mode button.
|
|
*/
|
|
isProbablyReaderable(doc) {
|
|
// Only care about 'real' HTML documents:
|
|
if (doc.mozSyntheticDocument || !(doc instanceof doc.defaultView.HTMLDocument)) {
|
|
return false;
|
|
}
|
|
|
|
let uri = Services.io.newURI(doc.location.href);
|
|
if (!this.shouldCheckUri(uri)) {
|
|
return false;
|
|
}
|
|
|
|
return isProbablyReaderable(doc, isNodeVisible);
|
|
},
|
|
|
|
_blockedHosts: [
|
|
"amazon.com",
|
|
"github.com",
|
|
"mail.google.com",
|
|
"pinterest.com",
|
|
"reddit.com",
|
|
"twitter.com",
|
|
"youtube.com",
|
|
],
|
|
|
|
shouldCheckUri(uri, isBaseUri = false) {
|
|
if (!["http", "https"].includes(uri.scheme)) {
|
|
return false;
|
|
}
|
|
|
|
if (!isBaseUri) {
|
|
// Sadly, some high-profile pages have false positives, so bail early for those:
|
|
let {host} = uri;
|
|
if (this._blockedHosts.some(blockedHost => host.endsWith(blockedHost))) {
|
|
return false;
|
|
}
|
|
|
|
if (uri.filePath == "/") {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
},
|
|
};
|
|
|
|
XPCOMUtils.defineLazyPreferenceGetter(
|
|
Readerable, "isEnabled", "reader.parse-on-load.enabled", true);
|
|
XPCOMUtils.defineLazyPreferenceGetter(
|
|
Readerable, "isForceEnabled", "reader.parse-on-load.force-enabled", false);
|