diff --git a/resources/report/html/editable-table.html b/resources/report/html/editable-table.html index 68649b89..c1458610 100644 --- a/resources/report/html/editable-table.html +++ b/resources/report/html/editable-table.html @@ -1,76 +1,127 @@ + + + + + - - - + + + + + + + - - Note - Warning - Error - + + + Note + Warning + Error + - - - + + + + + + + + - + - - Add - Remove - + + + Add + Remove + - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - - - - + + + - - - - - - + + + + + + + + + + + + + + + @@ -143,16 +194,11 @@ td paper-icon-button.hidden { if (trash.length > 0 && (!writableOnly || !trash[0].classList.contains('hidden'))) { var rowData = {}; - var inputs = rows[i].querySelectorAll('input, paper-input'); + var inputs = rows[i].querySelectorAll('input, paper-input, loot-dropdown-menu'); for (var j = 0; j < inputs.length; ++j) { rowData[inputs[j].className] = inputs[j].value; } - var selects = rows[i].getElementsByTagName('select'); - for (var j = 0; j < selects.length; ++j) { - rowData[selects[j].className] = selects[j].value; - } - writableRows.push(rowData); } } @@ -176,39 +222,17 @@ td paper-icon-button.hidden { trash.classList.toggle('hidden', readOnly); } - var inputs = row.querySelectorAll('input, paper-input'); + var inputs = row.querySelectorAll('input, paper-input, loot-dropdown-menu'); for (var i = 0; i < inputs.length; ++i) { if (classMask) { for (var j = 0; j < classMask.length; ++j) { if (inputs[i].classList.contains(classMask[j])) { - if (inputs[i].tagName == 'PAPER-INPUT') { - inputs[i].disabled = readOnly; - } else { - inputs[i].readOnly = readOnly; - } + inputs[i].disabled = readOnly; break; } } } else { - if (inputs[i].tagName == 'PAPER-INPUT') { - inputs[i].disabled = readOnly; - } else { - inputs[i].readOnly = readOnly; - } - } - } - - var selects = row.getElementsByTagName('select'); - for (var i = 0; i < selects.length; ++i) { - if (classMask) { - for (var j = 0; j < classMask.length; ++j) { - if (selects[i].classList.contains(classMask[j])) { - selects[i].disabled = readOnly; - break; - } - } - } else { - selects[i].disabled = readOnly; + inputs[i].disabled = readOnly; } } } diff --git a/resources/report/js/script.js b/resources/report/js/script.js index f6fdc158..3c868bda 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -1304,9 +1304,9 @@ function initVars() { /* Fill in game row template's game type options. */ var select = document.querySelector('link[rel="import"][href$="editable-table.html"]'); if (select) { - select = select.import.querySelector('#gameRow').content.querySelector('select') + select = select.import.querySelector('#gameRow').content.querySelector('.type') } else { - select = document.querySelector('#gameRow').content.querySelector('select'); + select = document.querySelector('#gameRow').content.querySelector('.type'); } for (var j = 0; j < loot.gameTypes.length; ++j) { var option = document.createElement('option');