Merge branch 'master' of https://github.com/misode/loot-table into schema/1.15

This commit is contained in:
Misode
2019-10-09 14:23:40 +02:00
+4 -2
View File
@@ -208,6 +208,7 @@ function generateSet(data, struct) {
function generateMap(data, struct) { function generateMap(data, struct) {
let $el = $('#components').find('[data-type="map"]').clone(); let $el = $('#components').find('[data-type="map"]').clone();
let out = {};
$el.attr('data-index', struct.id).attr('data-item-type', struct.values.type); $el.attr('data-index', struct.id).attr('data-item-type', struct.values.type);
$el.find('[data-name="1"]').attr('data-i18n', struct.translate); $el.find('[data-name="1"]').attr('data-i18n', struct.translate);
$el.find('[data-name="2"]').attr('data-i18n', struct.translate + '_add'); $el.find('[data-name="2"]').attr('data-i18n', struct.translate + '_add');
@@ -217,7 +218,7 @@ function generateMap(data, struct) {
let field = struct.values; let field = struct.values;
field.id = key; field.id = key;
field.translate = key; field.translate = key;
let $item = generateComponent(data[key], field);; let {out: outValue, component: $item} = generateComponent(data[key], field);
if (field.type === 'object') { if (field.type === 'object') {
let $header = $('<div class="card-header pb-1"></div>'); let $header = $('<div class="card-header pb-1"></div>');
$header.append(('<span class="input-group-text mr-3 mb-2 float-left" data-i18n="' + field.translate + '"></span>')); $header.append(('<span class="input-group-text mr-3 mb-2 float-left" data-i18n="' + field.translate + '"></span>'));
@@ -226,11 +227,12 @@ function generateMap(data, struct) {
} else { } else {
$item.append('<div class="input-group-append"><button class="btn btn-outline-danger bg-light" type="button" onclick="removeFromMap(this)" data-i18n="remove"></button></div>'); $item.append('<div class="input-group-append"><button class="btn btn-outline-danger bg-light" type="button" onclick="removeFromMap(this)" data-i18n="remove"></button></div>');
} }
out[field.id] = outValue;
$item.attr('data-index', field.id); $item.attr('data-index', field.id);
$el.append($item); $el.append($item);
} }
} }
return {out: data, component: $el}; return {out: out, component: $el};
} }
function setValueAndName($el, value, source) { function setValueAndName($el, value, source) {