Bug 1427754 - Enable ESLint rule mozilla/use-services for accessible/ r=surkov

MozReview-Commit-ID: EJoFyhMfQzv

--HG--
extra : rebase_source : 4df24c322ff9144f9c38d4d8d7aff35ef0f7419d
This commit is contained in:
Mark Banner 2018-01-03 15:26:19 +00:00
Родитель e38403da76
Коммит ec4d7eb2fd
4 изменённых файлов: 13 добавлений и 25 удалений

Просмотреть файл

@ -28,7 +28,6 @@ module.exports = {
// XXX Bug 1421969. These files/directories are still being fixed,
// so turn off mozilla/use-services for them for now.
"files": [
"accessible/**",
// Browser: Bug 1421379
"browser/extensions/shield-recipe-client/test/browser/head.js",
"browser/modules/offlineAppCache.jsm",

Просмотреть файл

@ -710,11 +710,6 @@ function getLoadContext() {
* Return text from clipboard.
*/
function getTextFromClipboard() {
var clip = Components.classes["@mozilla.org/widget/clipboard;1"].
getService(Components.interfaces.nsIClipboard);
if (!clip)
return "";
var trans = Components.classes["@mozilla.org/widget/transferable;1"].
createInstance(Components.interfaces.nsITransferable);
trans.init(getLoadContext());
@ -722,7 +717,7 @@ function getTextFromClipboard() {
return "";
trans.addDataFlavor("text/unicode");
clip.getData(trans, clip.kGlobalClipboard);
Services.clipboard.getData(trans, Services.clipboard.kGlobalClipboard);
var str = {};
var strLength = {};

Просмотреть файл

@ -2,17 +2,18 @@
<head>
<title>application accessible name</title>
<link rel="stylesheet" type="text/css"
<link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
<script type="application/javascript"
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript"
<script type="application/javascript"
src="../common.js"></script>
<script type="application/javascript"
<script type="application/javascript"
src="../role.js"></script>
<script type="application/javascript">
/* import-globals-from ../common.js */
function doTest() {
var accessible = getApplicationAccessible();
if (!accessible) {
@ -20,19 +21,13 @@
return;
}
var bundleServ =
Components.classes["@mozilla.org/intl/stringbundle;1"].
getService(Components.interfaces.nsIStringBundleService);
var brandBundle =
bundleServ.createBundle("chrome://branding/locale/brand.properties");
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"].
getService(Components.interfaces.nsIXULAppInfo);
Services.strings.createBundle("chrome://branding/locale/brand.properties");
// nsIAccessible::name
var applicationName = "";
if (LINUX || SOLARIS) {
applicationName = appInfo.name;
applicationName = Services.appinfo.name;
} else {
try {
applicationName = brandBundle.GetStringFromName("brandShortName");
@ -45,10 +40,10 @@
is(accessible.name, applicationName, "wrong application accessible name");
// nsIAccessibleApplication
is(accessible.appName, appInfo.name, "Wrong application name");
is(accessible.appVersion, appInfo.version, "Wrong application version");
is(accessible.appName, Services.appinfo.name, "Wrong application name");
is(accessible.appVersion, Services.appinfo.version, "Wrong application version");
is(accessible.platformName, "Gecko", "Wrong platform name");
is(accessible.platformVersion, appInfo.platformVersion,
is(accessible.platformVersion, Services.appinfo.platformVersion,
"Wrong platform version");
SimpleTest.finish();

Просмотреть файл

@ -15,13 +15,12 @@
src="../events.js"></script>
<script type="application/javascript">
/* import-globals-from ../common.js */
/**
* Turn on/off the caret browsing mode.
*/
function turnCaretBrowsing(aIsOn) {
var prefs = Components.classes["@mozilla.org/preferences-service;1"].
getService(Components.interfaces.nsIPrefBranch);
prefs.setBoolPref("accessibility.browsewithcaret", aIsOn);
Services.prefs.setBoolPref("accessibility.browsewithcaret", aIsOn);
}
/**