diff --git a/core/modules/color/color.es6.js b/core/modules/color/color.es6.js index d02d50bd0c..b637ed9cc4 100644 --- a/core/modules/color/color.es6.js +++ b/core/modules/color/color.es6.js @@ -147,14 +147,21 @@ /** + * See shiftColor(). + * * @deprecated See shiftColor(). * - * @param given - * @param ref1 - * @param ref2 - * @returns {string} + * @param {string} given + * A hex color code to shift. + * @param {Array.} ref1 + * First HSL color reference. + * @param {Array.} ref2 + * Second HSL color reference. + * + * @return {function} + * The return of the call to shiftColor. */ - function shift_color(given, ref1, ref2) { + function shift_color(given, ref1, ref2) { // eslint-disable-line camelcase return shiftColor(given, ref1, ref2); } diff --git a/core/modules/views/js/ajax_view.es6.js b/core/modules/views/js/ajax_view.es6.js index c73b4659dd..eb06da0ec1 100644 --- a/core/modules/views/js/ajax_view.es6.js +++ b/core/modules/views/js/ajax_view.es6.js @@ -49,7 +49,7 @@ this.$view = $(selector); // Retrieve the path to use for views' ajax. - let ajaxPath = drupalSettings.views.ajax_path; // eslint-ignore-line camelcase + let ajaxPath = drupalSettings.views.ajax_path; // If there are multiple views this might've ended up showing up multiple // times. diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js index 48a15c8d18..175126b83c 100644 --- a/core/modules/views/js/ajax_view.js +++ b/core/modules/views/js/ajax_view.js @@ -27,6 +27,7 @@ this.$view = $(selector); var ajaxPath = drupalSettings.views.ajax_path; + if (ajaxPath.constructor.toString().indexOf('Array') !== -1) { ajaxPath = ajaxPath[0]; }