Issue #2550717 by mradcliffe, bnjmnm, finnsky, Manuel Garcia, lauriii,... (b389f67d) · Commits · project / drupal

core/.eslintrc.json

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		"drupalTranslations": true,
		"jQuery": true,
		"_": true,
		"Cookies": true,
		"Backbone": true,
		"Modernizr": true,
		"Popper": true,

core/assets/vendor/jquery.cookie/jquery.cookie.min.js

deleted100644 → 0

+0 −2

/*! jquery.cookie v1.4.1 | MIT */

!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?a(require("jquery")):a(jQuery)}(function(a){function b(a){return h.raw?a:encodeURIComponent(a)}function c(a){return h.raw?a:decodeURIComponent(a)}function d(a){return b(h.json?JSON.stringify(a):String(a))}function e(a){0===a.indexOf('"')&&(a=a.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,"\\"));try{return a=decodeURIComponent(a.replace(g," ")),h.json?JSON.parse(a):a}catch(b){}}function f(b,c){var d=h.raw?b:e(b);return a.isFunction(c)?c(d):d}var g=/\+/g,h=a.cookie=function(e,g,i){if(void 0!==g&&!a.isFunction(g)){if(i=a.extend({},h.defaults,i),"number"==typeof i.expires){var j=i.expires,k=i.expires=new Date;k.setTime(+k+864e5*j)}return document.cookie=[b(e),"=",d(g),i.expires?"; expires="+i.expires.toUTCString():"",i.path?"; path="+i.path:"",i.domain?"; domain="+i.domain:"",i.secure?"; secure":""].join("")}for(var l=e?void 0:{},m=document.cookie?document.cookie.split("; "):[],n=0,o=m.length;o>n;n++){var p=m[n].split("="),q=c(p.shift()),r=p.join("=");if(e&&e===q){l=f(r,g);break}e||void 0===(r=f(r))||(l[q]=r)}return l};h.defaults={},a.removeCookie=function(b,c){return void 0===a.cookie(b)?!1:(a.cookie(b,"",a.extend({},c,{expires:-1})),!a.cookie(b))}});

 No newline at end of file

