diff options
Diffstat (limited to 'core/modules/views/js/base.js')
-rw-r--r-- | core/modules/views/js/base.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js index be522cf5aa24..4f434ecc7f1b 100644 --- a/core/modules/views/js/base.js +++ b/core/modules/views/js/base.js @@ -11,11 +11,14 @@ Drupal.Views.parseQueryString = function (query) { var args = {}; var pos = query.indexOf('?'); + if (pos !== -1) { query = query.substring(pos + 1); } - var pair = void 0; + + var pair; var pairs = query.split('&'); + for (var i = 0; i < pairs.length; i++) { pair = pairs[i].split('='); @@ -23,27 +26,30 @@ args[decodeURIComponent(pair[0].replace(/\+/g, ' '))] = decodeURIComponent(pair[1].replace(/\+/g, ' ')); } } + return args; }; Drupal.Views.parseViewArgs = function (href, viewPath) { var returnObj = {}; var path = Drupal.Views.getPath(href); - var viewHref = Drupal.url(viewPath).substring(drupalSettings.path.baseUrl.length); - if (viewHref && path.substring(0, viewHref.length + 1) === viewHref + '/') { + if (viewHref && path.substring(0, viewHref.length + 1) === "".concat(viewHref, "/")) { returnObj.view_args = decodeURIComponent(path.substring(viewHref.length + 1, path.length)); returnObj.view_path = path; } + return returnObj; }; Drupal.Views.pathPortion = function (href) { var protocol = window.location.protocol; + if (href.substring(0, protocol.length) === protocol) { href = href.substring(href.indexOf('/', protocol.length + 2)); } + return href; }; @@ -54,12 +60,15 @@ if (href.substring(0, 3) === '?q=') { href = href.substring(3, href.length); } + var chars = ['#', '?', '&']; + for (var i = 0; i < chars.length; i++) { if (href.indexOf(chars[i]) > -1) { href = href.substr(0, href.indexOf(chars[i])); } } + return href; }; })(jQuery, Drupal, drupalSettings);
\ No newline at end of file |