mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-25 06:43:15 +00:00
Code Issues Releases Wiki Activity

Improve checking for missing titles

Browse Source
This commit is contained in:
Jermolene 2016-11-14 15:37:55 +00:00
parent a485eb8588
commit 903cdc09cc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/tiddlywiki/xlsx-utils/importer.js
View File

@ -104,6 +104,10 @@ XLSXImporter.prototype.processRowByColumn = function() {
self.tiddlerFields[name] = cell.w; self.tiddlerFields[name] = cell.w;
} }
}); });
// Skip the tiddler entirely if it doesn't have a title
if(!this.tiddlerFields.title) {
this.skipTiddler = true;
}
}; };
XLSXImporter.prototype.processRowByField = function() { XLSXImporter.prototype.processRowByField = function() {
@ -139,12 +143,6 @@ XLSXImporter.prototype.processField = function(fieldImportSpecTitle) {
value = fieldImportSpec.fields["import-field-value"] value = fieldImportSpec.fields["import-field-value"]
break; break;
} }
if(fieldImportSpec.fields["import-field-prefix"]) {
value = fieldImportSpec.fields["import-field-prefix"] + value;
}
if(fieldImportSpec.fields["import-field-suffix"]) {
value = value + fieldImportSpec.fields["import-field-suffix"];
}
if((value || "").trim() === "") { if((value || "").trim() === "") {
if((fieldImportSpec.fields["import-field-skip-tiddler-if-blank"] || "").trim().toLowerCase() === "yes") { if((fieldImportSpec.fields["import-field-skip-tiddler-if-blank"] || "").trim().toLowerCase() === "yes") {
this.skipTiddler = true; this.skipTiddler = true;
@ -153,6 +151,12 @@ XLSXImporter.prototype.processField = function(fieldImportSpecTitle) {
value = fieldImportSpec.fields["import-field-replace-blank"]; value = fieldImportSpec.fields["import-field-replace-blank"];
} }
} }
if(fieldImportSpec.fields["import-field-prefix"]) {
value = fieldImportSpec.fields["import-field-prefix"] + value;
}
if(fieldImportSpec.fields["import-field-suffix"]) {
value = value + fieldImportSpec.fields["import-field-suffix"];
}
switch(fieldImportSpec.fields["import-field-list-op"] || "none") { switch(fieldImportSpec.fields["import-field-list-op"] || "none") {
case "none": case "none":
this.tiddlerFields[fieldName] = value; this.tiddlerFields[fieldName] = value;