mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 18:17:20 +00:00
Code Issues Releases Wiki Activity

Fix checkbox widget to work with missing tiddlers

Browse Source
This commit is contained in:
Jermolene 2014-07-24 15:43:37 +01:00
parent 2a887a5bac
commit eecb9126cd
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
core/modules/widgets/checkbox.js
View File

@ -68,6 +68,18 @@ CheckboxWidget.prototype.getValue = function() {
return false; return false;
} }
} }
} else {
if(this.checkboxTag) {
return false;
}
if(this.checkboxField) {
if(this.checkboxDefault === this.checkboxChecked) {
return true;
}
if(this.checkboxDefault === this.checkboxUnchecked) {
return false;
}
}
} }
return false; return false;
}; };
@ -75,32 +87,30 @@ CheckboxWidget.prototype.getValue = function() {
CheckboxWidget.prototype.handleChangeEvent = function(event) { CheckboxWidget.prototype.handleChangeEvent = function(event) {
var checked = this.inputDomNode.checked, var checked = this.inputDomNode.checked,
tiddler = this.wiki.getTiddler(this.checkboxTitle), tiddler = this.wiki.getTiddler(this.checkboxTitle),
newFields = {}, newFields = {title: this.checkboxTitle, text: ""},
hasChanged = false; hasChanged = false;
if(tiddler) { // Set the tag if specified
// Set the tag if specified if(this.checkboxTag && (!tiddler || tiddler.hasTag(this.checkboxTag) !== checked)) {
if(this.checkboxTag && tiddler.hasTag(this.checkboxTag) !== checked) { newFields.tags = tiddler ? (tiddler.fields.tags || []).slice(0) : [];
newFields.tags = (tiddler.fields.tags || []).slice(0); var pos = newFields.tags.indexOf(this.checkboxTag);
var pos = newFields.tags.indexOf(this.checkboxTag); if(pos !== -1) {
if(pos !== -1) { newFields.tags.splice(pos,1);
newFields.tags.splice(pos,1); }
} if(checked) {
if(checked) { newFields.tags.push(this.checkboxTag);
newFields.tags.push(this.checkboxTag); }
} hasChanged = true;
}
// Set the field if specified
if(this.checkboxField) {
var value = checked ? this.checkboxChecked : this.checkboxUnchecked;
if(!tiddler || tiddler.fields[this.checkboxField] !== value) {
newFields[this.checkboxField] = value;
hasChanged = true; hasChanged = true;
} }
// Set the field if specified }
if(this.checkboxField) { if(hasChanged) {
var value = checked ? this.checkboxChecked : this.checkboxUnchecked; this.wiki.addTiddler(new $tw.Tiddler(tiddler,newFields,this.wiki.getModificationFields()));
if(tiddler.fields[this.checkboxField] !== value) {
newFields[this.checkboxField] = value;
hasChanged = true;
}
}
if(hasChanged) {
this.wiki.addTiddler(new $tw.Tiddler(tiddler,newFields,this.wiki.getModificationFields()));
}
} }
}; };