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

Fixes to button refreshing

Browse Source
This commit is contained in:
Jeremy Ruston 2013-10-14 13:52:03 +01:00
parent b0f4d72dac
commit 0c73c56b70
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/modules/new_widgets/button.js
View File

@ -71,11 +71,7 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
}; };
ButtonWidget.prototype.isSelected = function() { ButtonWidget.prototype.isSelected = function() {
var title = this.set; var tiddler = this.wiki.getTiddler(this.set);
if(this.qualifyTiddlerTitles) {
title = title + "-" + this.getStateQualifier();
}
var tiddler = this.wiki.getTiddler(title);
return tiddler ? tiddler.fields.text === this.setTo : false; return tiddler ? tiddler.fields.text === this.setTo : false;
}; };
@ -84,24 +80,16 @@ ButtonWidget.prototype.dispatchMessage = function(event) {
}; };
ButtonWidget.prototype.triggerPopup = function(event) { ButtonWidget.prototype.triggerPopup = function(event) {
var title = this.popup;
if(this.qualifyTiddlerTitles) {
title = title + "-" + this.getStateQualifier();
}
$tw.popup.triggerPopup({ $tw.popup.triggerPopup({
domNode: this.domNodes[0], domNode: this.domNodes[0],
title: title, title: this.popup,
wiki: this.wiki wiki: this.wiki
}); });
}; };
ButtonWidget.prototype.setTiddler = function() { ButtonWidget.prototype.setTiddler = function() {
var title = this.set; var tiddler = this.wiki.getTiddler(this.set);
if(this.qualifyTiddlerTitles) { this.wiki.addTiddler(new $tw.Tiddler(tiddler,{title: this.set, text: this.setTo}));
title = title + "-" + this.getStateQualifier();
}
var tiddler = this.wiki.getTiddler(title);
this.wiki.addTiddler(new $tw.Tiddler(tiddler,{title: title, text: this.setTo}));
}; };
/* /*
@ -118,6 +106,16 @@ ButtonWidget.prototype.execute = function() {
this.qualifyTiddlerTitles = this.getAttribute("qualifyTiddlerTitles"); this.qualifyTiddlerTitles = this.getAttribute("qualifyTiddlerTitles");
this["class"] = this.getAttribute("class",""); this["class"] = this.getAttribute("class","");
this.selectedClass = this.getAttribute("selectedClass"); this.selectedClass = this.getAttribute("selectedClass");
// Qualify tiddler titles if required
if(this.qualifyTiddlerTitles) {
var qualifier = this.getStateQualifier();
if(this.set) {
this.set = this.set + "-" + qualifier;
}
if(this.popup) {
this.popup = this.popup + "-" + qualifier;
}
}
// Make child widgets // Make child widgets
this.makeChildWidgets(); this.makeChildWidgets();
}; };
@ -127,7 +125,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
*/ */
ButtonWidget.prototype.refresh = function(changedTiddlers) { ButtonWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes(); var changedAttributes = this.computeAttributes();
if(changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.qualifyTiddlerTitles || changedAttributes["class"] || changedAttributes.selectedClass) { if(changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.qualifyTiddlerTitles || changedAttributes["class"] || changedAttributes.selectedClass || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup])) {
this.refreshSelf(); this.refreshSelf();
return true; return true;
} }