From fd70aa8c45f0f6049e044469b4f7c997ac31ce15 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sat, 2 Nov 2013 15:42:24 +0000 Subject: [PATCH] Get rid of the qualifyTiddlerTitles hack Now, finally, we can implement qualifyTiddlerTitles as a macro. --- core/modules/macros/qualify.js | 32 +++++++++++++++++ core/modules/new_widgets/button.js | 13 +------ core/modules/new_widgets/edit-text.js | 8 ----- core/modules/new_widgets/reveal.js | 6 +--- core/ui/FieldEditor.tid | 5 ++- core/ui/MissingTemplate.tid | 4 +-- core/ui/MoreSideBar.tid | 36 +++++++++---------- core/ui/SideBar.tid | 10 +++--- core/ui/TagTemplate.tid | 4 +-- core/ui/TagsEditor.tid | 4 +-- core/ui/TiddlerInfo.tid | 12 +++---- core/ui/UntaggedTemplate.tid | 4 +-- core/ui/ViewTemplate/title.tid | 4 +-- .../tw5.com/tiddlers/widgets/ButtonWidget.tid | 1 - .../tiddlers/widgets/EditTextWidget.tid | 1 - .../tw5.com/tiddlers/widgets/RevealWidget.tid | 1 - 16 files changed, 75 insertions(+), 70 deletions(-) create mode 100644 core/modules/macros/qualify.js diff --git a/core/modules/macros/qualify.js b/core/modules/macros/qualify.js new file mode 100644 index 000000000..de9dc6c8e --- /dev/null +++ b/core/modules/macros/qualify.js @@ -0,0 +1,32 @@ +/*\ +title: $:/core/modules/macros/qualify.js +type: application/javascript +module-type: macro + +Macro to qualify a state tiddler title according + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Information about this macro +*/ + +exports.name = "qualify"; + +exports.params = [ + {name: "title"} +]; + +/* +Run the macro +*/ +exports.run = function(title) { + return title + "-" + this.getStateQualifier(); +}; + +})(); diff --git a/core/modules/new_widgets/button.js b/core/modules/new_widgets/button.js index 47dfe1422..5e582aa76 100644 --- a/core/modules/new_widgets/button.js +++ b/core/modules/new_widgets/button.js @@ -114,20 +114,9 @@ ButtonWidget.prototype.execute = function() { this.setTo = this.getAttribute("setTo"); this.popup = this.getAttribute("popup"); this.hover = this.getAttribute("hover"); - this.qualifyTiddlerTitles = this.getAttribute("qualifyTiddlerTitles"); this["class"] = this.getAttribute("class",""); this.style = this.getAttribute("style"); 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 this.makeChildWidgets(); }; @@ -137,7 +126,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ ButtonWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.qualifyTiddlerTitles || changedAttributes["class"] || changedAttributes.selectedClass || changedAttributes.style || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup])) { + if(changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes["class"] || changedAttributes.selectedClass || changedAttributes.style || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup])) { this.refreshSelf(); return true; } diff --git a/core/modules/new_widgets/edit-text.js b/core/modules/new_widgets/edit-text.js index b5d1f0d49..6b2c10a26 100644 --- a/core/modules/new_widgets/edit-text.js +++ b/core/modules/new_widgets/edit-text.js @@ -115,14 +115,6 @@ EditTextWidget.prototype.execute = function() { this.editClass = this.getAttribute("class"); this.editPlaceholder = this.getAttribute("placeholder"); this.editFocusPopup = this.getAttribute("focusPopup"); - this.qualifyTiddlerTitles = this.getAttribute("qualifyTiddlerTitles");; - // Qualify tiddler titles if required - if(this.qualifyTiddlerTitles) { - var qualifier = this.getStateQualifier(); - if(this.editFocusPopup) { - this.editFocusPopup = this.editFocusPopup + "-" + qualifier; - } - } // Get the editor element tag and type var tag,type; if(this.editField === "text") { diff --git a/core/modules/new_widgets/reveal.js b/core/modules/new_widgets/reveal.js index 5cdc06e0a..8c27353c2 100755 --- a/core/modules/new_widgets/reveal.js +++ b/core/modules/new_widgets/reveal.js @@ -87,15 +87,11 @@ RevealWidget.prototype.execute = function() { this.position = this.getAttribute("position"); this["class"] = this.getAttribute("class",""); this["default"] = this.getAttribute("default",""); - this.qualifyTiddlerTitles = this.getAttribute("qualifyTiddlerTitles"); this.animate = this.getAttribute("animate","no"); this.openAnimation = this.animate === "no" ? undefined : "open"; this.closeAnimation = this.animate === "no" ? undefined : "close"; // Compute the title of the state tiddler and read it this.stateTitle = this.state; - if(this.qualifyTiddlerTitles) { - this.stateTitle = this.stateTitle + "-" + this.getStateQualifier(); - } this.readState(); // Construct the child widgets var childNodes = this.isOpen ? this.parseTreeNode.children : []; @@ -154,7 +150,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of */ RevealWidget.prototype.refresh = function(changedTiddlers) { var changedAttributes = this.computeAttributes(); - if(changedAttributes.state || changedAttributes.type || changedAttributes.text || changedAttributes.position || changedAttributes["default"] || changedAttributes.qualifyTiddlerTitles || changedAttributes.animate) { + if(changedAttributes.state || changedAttributes.type || changedAttributes.text || changedAttributes.position || changedAttributes["default"] || changedAttributes.animate) { this.refreshSelf(); return true; } else { diff --git a/core/ui/FieldEditor.tid b/core/ui/FieldEditor.tid index 5668c43b2..89b7be097 100644 --- a/core/ui/FieldEditor.tid +++ b/core/ui/FieldEditor.tid @@ -1,13 +1,12 @@ title: $:/core/ui/FieldEditor -<$fieldmangler><$setvariable name="targetTiddler" value=<>>
-<$list filter="[is[current]fields[]] -title -tags -text -creator -created -modified -modifier -[[draft.title]] -[[draft.of]]"> +<$fieldmangler>
+
<>:<$edit-text tiddler=<> field=<> placeholder="field value"/><$button message="tw-remove-field" param=<> class="btn-invisible">{{$:/core/images/delete-button}}
<$list filter="[is[current]fields[]] -title -tags -text -creator -created -modified -modifier -[[draft.title]] -[[draft.of]]" variable="currentField">
<>:<$edit-text tiddler=<> field=<> placeholder="field value"/><$button message="tw-remove-field" param=<> class="btn-invisible">{{$:/core/images/delete-button}}
-
Add a new field: <$edit-text tiddler="$:/NewFieldName" tag="input" default="" placeholder="field name" class="tw-edit-texteditor"/> <$button message="tw-add-field" param={{$:/NewFieldName}} set="$:/NewFieldName" setTo="" class="">add
diff --git a/core/ui/MissingTemplate.tid b/core/ui/MissingTemplate.tid index f858c5e3b..415dc9d1c 100644 --- a/core/ui/MissingTemplate.tid +++ b/core/ui/MissingTemplate.tid @@ -1,7 +1,7 @@ title: $:/core/ui/MissingTemplate -
<$button popup="$:/state/missingpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-missing-tiddler-label"><$view field="title" format="text" /> -<$reveal state="$:/state/missingpopup" type="popup" position="below" qualifyTiddlerTitles="yes" animate="yes">
+
<$button popup=<> class="btn-invisible tw-missing-tiddler-label"><$view field="title" format="text" /> +<$reveal state=<> type="popup" position="below" animate="yes">
<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
<$list filter="[is[current]backlinks[]sort[title]]" template="$:/core/ui/ListItemTemplate"/> diff --git a/core/ui/MoreSideBar.tid b/core/ui/MoreSideBar.tid index edb90162e..1d90d22c3 100644 --- a/core/ui/MoreSideBar.tid +++ b/core/ui/MoreSideBar.tid @@ -2,48 +2,48 @@ title: $:/core/ui/MoreSideBar
-<$button type="set" set="$:/state/moreSideBarTabSet" setTo="allTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">All +<$button type="set" set=<> setTo="allTab" selectedClass="tw-tab-selected">All -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="recentTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Recent +<$button type="set" set=<> setTo="recentTab" selectedClass="tw-tab-selected">Recent -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="tagsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tags +<$button type="set" set=<> setTo="tagsTab" selectedClass="tw-tab-selected">Tags -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="missingTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Missing +<$button type="set" set=<> setTo="missingTab" selectedClass="tw-tab-selected">Missing -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="draftsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Drafts +<$button type="set" set=<> setTo="draftsTab" selectedClass="tw-tab-selected">Drafts -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="orphanTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Orphans +<$button type="set" set=<> setTo="orphanTab" selectedClass="tw-tab-selected">Orphans -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="typeTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Types +<$button type="set" set=<> setTo="typeTab" selectedClass="tw-tab-selected">Types -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="systemTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">System +<$button type="set" set=<> setTo="systemTab" selectedClass="tw-tab-selected">System -<$button type="set" set="$:/state/moreSideBarTabSet" setTo="shadowsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Shadows +<$button type="set" set=<> setTo="shadowsTab" selectedClass="tw-tab-selected">Shadows
-<$reveal type="match" state="$:/state/moreSideBarTabSet" text="allTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="allTab"> <$list filter="[!is[system]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/> -<$reveal type="match" state="$:/state/moreSideBarTabSet" text="recentTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="recentTab"> {{$:/snippets/recentchanges}} -<$reveal type="match" state="$:/state/moreSideBarTabSet" text="tagsTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="tagsTab"> <$list filter="[tags[]sort[title]]" itemClass="tw-menu-list-item"> <$transclude tiddler="$:/core/ui/TagTemplate"/> <$count filter="[is[current]tagging[]]"/> ---- {{$:/core/ui/UntaggedTemplate}} <$count filter="[untagged[]!is[system]] -[tags[]]"/> -<$reveal type="match" state="$:/state/moreSideBarTabSet" text="missingTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="missingTab"> <$list filter="[is[missing]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/MissingTemplate"/> -<$reveal type="match" state="$:/state/moreSideBarTabSet" text="draftsTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="draftsTab"> <$list filter="[has[draft.of]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/> -<$reveal type="match" state="$:/state/moreSideBarTabSet" text="orphanTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="orphanTab"> <$list filter="[is[orphan]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/> -<$reveal type="match" state="$:/state/moreSideBarTabSet" text="typeTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="typeTab"> <$list filter="[!is[system]has[type]each[type]sort[type]]">
<$view field="type"/> @@ -55,10 +55,10 @@ title: $:/core/ui/MoreSideBar
-<$reveal type="match" state="$:/state/moreSideBarTabSet" text="systemTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="systemTab"> <$list filter="[is[system]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/> -<$reveal type="match" state="$:/state/moreSideBarTabSet" text="shadowsTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="shadowsTab"> <$list filter="[is[shadow]sort[title]]" itemClass="tw-menu-list-item" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/SideBar.tid b/core/ui/SideBar.tid index 253977a6b..16b25a8d9 100644 --- a/core/ui/SideBar.tid +++ b/core/ui/SideBar.tid @@ -25,23 +25,23 @@ title: $:/core/ui/SideBar <$reveal state="$:/temp/search" type="match" text="">
-
<$button type="set" set="$:/state/sideBarTabSet" setTo="openTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Open<$button type="set" set="$:/state/sideBarTabSet" setTo="recentTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Recent<$button type="set" set="$:/state/sideBarTabSet" setTo="toolsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tools<$button type="set" set="$:/state/sideBarTabSet" setTo="moreTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">More
+
<$button type="set" set=<> setTo="openTab" selectedClass="tw-tab-selected">Open<$button type="set" set=<> setTo="recentTab" selectedClass="tw-tab-selected">Recent<$button type="set" set=<> setTo="toolsTab" selectedClass="tw-tab-selected">Tools<$button type="set" set=<> setTo="moreTab" selectedClass="tw-tab-selected">More
-<$reveal type="match" state="$:/state/sideBarTabSet" text="openTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="openTab"> <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" listview="pop" itemClass="tw-menu-list-item tw-open-tiddler-list"> <$button message="tw-close-tiddler" class="btn-invisible btn-mini">× <$link to={{!!title}}><$view field="title"/> <$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini">close all -<$reveal type="match" state="$:/state/sideBarTabSet" text="recentTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="recentTab"> {{$:/snippets/recentchanges}} -<$reveal type="match" state="$:/state/sideBarTabSet" text="toolsTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="toolsTab"> {{$:/core/ui/ToolsPanel}} -<$reveal type="match" state="$:/state/sideBarTabSet" text="moreTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="moreTab"> {{$:/core/ui/MoreSideBar}}
diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid index 9c9ff0121..9fe592cbb 100644 --- a/core/ui/TagTemplate.tid +++ b/core/ui/TagTemplate.tid @@ -3,8 +3,8 @@ title: $:/core/ui/TagTemplate \define tag-styles() background-color:$(backgroundColor)$; \end -<$setvariable name="backgroundColor" value={{!!color}}><$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-tag-label" style=<>><$transclude tiddler={{!!icon}}/> <$view field="title" format="text" /> -<$reveal state="$:/state/tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" animate="yes">
<$transclude tiddler="$:/core/ui/ListItemTemplate"/> +<$setvariable name="backgroundColor" value={{!!color}}><$button popup=<> class="btn-invisible tw-tag-label" style=<>><$transclude tiddler={{!!icon}}/> <$view field="title" format="text" /> +<$reveal state=<> type="popup" position="below" animate="yes">
<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
<$list filter="[is[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/TagsEditor.tid b/core/ui/TagsEditor.tid index 637e2a127..d9e4fcb55 100644 --- a/core/ui/TagsEditor.tid +++ b/core/ui/TagsEditor.tid @@ -6,10 +6,10 @@ background-color:$(backgroundColor)$; <$fieldmangler>
<$list filter="[is[current]tags[]sort[title]]" listview="pop" itemClass="tw-tag-editor-label"><$setvariable name="backgroundColor" value={{!!color}}>> class="tw-tag-label"><$view field="title" format="text" /><$button message="tw-remove-tag" param={{!!title}} class="btn-invisible tw-remove-tag-button">×
-
Add a new tag: <$edit-text tiddler="$:/NewTagName" tag="input" default="" placeholder="tag name" focusPopup="$:/state/tagsAutoComplete" qualifyTiddlerTitles="yes" class="tw-edit-texteditor"/> <$button popup="$:/state/tagsAutoComplete" qualifyTiddlerTitles="yes" class="btn-invisible">{{$:/core/images/down-arrow}} <$button message="tw-add-tag" param={{$:/NewTagName}} set="$:/NewTagName" setTo="" class="">add
+
Add a new tag: <$edit-text tiddler="$:/NewTagName" tag="input" default="" placeholder="tag name" focusPopup=<> class="tw-edit-texteditor"/> <$button popup=<> class="btn-invisible">{{$:/core/images/down-arrow}} <$button message="tw-add-tag" param={{$:/NewTagName}} set="$:/NewTagName" setTo="" class="">add
-<$reveal state="$:/state/tagsAutoComplete" qualifyTiddlerTitles="yes" type="nomatch" text="" default=""> +<$reveal state=<> type="nomatch" text="" default="">
<$linkcatcher set="$:/NewTagName" setTo="" message="tw-add-tag"><$list filter="[!is[shadow]tags[]search{$:/NewTagName}sort[title]]"><$link><$setvariable name="backgroundColor" value={{!!color}}>> class="tw-tag-label"><$view field="title" format="text"/> diff --git a/core/ui/TiddlerInfo.tid b/core/ui/TiddlerInfo.tid index 524e6a5c7..118c4e85c 100644 --- a/core/ui/TiddlerInfo.tid +++ b/core/ui/TiddlerInfo.tid @@ -1,23 +1,23 @@ title: $:/core/ui/TiddlerInfo -
<$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="refTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">References<$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="taggingTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Tagging<$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="listTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">List<$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="listedTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Listed<$button type="set" set="$:/state/tiddlerDropDownTabSet" setTo="fieldsTab" qualifyTiddlerTitles="yes" selectedClass="tw-tab-selected">Fields
+
<$button type="set" set=<> setTo="refTab" selectedClass="tw-tab-selected">References<$button type="set" set=<> setTo="taggingTab" selectedClass="tw-tab-selected">Tagging<$button type="set" set=<> setTo="listTab" selectedClass="tw-tab-selected">List<$button type="set" set=<> setTo="listedTab" selectedClass="tw-tab-selected">Listed<$button type="set" set=<> setTo="fieldsTab" selectedClass="tw-tab-selected">Fields
-<$reveal type="match" state="$:/state/tiddlerDropDownTabSet" text="refTab" default="refTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="refTab" default="refTab"> <$list filter="[is[current]backlinks[]sort[title]]" emptyMessage="No tiddlers link to this one" template="$:/core/ui/ListItemTemplate"> -<$reveal type="match" state="$:/state/tiddlerDropDownTabSet" text="taggingTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="taggingTab"> <$list filter="[is[current]tagging[]]" itemClass="tw-menu-list-item" emptyMessage="No tiddlers are tagged with this one" template="$:/core/ui/ListItemTemplate"/> -<$reveal type="match" state="$:/state/tiddlerDropDownTabSet" text="listTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="listTab"> <$list filter="[list{!!title}]" itemClass="tw-menu-list-item" emptyMessage="This tiddler does not have a list" template="$:/core/ui/ListItemTemplate"/> -<$reveal type="match" state="$:/state/tiddlerDropDownTabSet" text="listedTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="listedTab"> <$list filter="[is[current]listed[]!is[system]]" itemClass="tw-menu-list-item" emptyMessage="This tiddler is not listed by any others" template="$:/core/ui/ListItemTemplate"/> -<$reveal type="match" state="$:/state/tiddlerDropDownTabSet" text="fieldsTab" qualifyTiddlerTitles="yes"> +<$reveal type="match" state=<> text="fieldsTab"> <$transclude tiddler="$:/core/ui/TiddlerFields"/>
diff --git a/core/ui/UntaggedTemplate.tid b/core/ui/UntaggedTemplate.tid index a6a7e89b3..67198a1b1 100644 --- a/core/ui/UntaggedTemplate.tid +++ b/core/ui/UntaggedTemplate.tid @@ -1,6 +1,6 @@ title: $:/core/ui/UntaggedTemplate -<$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-untagged-label tw-tag-label">untagged -<$reveal state="$:/state/tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes">
+<$button popup=<> class="btn-invisible tw-untagged-label tw-tag-label">untagged +<$reveal state=<> type="popup" position="below">
<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid index f20534216..72973a641 100644 --- a/core/ui/ViewTemplate/title.tid +++ b/core/ui/ViewTemplate/title.tid @@ -4,11 +4,11 @@ tags: $:/tags/ViewTemplate \define title-styles() fill:$(foregroundColor)$; \end -
<$button popup="$:/state/tiddlerInfo" qualifyTiddlerTitles="yes" class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}}<$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button}}<$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button}} +
<$button popup=<> class="btn-invisible" selectedClass="tw-selected">{{$:/core/images/info-button}}<$button message="tw-edit-tiddler" class="btn-invisible">{{$:/core/images/edit-button}}<$button message="tw-close-tiddler" class="btn-invisible">{{$:/core/images/close-button}} <$setvariable name="foregroundColor" value={{!!color}}>>><$transclude tiddler={{!!icon}}/> <$view field="title"/>
-<$reveal type="nomatch" text="" default="" state="$:/state/tiddlerInfo" qualifyTiddlerTitles="yes" class="tw-tiddler-info" animate="yes"> +<$reveal type="nomatch" text="" default="" state=<> class="tw-tiddler-info" animate="yes"> <$transclude tiddler="$:/core/ui/TiddlerInfo"/> diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid index 3e9b9c471..6dba32189 100644 --- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid @@ -23,7 +23,6 @@ The content of the `<$button>` widget is displayed within the button. |set |The title of a tiddler to which a new value will be assigned | |setTo |The new value to assign to the tiddler identified in the `set` attribute | |popup |Title of a state tiddler for a popup that is toggled when the button is clicked | -|qualifyTiddlerTitles |If this attribute is present then the state tiddler titles specified in the `set` and `popup` attributes are qualified as described in HandlingUserInterfaceState | |class |An optional CSS class name to be assigned to the HTML element | |style |An optional CSS style attribute to be assigned to the HTML element | |selectedClass |An optional additional CSS class to be assigned if the popup is triggered or the tiddler specified in `set` already has the value specified in `setTo` | diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid index 176819838..5bcccf1f5 100644 --- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid @@ -23,6 +23,5 @@ The content of the `<$edit-text>` widget is ignored. |class |A CSS class to be assigned to the generated HTML editing element | |placeholder |Placeholder text to be displayed when the edit field is empty | |focusPopup |Title of a state tiddler for a popup that is displayed when the editing element has focus | -|qualifyTiddlerTitles |If this attribute is present then the state tiddler title specified in the `focusPopup` attributes are qualified as described in HandlingUserInterfaceState | |tag |Overrides the generated HTML editing element tag | |type |Overrides the generated HTML editing element `type` attribute | diff --git a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid index 928daf6d9..5ff1d6f64 100644 --- a/editions/tw5.com/tiddlers/widgets/RevealWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/RevealWidget.tid @@ -23,4 +23,3 @@ The content of the `<$reveal>` widget is displayed according to the rules given |text |The text to match when the type is ''match'' and ''nomatch'' | |position |The position used for the popup when the type is ''popup''. Can be ''left'',''above'',''aboveright'',''right'',''belowleft'' or ''below'' | |default |Default value to use when the state tiddler | -|qualifyTiddlerTitles |If this attribute is present then the state tiddler title is qualified as described in HandlingUserInterfaceState |