From 258a27b635362a06179ea5bfac7c7f91b6c3e41c Mon Sep 17 00:00:00 2001
From: Lauri Eskola <lauriii@1078742.no-reply.drupal.org>
Date: Mon, 16 Jul 2018 09:00:57 +0300
Subject: [PATCH] Issue #2983373 by ApacheEx, drpal, m1r1k: JS codestyle:
no-restricted-globals
---
core/.eslintrc.passing.json | 1 -
core/misc/collapse.es6.js | 2 +-
core/misc/collapse.js | 2 +-
core/misc/displace.es6.js | 1 +
core/misc/drupal.es6.js | 4 ++--
core/misc/drupal.js | 4 ++--
core/misc/form.es6.js | 2 +-
core/misc/form.js | 2 +-
core/modules/ckeditor/js/ckeditor.es6.js | 4 ++--
core/modules/ckeditor/js/ckeditor.js | 4 ++--
core/modules/menu_ui/menu_ui.admin.es6.js | 2 +-
core/modules/menu_ui/menu_ui.admin.js | 2 +-
core/modules/quickedit/js/views/AppView.es6.js | 2 +-
core/modules/quickedit/js/views/AppView.js | 2 +-
core/modules/toolbar/js/toolbar.menu.es6.js | 4 ++--
core/modules/toolbar/js/toolbar.menu.js | 4 ++--
16 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/core/.eslintrc.passing.json b/core/.eslintrc.passing.json
index 52bbfc7e42da..449ec7030895 100644
--- a/core/.eslintrc.passing.json
+++ b/core/.eslintrc.passing.json
@@ -9,7 +9,6 @@
"default-case": "off",
"prefer-destructuring": "off",
"operator-linebreak": "off",
- "no-restricted-globals": "off",
"react/no-this-in-sfc": "off",
"react/destructuring-assignment": "off",
"implicit-arrow-linebreak": "off",
diff --git a/core/misc/collapse.es6.js b/core/misc/collapse.es6.js
index 374af0c1c9aa..b97c3e4d7ccb 100644
--- a/core/misc/collapse.es6.js
+++ b/core/misc/collapse.es6.js
@@ -17,7 +17,7 @@
this.$node.data('details', this);
// Expand details if there are errors inside, or if it contains an
// element that is targeted by the URI fragment identifier.
- const anchor = location.hash && location.hash !== '#' ? `, ${location.hash}` : '';
+ const anchor = window.location.hash && window.location.hash !== '#' ? `, ${window.location.hash}` : '';
if (this.$node.find(`.error${anchor}`).length) {
this.$node.attr('open', true);
}
diff --git a/core/misc/collapse.js b/core/misc/collapse.js
index 2f157bad31e7..3c09ab18b77e 100644
--- a/core/misc/collapse.js
+++ b/core/misc/collapse.js
@@ -10,7 +10,7 @@
this.$node = $(node);
this.$node.data('details', this);
- var anchor = location.hash && location.hash !== '#' ? ', ' + location.hash : '';
+ var anchor = window.location.hash && window.location.hash !== '#' ? ', ' + window.location.hash : '';
if (this.$node.find('.error' + anchor).length) {
this.$node.attr('open', true);
}
diff --git a/core/misc/displace.es6.js b/core/misc/displace.es6.js
index 4a87edc3d122..168b5eb336c4 100644
--- a/core/misc/displace.es6.js
+++ b/core/misc/displace.es6.js
@@ -122,6 +122,7 @@
// If the element's offset data attribute exits
// but is not a valid number then get the displacement
// dimensions directly from the element.
+ // eslint-disable-next-line no-restricted-globals
if (isNaN(displacement)) {
displacement = getRawOffset(el, edge);
}
diff --git a/core/misc/drupal.es6.js b/core/misc/drupal.es6.js
index 546527a34c6b..260a7d724859 100644
--- a/core/misc/drupal.es6.js
+++ b/core/misc/drupal.es6.js
@@ -434,14 +434,14 @@ window.Drupal = { behaviors: {}, locale: {} };
// Always use browser-derived absolute URLs in the comparison, to avoid
// attempts to break out of the base path using directory traversal.
let absoluteUrl = Drupal.url.toAbsolute(url);
- let protocol = location.protocol;
+ let { protocol } = window.location;
// Consider URLs that match this site's base URL but use HTTPS instead of HTTP
// as local as well.
if (protocol === 'http:' && absoluteUrl.indexOf('https:') === 0) {
protocol = 'https:';
}
- let baseUrl = `${protocol}//${location.host}${drupalSettings.path.baseUrl.slice(0, -1)}`;
+ let baseUrl = `${protocol}//${window.location.host}${drupalSettings.path.baseUrl.slice(0, -1)}`;
// Decoding non-UTF-8 strings may throw an exception.
try {
diff --git a/core/misc/drupal.js b/core/misc/drupal.js
index 39a74e4f5186..4e3389358e14 100644
--- a/core/misc/drupal.js
+++ b/core/misc/drupal.js
@@ -135,12 +135,12 @@ window.Drupal = { behaviors: {}, locale: {} };
Drupal.url.isLocal = function (url) {
var absoluteUrl = Drupal.url.toAbsolute(url);
- var protocol = location.protocol;
+ var protocol = window.location.protocol;
if (protocol === 'http:' && absoluteUrl.indexOf('https:') === 0) {
protocol = 'https:';
}
- var baseUrl = protocol + '//' + location.host + drupalSettings.path.baseUrl.slice(0, -1);
+ var baseUrl = protocol + '//' + window.location.host + drupalSettings.path.baseUrl.slice(0, -1);
try {
absoluteUrl = decodeURIComponent(absoluteUrl);
diff --git a/core/misc/form.es6.js b/core/misc/form.es6.js
index 47674a556a0f..9afc7a11adc5 100644
--- a/core/misc/form.es6.js
+++ b/core/misc/form.es6.js
@@ -270,7 +270,7 @@
url = e.currentTarget.location ? e.currentTarget.location : e.currentTarget;
}
else {
- url = location;
+ url = window.location;
}
const hash = url.hash.substr(1);
if (hash) {
diff --git a/core/misc/form.js b/core/misc/form.js
index baaba184ee22..88226a515698 100644
--- a/core/misc/form.js
+++ b/core/misc/form.js
@@ -130,7 +130,7 @@
if (e.type === 'click') {
url = e.currentTarget.location ? e.currentTarget.location : e.currentTarget;
} else {
- url = location;
+ url = window.location;
}
var hash = url.hash.substr(1);
if (hash) {
diff --git a/core/modules/ckeditor/js/ckeditor.es6.js b/core/modules/ckeditor/js/ckeditor.es6.js
index a6429e0b5ecf..c4ba1567398c 100644
--- a/core/modules/ckeditor/js/ckeditor.es6.js
+++ b/core/modules/ckeditor/js/ckeditor.es6.js
@@ -295,13 +295,13 @@
// Redirect on hash change when the original hash has an associated CKEditor.
function redirectTextareaFragmentToCKEditorInstance() {
- const hash = location.hash.substr(1);
+ const hash = window.location.hash.substr(1);
const element = document.getElementById(hash);
if (element) {
const editor = CKEDITOR.dom.element.get(element).getEditor();
if (editor) {
const id = editor.container.getAttribute('id');
- location.replace(`#${id}`);
+ window.location.replace(`#${id}`);
}
}
}
diff --git a/core/modules/ckeditor/js/ckeditor.js b/core/modules/ckeditor/js/ckeditor.js
index becf7a19e791..9a6445044962 100644
--- a/core/modules/ckeditor/js/ckeditor.js
+++ b/core/modules/ckeditor/js/ckeditor.js
@@ -177,13 +177,13 @@
});
function redirectTextareaFragmentToCKEditorInstance() {
- var hash = location.hash.substr(1);
+ var hash = window.location.hash.substr(1);
var element = document.getElementById(hash);
if (element) {
var editor = CKEDITOR.dom.element.get(element).getEditor();
if (editor) {
var id = editor.container.getAttribute('id');
- location.replace('#' + id);
+ window.location.replace('#' + id);
}
}
}
diff --git a/core/modules/menu_ui/menu_ui.admin.es6.js b/core/modules/menu_ui/menu_ui.admin.es6.js
index 3144d13dc1b3..7a8d7d17bd36 100644
--- a/core/modules/menu_ui/menu_ui.admin.es6.js
+++ b/core/modules/menu_ui/menu_ui.admin.es6.js
@@ -35,7 +35,7 @@
});
$.ajax({
- url: `${location.protocol}//${location.host}${Drupal.url('admin/structure/menu/parents')}`,
+ url: `${window.location.protocol}//${window.location.host}${Drupal.url('admin/structure/menu/parents')}`,
type: 'POST',
data: { 'menus[]': values },
dataType: 'json',
diff --git a/core/modules/menu_ui/menu_ui.admin.js b/core/modules/menu_ui/menu_ui.admin.js
index 03e0e22ae73d..0f0e882c9809 100644
--- a/core/modules/menu_ui/menu_ui.admin.js
+++ b/core/modules/menu_ui/menu_ui.admin.js
@@ -26,7 +26,7 @@
});
$.ajax({
- url: location.protocol + '//' + location.host + Drupal.url('admin/structure/menu/parents'),
+ url: window.location.protocol + '//' + window.location.host + Drupal.url('admin/structure/menu/parents'),
type: 'POST',
data: { 'menus[]': values },
dataType: 'json',
diff --git a/core/modules/quickedit/js/views/AppView.es6.js b/core/modules/quickedit/js/views/AppView.es6.js
index fed6396c0e30..426dab0cd055 100644
--- a/core/modules/quickedit/js/views/AppView.es6.js
+++ b/core/modules/quickedit/js/views/AppView.es6.js
@@ -103,7 +103,7 @@
// the edited fields.
if (reload) {
reload = false;
- location.reload();
+ window.location.reload();
}
break;
}
diff --git a/core/modules/quickedit/js/views/AppView.js b/core/modules/quickedit/js/views/AppView.js
index 51c80f1556df..b0fa275d9197 100644
--- a/core/modules/quickedit/js/views/AppView.js
+++ b/core/modules/quickedit/js/views/AppView.js
@@ -63,7 +63,7 @@
if (reload) {
reload = false;
- location.reload();
+ window.location.reload();
}
break;
}
diff --git a/core/modules/toolbar/js/toolbar.menu.es6.js b/core/modules/toolbar/js/toolbar.menu.es6.js
index 6fe8ede01617..78660c5a34f2 100644
--- a/core/modules/toolbar/js/toolbar.menu.es6.js
+++ b/core/modules/toolbar/js/toolbar.menu.es6.js
@@ -142,9 +142,9 @@
* The root of the menu.
*/
function openActiveItem($menu) {
- const pathItem = $menu.find(`a[href="${location.pathname}"]`);
+ const pathItem = $menu.find(`a[href="${window.location.pathname}"]`);
if (pathItem.length && !activeItem) {
- activeItem = location.pathname;
+ activeItem = window.location.pathname;
}
if (activeItem) {
const $activeItem = $menu.find(`a[href="${activeItem}"]`).addClass('menu-item--active');
diff --git a/core/modules/toolbar/js/toolbar.menu.js b/core/modules/toolbar/js/toolbar.menu.js
index b0706390b77b..5d533dff5623 100644
--- a/core/modules/toolbar/js/toolbar.menu.js
+++ b/core/modules/toolbar/js/toolbar.menu.js
@@ -72,9 +72,9 @@
}
function openActiveItem($menu) {
- var pathItem = $menu.find('a[href="' + location.pathname + '"]');
+ var pathItem = $menu.find('a[href="' + window.location.pathname + '"]');
if (pathItem.length && !activeItem) {
- activeItem = location.pathname;
+ activeItem = window.location.pathname;
}
if (activeItem) {
var $activeItem = $menu.find('a[href="' + activeItem + '"]').addClass('menu-item--active');
--
GitLab