mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Fix: reveal widget prevent undefined state (#3848)

Browse Source 
the state didn't fall back to the default when there was no data-item to extract for a stateIndex

see the google group for a bug report: https://groups.google.com/forum/#!topic/TiddlyWiki/3jiFpayAIRc
This commit is contained in:
Simon Huber 2019-03-11 10:04:17 +01:00 committed by Jeremy Ruston
parent 256321cd42
commit c9b16d88f3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/modules/widgets/reveal.js
View File

@ -118,17 +118,18 @@ Read the state tiddler
*/ */
RevealWidget.prototype.readState = function() { RevealWidget.prototype.readState = function() {
// Read the information from the state tiddler // Read the information from the state tiddler
var state; var state,
defaultState = this["default"] || this.getVariable("currentTiddler");
if(this.stateTitle) { if(this.stateTitle) {
var stateTitleTiddler = this.wiki.getTiddler(this.stateTitle); var stateTitleTiddler = this.wiki.getTiddler(this.stateTitle);
if(this.stateField) { if(this.stateField) {
state = stateTitleTiddler ? stateTitleTiddler.getFieldString(this.stateField) : this["default"] || this.getVariable("currentTiddler"); state = stateTitleTiddler ? stateTitleTiddler.getFieldString(this.stateField) || defaultState : defaultState;
} else if(this.stateIndex) { } else if(this.stateIndex) {
state = stateTitleTiddler ? this.wiki.extractTiddlerDataItem(this.stateTitle,this.stateIndex) : this["default"] || this.getVariable("currentTiddler"); state = stateTitleTiddler ? this.wiki.extractTiddlerDataItem(this.stateTitle,this.stateIndex) || defaultState : defaultState;
} else if(stateTitleTiddler) { } else if(stateTitleTiddler) {
state = this.wiki.getTiddlerText(this.stateTitle) || this["default"] || this.getVariable("currentTiddler"); state = this.wiki.getTiddlerText(this.stateTitle) || defaultState;
} else { } else {
state = this["default"] || this.getVariable("currentTiddler"); state = defaultState;
} }
} else { } else {
state = this.stateTiddlerTitle ? this.wiki.getTextReference(this.state,this["default"],this.getVariable("currentTiddler")) : this["default"]; state = this.stateTiddlerTitle ? this.wiki.getTextReference(this.state,this["default"],this.getVariable("currentTiddler")) : this["default"];