From 584600bda36ac13ea325617783216d6c6a331c08 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Thu, 21 Apr 2022 21:41:43 +0300 Subject: Manipulator: Add JSON parse support (#35077) Support parsing JSON from each component's main element using the `data-bs-config` attribute. The `bs-config` attribute will be reserved and omitted during `getDataAttributes` parsing. With this commit, every component, will create its config object, using: * defaults * data-bs-config * the rest of data attributes * configuration object given during instance initialization Co-authored-by: XhmikosR Co-authored-by: Mark Otto Co-authored-by: Mark Otto --- js/src/dom/manipulator.js | 12 ++++++++++-- js/src/util/config.js | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'js/src') diff --git a/js/src/dom/manipulator.js b/js/src/dom/manipulator.js index 5e6ad92ae..2d96d65fc 100644 --- a/js/src/dom/manipulator.js +++ b/js/src/dom/manipulator.js @@ -22,7 +22,15 @@ function normalizeData(value) { return null } - return value + if (typeof value !== 'string') { + return value + } + + try { + return JSON.parse(decodeURIComponent(value)) + } catch { + return value + } } function normalizeDataKey(key) { @@ -44,7 +52,7 @@ const Manipulator = { } const attributes = {} - const bsKeys = Object.keys(element.dataset).filter(key => key.startsWith('bs')) + const bsKeys = Object.keys(element.dataset).filter(key => key.startsWith('bs') && !key.startsWith('bsConfig')) for (const key of bsKeys) { let pureKey = key.replace(/^bs/, '') diff --git a/js/src/util/config.js b/js/src/util/config.js index 19d02955d..f6c194276 100644 --- a/js/src/util/config.js +++ b/js/src/util/config.js @@ -38,8 +38,11 @@ class Config { } _mergeConfigObj(config, element) { + const jsonConfig = isElement(element) ? Manipulator.getDataAttribute(element, 'config') : {} // try to parse + return { ...this.constructor.Default, + ...(typeof jsonConfig === 'object' ? jsonConfig : {}), ...(isElement(element) ? Manipulator.getDataAttributes(element) : {}), ...(typeof config === 'object' ? config : {}) } -- cgit v1.2.3