Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2983373 by ApacheEx, drpal, m1r1k: JS codestyle: no-restricted-globals

8.7.x
Lauri Eskola 2018-07-16 09:00:57 +03:00
parent eb5d499d31
commit 258a27b635
16 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/.eslintrc.passing.json
View File

@ -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",

2
core/misc/collapse.es6.js
View File

@ -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);
}

2
core/misc/collapse.js
View File

@ -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);
}

1
core/misc/displace.es6.js
View File

@ -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);
}

4
core/misc/drupal.es6.js
View File

@ -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 {

4
core/misc/drupal.js
View File

@ -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);

2
core/misc/form.es6.js
View File

@ -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) {

2
core/misc/form.js
View File

@ -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) {

4
core/modules/ckeditor/js/ckeditor.es6.js
View File

@ -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}`);
}
}
}

4
core/modules/ckeditor/js/ckeditor.js vendored
View File

@ -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);
}
}
}

2
core/modules/menu_ui/menu_ui.admin.es6.js
View File

@ -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',

2
core/modules/menu_ui/menu_ui.admin.js
View File

@ -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',

2
core/modules/quickedit/js/views/AppView.es6.js
View File

@ -103,7 +103,7 @@
// the edited fields.
if (reload) {
reload = false;
location.reload();
window.location.reload();
}
break;
}

2
core/modules/quickedit/js/views/AppView.js
View File

@ -63,7 +63,7 @@
if (reload) {
reload = false;
location.reload();
window.location.reload();
}
break;
}

4
core/modules/toolbar/js/toolbar.menu.es6.js
View File

@ -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');

4
core/modules/toolbar/js/toolbar.menu.js
View File

@ -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');