kopia lustrzana https://github.com/miklobit/TiddlyWiki5
Add validation of legal characters for fieldnames
rodzic
45a362c285
commit
bca1d55280
|
@ -5,6 +5,7 @@ ClassicWarning/Upgrade/Caption: upgrade
|
||||||
CloseAll/Button: close all
|
CloseAll/Button: close all
|
||||||
ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"?
|
ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"?
|
||||||
ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"?
|
ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"?
|
||||||
|
InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters and the characters underscore (`_`), hyphen (`-`) and period (`.`)
|
||||||
MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
|
MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
|
||||||
RecentChanges/DateFormat: DDth MMM YYYY
|
RecentChanges/DateFormat: DDth MMM YYYY
|
||||||
RelativeDate/Future/Days: <<period>> days from now
|
RelativeDate/Future/Days: <<period>> days from now
|
||||||
|
|
|
@ -71,10 +71,20 @@ FieldManglerWidget.prototype.handleRemoveFieldEvent = function(event) {
|
||||||
};
|
};
|
||||||
|
|
||||||
FieldManglerWidget.prototype.handleAddFieldEvent = function(event) {
|
FieldManglerWidget.prototype.handleAddFieldEvent = function(event) {
|
||||||
var tiddler = this.wiki.getTiddler(this.mangleTitle);
|
var tiddler = this.wiki.getTiddler(this.mangleTitle),
|
||||||
|
fieldValidatorRegEx = /^[a-z\-\._]+$/mg;
|
||||||
if(tiddler && typeof event.param === "string") {
|
if(tiddler && typeof event.param === "string") {
|
||||||
var name = event.param.toLowerCase();
|
var name = event.param.toLowerCase();
|
||||||
if(name !== "" && !$tw.utils.hop(tiddler.fields,name)) {
|
if(name !== "" && !$tw.utils.hop(tiddler.fields,name)) {
|
||||||
|
if(!fieldValidatorRegEx.test(name)) {
|
||||||
|
alert($tw.language.getString(
|
||||||
|
"InvalidFieldName",
|
||||||
|
{variables:
|
||||||
|
{fieldName: name}
|
||||||
|
}
|
||||||
|
));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
var addition = this.wiki.getModificationFields();
|
var addition = this.wiki.getModificationFields();
|
||||||
addition[name] = "";
|
addition[name] = "";
|
||||||
this.wiki.addTiddler(new $tw.Tiddler(tiddler,addition));
|
this.wiki.addTiddler(new $tw.Tiddler(tiddler,addition));
|
||||||
|
|
Ładowanie…
Reference in New Issue