2 files changed, 27 insertions, 20 deletions

diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js
index 95a803d7fec..794bf80a622 100644
--- a/core/modules/views/js/ajax_view.js
+++ b/core/modules/views/js/ajax_view.js
@@ -7,22 +7,23 @@
 
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.ViewsAjaxView = {};
+
   Drupal.behaviors.ViewsAjaxView.attach = function (context, settings) {
     if (settings && settings.views && settings.views.ajaxViews) {
       var ajaxViews = settings.views.ajaxViews;
-
       Object.keys(ajaxViews || {}).forEach(function (i) {
         Drupal.views.instances[i] = new Drupal.views.ajaxView(ajaxViews[i]);
       });
     }
   };
+
   Drupal.behaviors.ViewsAjaxView.detach = function (context, settings, trigger) {
     if (trigger === 'unload') {
       if (settings && settings.views && settings.views.ajaxViews) {
         var ajaxViews = settings.views.ajaxViews;
-
         Object.keys(ajaxViews || {}).forEach(function (i) {
-          var selector = '.js-view-dom-id-' + ajaxViews[i].view_dom_id;
+          var selector = ".js-view-dom-id-".concat(ajaxViews[i].view_dom_id);
+
           if ($(selector, context).length) {
             delete Drupal.views.instances[i];
             delete settings.views.ajaxViews[i];
@@ -33,13 +34,11 @@
   };
 
   Drupal.views = {};
-
   Drupal.views.instances = {};
 
   Drupal.views.ajaxView = function (settings) {
-    var selector = '.js-view-dom-id-' + settings.view_dom_id;
+    var selector = ".js-view-dom-id-".concat(settings.view_dom_id);
     this.$view = $(selector);
-
     var ajaxPath = drupalSettings.views.ajax_path;
 
     if (ajaxPath.constructor.toString().indexOf('Array') !== -1) {
@@ -47,8 +46,10 @@
     }
 
     var queryString = window.location.search || '';
+
     if (queryString !== '') {
       queryString = queryString.slice(1).replace(/q=[^&]+&?|&?render=[^&]+/, '');
+
       if (queryString !== '') {
         queryString = (/\?/.test(ajaxPath) ? '&' : '?') + queryString;
       }
@@ -60,16 +61,14 @@
       setClick: true,
       event: 'click',
       selector: selector,
-      progress: { type: 'fullscreen' }
+      progress: {
+        type: 'fullscreen'
+      }
     };
-
     this.settings = settings;
-
-    this.$exposed_form = $('form#views-exposed-form-' + settings.view_name.replace(/_/g, '-') + '-' + settings.view_display_id.replace(/_/g, '-'));
+    this.$exposed_form = $("form#views-exposed-form-".concat(settings.view_name.replace(/_/g, '-'), "-").concat(settings.view_display_id.replace(/_/g, '-')));
     this.$exposed_form.once('exposed-form').each($.proxy(this.attachExposedFormAjax, this));
-
     this.$view.filter($.proxy(this.filterNestedViews, this)).once('ajax-pager').each($.proxy(this.attachPagerAjax, this));
-
     var selfSettings = $.extend({}, this.element_settings, {
       event: 'RefreshView',
       base: this.selector,
@@ -81,7 +80,6 @@
   Drupal.views.ajaxView.prototype.attachExposedFormAjax = function () {
     var that = this;
     this.exposedFormAjax = [];
-
     $('input[type=submit], input[type=image]', this.$exposed_form).not('[data-drupal-selector=edit-reset]').each(function (index) {
       var selfSettings = $.extend({}, that.element_settings, {
         base: $(this).attr('id'),
@@ -103,9 +101,7 @@
     var $link = $(link);
     var viewData = {};
     var href = $link.attr('href');
-
     $.extend(viewData, this.settings, Drupal.Views.parseQueryString(href), Drupal.Views.parseViewArgs(href, this.settings.view_base_path));
-
     var selfSettings = $.extend({}, this.element_settings, {
       submit: viewData,
       base: false,
@@ -116,14 +112,16 @@
 
   Drupal.AjaxCommands.prototype.viewsScrollTop = function (ajax, response) {
     var offset = $(response.selector).offset();
-
     var scrollTarget = response.selector;
+
     while ($(scrollTarget).scrollTop() === 0 && $(scrollTarget).parent()) {
       scrollTarget = $(scrollTarget).parent();
     }
 
     if (offset.top - 10 < $(scrollTarget).scrollTop()) {
-      $(scrollTarget).animate({ scrollTop: offset.top - 10 }, 500);
+      $(scrollTarget).animate({
+        scrollTop: offset.top - 10
+      }, 500);
     }
   };
 })(jQuery, Drupal, drupalSettings);
\ No newline at end of file
diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js
index be522cf5aa2..4f434ecc7f1 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