From 0aef0febc6fbbbd82741202f143aa7cb365dd77d Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sat, 8 Nov 2014 16:04:49 +0000 Subject: [PATCH] Fixed unregistered element usage. Also moved my includes after Polymer init, as they'll probably be polymerised shortly. --- resources/report/html/editable-table.html | 40 ++++++++++++++++------- resources/report/html/loot-dialog.html | 9 +++++ resources/report/report.html | 12 ++++--- 3 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 resources/report/html/loot-dialog.html diff --git a/resources/report/html/editable-table.html b/resources/report/html/editable-table.html index 7388284b..a7e3cace 100644 --- a/resources/report/html/editable-table.html +++ b/resources/report/html/editable-table.html @@ -1,3 +1,6 @@ + + + @@ -136,7 +139,7 @@ var EditableTableProto = Object.create(HTMLTableElement.prototype, { if (trash.length > 0 && (!writableOnly || !trash[0].classList.contains('hidden'))) { var rowData = {}; - var inputs = rows[i].getElementsByTagName('input'); + var inputs = rows[i].querySelectorAll('input, paper-input'); for (var j = 0; j < inputs.length; ++j) { rowData[inputs[j].className] = inputs[j].value; } @@ -172,17 +175,25 @@ var EditableTableProto = Object.create(HTMLTableElement.prototype, { trash.classList.toggle('hidden', readOnly); } - var inputs = row.getElementsByTagName('input'); + var inputs = row.querySelectorAll('input, paper-input'); 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])) { - inputs[i].readOnly = readOnly; + if (inputs[i].tagName == 'PAPER-INPUT') { + inputs[i].readonly = readOnly; + } else { + inputs[i].readOnly = readOnly; + } break; } } } else { - inputs[i].readOnly = readOnly; + if (inputs[i].tagName == 'PAPER-INPUT') { + inputs[i].disabled = readOnly; + } else { + inputs[i].readOnly = readOnly; + } } } @@ -254,7 +265,12 @@ var EditableTableProto = Object.create(HTMLTableElement.prototype, { for (var key in tableData) { var elems = row.getElementsByClassName(key); if (tableData[key] != undefined && elems.length == 1) { - elems[0].value = tableData[key]; + /*if (elems[0].tagName == 'PAPER-INPUT') { + elems[0].inputValue = tableData[key]; + elems[0].commit(); + } else { + */ elems[0].value = tableData[key]; + //} } } diff --git a/resources/report/html/loot-dialog.html b/resources/report/html/loot-dialog.html new file mode 100644 index 00000000..df4bb2b4 --- /dev/null +++ b/resources/report/html/loot-dialog.html @@ -0,0 +1,9 @@ + + + + + diff --git a/resources/report/report.html b/resources/report/report.html index a0fb5a65..51782788 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -4,20 +4,22 @@ LOOT + + + + - - - + @@ -216,10 +218,10 @@ along with LOOT. If not, see <http://www.gnu.org/licenses/>. - +
Enable debug logging
-
+
Update masterlist before sorting