core/assets/vendor/js-cookie/js.cookie.min.js

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		/! js-cookie v2.2.1 \| MIT /

		!function(a){var b;if("function"==typeof define&&define.amd&&(define(a),b=!0),"object"==typeof exports&&(module.exports=a(),b=!0),!b){var c=window.Cookies,d=window.Cookies=a();d.noConflict=function(){return window.Cookies=c,d}}}(function(){function a(){for(var a=0,b={};a<arguments.length;a++){var c=arguments[a];for(var d in c)b[d]=c[d]}return b}function b(a){return a.replace(/(%[0-9A-Z]{2})+/g,decodeURIComponent)}function c(d){function e(){}function f(b,c,f){if("undefined"!=typeof document){f=a({path:"/"},e.defaults,f),"number"==typeof f.expires&&(f.expires=new Date(1new Date+864e5f.expires)),f.expires=f.expires?f.expires.toUTCString():"";try{var g=JSON.stringify(c);/^[\{\[]/.test(g)&&(c=g)}catch(j){}c=d.write?d.write(c,b):encodeURIComponent(c+"").replace(/%(23\|24\|26\|2B\|3A\|3C\|3E\|3D\|2F\|3F\|40\|5B\|5D\|5E\|60\|7B\|7D\|7C)/g,decodeURIComponent),b=encodeURIComponent(b+"").replace(/%(23\|24\|26\|2B\|5E\|60\|7C)/g,decodeURIComponent).replace(/[]/g,escape);var h="";for(var i in f)f[i]&&(h+="; "+i,!0!==f[i]&&(h+="="+f[i].split(";")[0]));return document.cookie=b+"="+c+h}}function g(a,c){if("undefined"!=typeof document){for(var e={},f=document.cookie?document.cookie.split("; "):[],g=0;g<f.length;g++){var h=f[g].split("="),i=h.slice(1).join("=");c\|\|'"'!==i.charAt(0)\|\|(i=i.slice(1,-1));try{var j=b(h[0]);if(i=(d.read\|\|d)(i,j)\|\|b(i),c)try{i=JSON.parse(i)}catch(k){}if(e[j]=i,a===j)break}catch(k){}}return a?e[a]:e}}return e.set=f,e.get=function(a){return g(a,!1)},e.getJSON=function(a){return g(a,!0)},e.remove=function(b,c){f(b,"",a(c,{expires:-1}))},e.defaults={},e.withConverter=c,e}return c(function(){})});
		No newline at end of file

core/core.libraries.yml

+17 −10

Original line number	Diff line number	Diff line
		@@ -210,7 +210,6 @@ drupal.form:
		- core/jquery
		- core/drupal
		- core/drupal.debounce
		- core/jquery.cookie
		- core/jquery.once

		drupal.machine-name:
		@@ -275,7 +274,6 @@ drupal.tabledrag:
		- core/drupal
		- core/drupalSettings
		- core/jquery.once
		- core/jquery.cookie

		drupal.tableheader:
		version: VERSION
		@@ -351,16 +349,14 @@ jquery:
		assets/vendor/jquery/jquery.min.js: { minified: true, weight: -20 }

		jquery.cookie:
		remote: https://github.com/carhartl/jquery-cookie
		version: "v1.4.1"
		license:
		name: MIT
		url: https://github.com/carhartl/jquery-cookie/blob/v1.4.1/MIT-LICENSE.txt
		gpl-compatible: true
		version: VERSION
		js:
		assets/vendor/jquery.cookie/jquery.cookie.min.js: { minified: true }
		misc/jquery.cookie.shim.js: {}
		dependencies:
		- core/jquery
		- core/drupal
		- core/js-cookie
		deprecated: The %library_id% asset library is deprecated in Drupal 9.0.0 and will be removed in Drupal 10.0.0. Use the core/js-cookie library instead. See https://www.drupal.org/node/3104677

		jquery.farbtastic:
		remote: https://github.com/mattfarina/farbtastic
		@@ -406,7 +402,6 @@ jquery.joyride:
		assets/vendor/jquery-joyride/jquery.joyride-2.1.js: { }
		dependencies:
		- core/jquery
		- core/jquery.cookie

		jquery.once:
		remote: https://github.com/RobLoach/jquery-once
		@@ -661,3 +656,15 @@ drupal.dialog.off_canvas:
		- core/drupal.announce
		- core/drupal.dialog
		- core/drupal.dialog.ajax

		js-cookie:
		remote: https://github.com/js-cookie/js-cookie
		version: "v2.2.1"
		license:
		name: MIT
		url: https://github.com/js-cookie/js-cookie/blob/v2.2.1/MIT-LICENSE.txt
		gpl-compatible: true
		js:
		assets/vendor/js-cookie/js.cookie.min.js: {}
		dependencies:
		- core/drupal.object.assign

core/misc/jquery.cookie.shim.es6.js

0 → 100644

+207 −0

Original line number	Diff line number	Diff line
		/**
		* @file
		* Defines a backwards-compatible shim for jquery.cookie.
		*/

		/**
		* The core/js-cookie library object.
		*
		* @global
		*
		* @var {object} Cookies
		*/

		(($, Drupal, cookies) => {
		const deprecatedMessageSuffix = `is deprecated in Drupal 9.0.0 and will be removed in Drupal 10.0.0. Use the core/js-cookie library instead. See https://www.drupal.org/node/3104677`;

		/**
		* Determines if an object is a function.
		*
		* @param {Object} obj
		* The object to check.
		*
		* @return {boolean}
		* True if the object is a function.
		*/
		const isFunction = obj =>
		Object.prototype.toString.call(obj) === '[object Function]';

		/**
		* Decodes cookie value for compatibility with jquery.cookie.
		*
		* @param {string} value
		* The cookie value to parse.
		*
		* @return {string}
		* The cookie value for the reader to return.
		*/
		const parseCookieValue = value => {
		if (value.indexOf('"') === 0) {
		value = value
		.slice(1, -1)
		.replace(/\\"/g, '"')
		.replace(/\\\\/g, '\\');
		}
		return decodeURIComponent(value.replace(/\+/g, ' '));
		};

		/**
		* Wraps the cookie value to support unsanitized values.
		*
		* Decoding strings is the job of the converter when using js-cookie, and
		* the shim uses the same decode function as that library when the deprecated
		* raw option is not used.
		*
		* @param {string} cookieValue
		* The cookie value.
		* @param {string} cookieName
		* The cookie name.
		* @param {reader~converterCallback} converter
		* A function that takes the cookie value for further processing.
		* @param {boolean} readUnsanitized
		* Uses the unsanitized value when set to true.
		*
		* @return {string}
		* The cookie value that js-cookie will return.
		*/
		const reader = (cookieValue, cookieName, converter, readUnsanitized) => {
		const value = readUnsanitized ? cookieValue : parseCookieValue(cookieValue);

		if (converter !== undefined && isFunction(converter)) {
		return converter(value, cookieName);
		}
		return value;
		};

		/**
		* Gets or sets a browser cookie.
		*
		* @example
		* // Returns 'myCookie=myCookieValue'.
		* $.cookie('myCookie', 'myCookieValue');
		* @example
		* // Returns 'myCookieValue'.
		* $.cookie('myCookie');
		*
		* @example
		* // Returns the literal URI-encoded value of {"key": "value"} as the cookie
		* // value along with the path as in the above example.
		* $.cookie('myCookie', { key: 'value' });
		* @example
		* $.cookie.json = true;
		* // Returns { key: 'value' }.
		* $.cookie('myCookie');
		*
		* @param {string} key
		* The name of the cookie.
		* @param {string\|Object\|Function\|undefined} value
		* A js-cookie converter callback when used as a getter. This callback must
		* be a function when using this shim for backwards-compatiblity with
		* jquery.cookie. When used as a setter, value is the string or JSON object
		* to be used as the cookie value.
		* @param {Object\|undefined} options
		* Overrides the default options when used as a setter. See the js-cookie
		* library README.md file for details.
		*
		* @return {string}
		* Returns the cookie name, value, and other properties based on the
		* return value of the document.cookie setter.
		*
		* @deprecated in Drupal 9.0.0 and is removed from Drupal 10.0.0.
		* Use the core/js-cookie library instead.
		*
		* @see https://www.drupal.org/node/3104677
		* @see https://github.com/js-cookie/js-cookie/blob/v2.2.1/README.md
		*/
		$.cookie = (key, value = undefined, options = undefined) => {
		Drupal.deprecationError({
		message: `jQuery.cookie() ${deprecatedMessageSuffix}`,
		});
		if (value !== undefined && !isFunction(value)) {
		// The caller is setting a cookie value and not trying to retrieve the
		// cookie value using a converter callback.
		const attributes = Object.assign($.cookie.defaults, options);

		if (!$.cookie.json) {
		// An object that is passed in must be typecast to a string when the
		// "json" option is not set because js-cookie will always stringify
		// JSON cookie values.
		value = String(value);
		}

		// If the expires value is a non-empty string, it needs to be converted
		// to a Date() object before being sent to js-cookie.
		if (typeof attributes.expires === 'string' && attributes.expires !== '') {
		attributes.expires = new Date(attributes.expires);
		}

		const cookieSetter = cookies.withConverter({
		write: cookieValue => encodeURIComponent(cookieValue),
		});

		return cookieSetter.set(key, value, attributes);
		}

		// Use either js-cookie or pass in a converter to get the raw cookie value,
		// which has security implications, but remains in place for
		// backwards-compatibility.
		const userProvidedConverter = value;
		const cookiesShim = cookies.withConverter((cookieValue, cookieName) =>
		reader(cookieValue, cookieName, userProvidedConverter, $.cookie.raw),
		);

		return $.cookie.json === true
		? cookiesShim.getJSON(key)
		: cookiesShim.get(key);
		};

		/**
		* @prop {Object} defaults
		* The default options when setting a cookie.
		* @prop {string} defaults.path
		* The default path for the cookie is ''.
		* @prop {undefined} defaults.expires
		* There is no default value for the expires option. The default expiration
		* is set to an empty string.
		*/
		$.cookie.defaults = { path: '', ...cookies.defaults };

		/**
		* @prop {boolean} json
		* True if the cookie value should be parsed as JSON.
		*/
		$.cookie.json = false;

		/**
		* @prop {boolean} json
		* True if the cookie value should be returned as-is without decoding
		* URI entities. In jquery.cookie, this also would not encode the cookie
		* name, but js-cookie does not allow this.
		*/
		$.cookie.raw = false;

		/**
		* Removes a browser cookie.
		*
		* @param {string} key
		* The name of the cookie.
		* @param {Object} options
		* Optional options. See the js-cookie library README.md for more details.
		*
		* @return {boolean}
		* Returns true when the cookie is successfully removed.
		*
		* @deprecated in Drupal 9.0.0 and is removed from Drupal 10.0.0.
		* Use the core/js-cookie library instead.
		*
		* @see https://www.drupal.org/node/3104677
		* @see https://github.com/js-cookie/js-cookie/blob/v2.2.1/README.md
		*/
		$.removeCookie = (key, options) => {
		Drupal.deprecationError({
		message: `jQuery.removeCookie() ${deprecatedMessageSuffix}`,
		});
		cookies.remove(key, Object.assign($.cookie.defaults, options));
		return !cookies.get(key);
		};
		})(jQuery, Drupal, window.Cookies);