Skip to content

Commit 993ad29

Browse files
Merge pull request #121 from opencomponents/always-pass-oc-id
always pass oc id as data-id
2 parents 16ae011 + 8720b3f commit 993ad29

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/oc-client.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,12 @@ var oc = oc || {};
214214
var attr = $component.attr.bind($component),
215215
dataName = data.name,
216216
dataVersion = data.version;
217-
$component.html(data.html);
218217
attr('id', data.id);
219218
attr(dataRenderedAttribute, true);
220219
attr(dataRenderingAttribute, false);
221220
attr('data-version', dataVersion);
221+
attr('data-id', data.ocId);
222+
$component.html(data.html);
222223

223224
if (data.key) {
224225
attr('data-hash', data.key);
@@ -493,9 +494,10 @@ var oc = oc || {};
493494

494495
oc.renderByHref = function (hrefOrOptions, retryNumberOrCallback, callback) {
495496
callback = callback || retryNumberOrCallback;
496-
var retryNumber = hrefOrOptions.retryNumber || +retryNumberOrCallback || 0,
497+
var ocId = Math.floor(Math.random() * 9999999999),
498+
retryNumber = hrefOrOptions.retryNumber || +retryNumberOrCallback || 0,
497499
href = hrefOrOptions.href || hrefOrOptions,
498-
id = hrefOrOptions.id || Math.floor(Math.random() * 9999999999),
500+
id = hrefOrOptions.id || ocId,
499501
element = hrefOrOptions.element;
500502

501503
oc.ready(function () {
@@ -527,6 +529,7 @@ var oc = oc || {};
527529
logInfo(interpolate(MESSAGES_RENDERED, template.src));
528530
callback(null, {
529531
id: id,
532+
ocId: ocId,
530533
html: html,
531534
baseUrl: apiResponse.baseUrl,
532535
key: template.key,

0 commit comments

Comments
 (0)