Skip to content

Commit b3a224f

Browse files
committed
Merge branch 'Simplified_component_declaration'
# Conflicts: # build/dc.min.js.map
2 parents f227dbd + 374849c commit b3a224f

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

build/dc.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/dc.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ <h2>Simple example</h2>
7979

8080
<div class="example mb-5">
8181
<div class="collapsed" id="simple-collapsed" data-live-highlight="simple"
82-
data-dc-component-collapsed
83-
data-dc-collapsed-options='{"speed": 500, "ease": "linear"}'>
82+
data-dc-collapsed='{"speed": 500, "ease": "linear"}'>
8483
<button class="collapsed__button" data-dc-collapsed-ref="button">
8584
Toggle
8685
</button>

src/dc-dom.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import utils from './utils';
22

3-
const DC_ATTRIBUTE_COMPONENT = 'data-dc-component';
4-
53
const DC_NAMESPACE = 'data-dc';
6-
const DC_NAMESPACED_ATTRIBUTE_OPTIONS = 'options';
74
const DC_NAMESPACED_ATTRIBUTE_REFERENCE = 'ref';
85
const DC_NAMESPACED_ATTRIBUTE_ID = 'id';
96

7+
function getNamespacedAnchorAttribute(namespace) {
8+
return `${DC_NAMESPACE}-${namespace}`
9+
}
10+
1011
/**
1112
* @param {HTMLElement} root
1213
* @param {string} namespace
@@ -17,7 +18,7 @@ const DC_NAMESPACED_ATTRIBUTE_ID = 'id';
1718
function findElementsForInit(root, namespace, selector = null) {
1819
// by default we use namespace
1920
if (selector === null) {
20-
selector = `[${DC_ATTRIBUTE_COMPONENT}-${namespace}]`;
21+
selector = `[${getNamespacedAnchorAttribute(namespace)}]`;
2122
}
2223

2324
let elements = [];
@@ -63,7 +64,7 @@ function scopedQuerySelectorAll(element, selector, namespace, id) {
6364
* @return {Object}
6465
*/
6566
function getElementOptions(element, namespace) {
66-
return getElementAttributeAsObject(element, getNamespacedAttributeName(DC_NAMESPACED_ATTRIBUTE_OPTIONS, namespace)) || {};
67+
return getElementAttributeAsObject(element, getNamespacedAnchorAttribute(namespace));
6768
}
6869

6970
/**
@@ -72,7 +73,7 @@ function getElementOptions(element, namespace) {
7273
* @return {?Object}
7374
*/
7475
function getElementAttributeAsObject(element, attribute) {
75-
let result = null;
76+
let result = {};
7677
const attributeValue = element.getAttribute(attribute);
7778
if (attributeValue) {
7879
try {

0 commit comments

Comments
 (0)