From 4e415c4a507ae95de572498d367719bc82115580 Mon Sep 17 00:00:00 2001
From: Brian Weaver <weaver.299@osu.edu>
Date: Wed, 19 Feb 2020 13:43:09 -0500
Subject: [PATCH] Update views_ajax_history to 1.2
---
composer.lock | 14 +++++++-------
vendor/composer/installed.json | 16 ++++++++--------
.../views_ajax_history/js/views_ajax_history.js | 6 +++---
.../views_ajax_history.info.yml | 6 +++---
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/composer.lock b/composer.lock
index ebf41e1ae0..0eb0f60724 100644
--- a/composer.lock
+++ b/composer.lock
@@ -7888,17 +7888,17 @@
},
{
"name": "drupal/views_ajax_history",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_ajax_history.git",
- "reference": "8.x-1.1"
+ "reference": "8.x-1.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_ajax_history-8.x-1.1.zip",
- "reference": "8.x-1.1",
- "shasum": "dd5f5256e139dff1371a109959dde70d593d4d1a"
+ "url": "https://ftp.drupal.org/files/projects/views_ajax_history-8.x-1.2.zip",
+ "reference": "8.x-1.2",
+ "shasum": "97c19dd21327025a58deec6200e008b3c794b022"
},
"require": {
"drupal/core": "*"
@@ -7909,8 +7909,8 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
- "version": "8.x-1.1",
- "datestamp": "1559296088",
+ "version": "8.x-1.2",
+ "datestamp": "1562339886",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f909a29f4a..900a3170a8 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -8139,18 +8139,18 @@
},
{
"name": "drupal/views_ajax_history",
- "version": "1.1.0",
- "version_normalized": "1.1.0.0",
+ "version": "1.2.0",
+ "version_normalized": "1.2.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_ajax_history.git",
- "reference": "8.x-1.1"
+ "reference": "8.x-1.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_ajax_history-8.x-1.1.zip",
- "reference": "8.x-1.1",
- "shasum": "dd5f5256e139dff1371a109959dde70d593d4d1a"
+ "url": "https://ftp.drupal.org/files/projects/views_ajax_history-8.x-1.2.zip",
+ "reference": "8.x-1.2",
+ "shasum": "97c19dd21327025a58deec6200e008b3c794b022"
},
"require": {
"drupal/core": "*"
@@ -8161,8 +8161,8 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
- "version": "8.x-1.1",
- "datestamp": "1559296088",
+ "version": "8.x-1.2",
+ "datestamp": "1562339886",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
diff --git a/web/modules/views_ajax_history/js/views_ajax_history.js b/web/modules/views_ajax_history/js/views_ajax_history.js
index 7b08a493fe..a5058acde6 100644
--- a/web/modules/views_ajax_history/js/views_ajax_history.js
+++ b/web/modules/views_ajax_history/js/views_ajax_history.js
@@ -113,7 +113,7 @@
}
});
- url = url.split('?');
+ url = window.location.href.split('?');
return url[0] + (query.length ? '?' + query.join('&') : '');
};
@@ -204,7 +204,7 @@
Drupal.Ajax.prototype.beforeSerialize = function (element, options) {
// Check that we handle a click on a link, not a form submission.
if (options.data.view_name && element && $(element).is('a')) {
- addState(options, window.location.href);
+ addState(options, $(element).attr('href'));
}
// Call the original Drupal method with the right context.
@@ -222,7 +222,7 @@
* Object containing AJAX options.
*/
Drupal.Ajax.prototype.beforeSubmit = function (form_values, element, options) {
- if (options.data.view_name) {
+ if (options && options.data && options.data.view_name) {
var url = original.path + '?' + element.formSerialize();
var currentQuery = parseQueryString(window.location.href);
diff --git a/web/modules/views_ajax_history/views_ajax_history.info.yml b/web/modules/views_ajax_history/views_ajax_history.info.yml
index 5d35456f3f..5595d6d6bb 100644
--- a/web/modules/views_ajax_history/views_ajax_history.info.yml
+++ b/web/modules/views_ajax_history/views_ajax_history.info.yml
@@ -6,8 +6,8 @@ package: Views
dependencies:
- drupal:views
-# Information added by Drupal.org packaging script on 2019-05-31
-version: '8.x-1.1'
+# Information added by Drupal.org packaging script on 2019-07-05
+version: '8.x-1.2'
core: '8.x'
project: 'views_ajax_history'
-datestamp: 1559296090
+datestamp: 1562339889
--
GitLab