diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js index 53ed668..f399e20 100644 --- a/core/misc/machine-name.js +++ b/core/misc/machine-name.js @@ -158,7 +158,7 @@ Drupal.behaviors.machineName = { * The transliterated source string. */ transliterate: function (source, settings) { - return $.get(drupalSettings.basePath + 'machine_name/transliterate', { + return $.get(drupalSettings.path.basePath + 'machine_name/transliterate', { text: source, langcode: drupalSettings.langcode, replace_pattern: settings.replace_pattern, diff --git a/core/modules/contextual/js/contextual.js b/core/modules/contextual/js/contextual.js index c640069..92ecbd7 100644 --- a/core/modules/contextual/js/contextual.js +++ b/core/modules/contextual/js/contextual.js @@ -55,7 +55,7 @@ function initContextual ($contextual, html) { .prepend(Drupal.theme('contextualTrigger')); // Set the destination parameter on each of the contextual links. - var destination = 'destination=' + Drupal.encodePath(drupalSettings.currentPath); + var destination = 'destination=' + Drupal.encodePath(drupalSettings.path.currentPath); $contextual.find('.contextual-links a').each(function () { var url = this.getAttribute('href'); var glue = (url.indexOf('?') === -1) ? '?' : '&'; diff --git a/core/modules/toolbar/js/toolbar.menu.js b/core/modules/toolbar/js/toolbar.menu.js index e440f23..7e5c38a 100644 --- a/core/modules/toolbar/js/toolbar.menu.js +++ b/core/modules/toolbar/js/toolbar.menu.js @@ -12,7 +12,7 @@ /** * Store the open menu tray. */ -var activeItem = drupalSettings.basePath + Drupal.encodePath(drupalSettings.currentPath); +var activeItem = Drupal.url(drupalSettings.path.currentPath); $.fn.drupalToolbarMenu = function () { diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js index f929e43..1ac8d23 100644 --- a/core/modules/views/js/base.js +++ b/core/modules/views/js/base.js @@ -63,7 +63,7 @@ */ Drupal.Views.getPath = function (href) { href = Drupal.Views.pathPortion(href); - href = href.substring(drupalSettings.basePath.length, href.length); + href = href.substring(drupalSettings.path.basePath.length, href.length); // 3 is the length of the '?q=' added to the url without clean urls. if (href.substring(0, 3) === '?q=') { href = href.substring(3, href.length);