Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 333-localization-i18n
Browse files Browse the repository at this point in the history
  • Loading branch information
kennethbruskiewicz committed Dec 8, 2023
2 parents 30e8a73 + c6fa6e3 commit d51f295
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions lib/DataHarmonizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,7 @@ class DataHarmonizer {
colHeaders: true,
rowHeaders: true,
copyPaste: true,
contextMenu: ['remove_row', 'row_above', 'row_below'],
manualColumnResize: true,
//colWidths: [100], //Just fixes first column width
minRows: 100,
Expand Down Expand Up @@ -611,9 +612,11 @@ class DataHarmonizer {
afterSelection: (row, column, row2, column2) => {
self.current_selection = [row, column, row2, column2];
if (this.helpSidebar) {
const field = self.getFields()[column];
const helpContent = self.getComment(field);
self.helpSidebar.setContent(helpContent);
if (column > -1) {
const field = self.getFields()[column];
const helpContent = self.getComment(field);
self.helpSidebar.setContent(helpContent);
} else self.helpSidebar.close();
}
},

Expand Down Expand Up @@ -1447,8 +1450,6 @@ class DataHarmonizer {
},
}) // must be rendered when html is visible
.on('change', function () {
console.log('on change in selectize');

let newValCsv = i18next.t('multiselect.label', {
value: $('#field-description-text .multiselect').val(),
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "data-harmonizer",
"version": "1.6.1",
"version": "1.6.4",
"description": "A standardized spreadsheet editor and validator that can be run offline and locally",
"repository": "[email protected]:cidgoh/DataHarmonizer.git",
"license": "MIT",
Expand Down

0 comments on commit d51f295

Please sign in to comment.