mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-07-03 02:23:00 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into demo-alternate-store

Browse Source
This commit is contained in:
Jeremy Ruston 2023-07-13 17:57:42 +01:00
commit e3255a4d2a
9 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/modules/utils/dom/http.js
View File

@ -106,8 +106,8 @@ function HttpClientRequest(options) {
this.wiki = options.wiki; this.wiki = options.wiki;
this.completionActions = options.oncompletion; this.completionActions = options.oncompletion;
this.progressActions = options.onprogress; this.progressActions = options.onprogress;
this.bindStatus = options["bind-status"]; this.bindStatus = options["bindStatus"];
this.bindProgress = options["bind-progress"]; this.bindProgress = options["bindProgress"];
this.method = options.method || "GET"; this.method = options.method || "GET";
this.body = options.body || ""; this.body = options.body || "";
this.variables = options.variables; this.variables = options.variables;
@ -132,7 +132,7 @@ HttpClientRequest.prototype.send = function(callback) {
var self = this, var self = this,
setBinding = function(title,text) { setBinding = function(title,text) {
if(title) { if(title) {
this.wiki.addTiddler(new $tw.Tiddler({title: title, text: text})); self.wiki.addTiddler(new $tw.Tiddler({title: title, text: text}));
} }
}; };
if(this.url) { if(this.url) {

4
core/modules/widgets/select.js
View File

@ -145,6 +145,7 @@ SelectWidget.prototype.execute = function() {
this.selectDefault = this.getAttribute("default"); this.selectDefault = this.getAttribute("default");
this.selectMultiple = this.getAttribute("multiple", false); this.selectMultiple = this.getAttribute("multiple", false);
this.selectSize = this.getAttribute("size"); this.selectSize = this.getAttribute("size");
this.selectTabindex = this.getAttribute("tabindex");
this.selectTooltip = this.getAttribute("tooltip"); this.selectTooltip = this.getAttribute("tooltip");
this.selectFocus = this.getAttribute("focus"); this.selectFocus = this.getAttribute("focus");
// Make the child widgets // Make the child widgets
@ -162,6 +163,9 @@ SelectWidget.prototype.execute = function() {
if(this.selectSize) { if(this.selectSize) {
$tw.utils.addAttributeToParseTreeNode(selectNode,"size",this.selectSize); $tw.utils.addAttributeToParseTreeNode(selectNode,"size",this.selectSize);
} }
if(this.selectTabindex) {
$tw.utils.addAttributeToParseTreeNode(selectNode,"tabindex",this.selectTabindex);
}
if(this.selectTooltip) { if(this.selectTooltip) {
$tw.utils.addAttributeToParseTreeNode(selectNode,"title",this.selectTooltip); $tw.utils.addAttributeToParseTreeNode(selectNode,"title",this.selectTooltip);
} }

3
editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Example Zotero.tid
View File

@ -6,7 +6,7 @@ Specify the Zotero group ID to import
<$edit-text tiddler="$:/config/zotero-group" tag="input"/> or <$edit-text tiddler="$:/config/zotero-group" tag="input"/> or
<$select tiddler="$:/config/zotero-group"> <$select tiddler="$:/config/zotero-group">
<option value="4813312">com216</option> <option value="4813312">com216</option>
<option value="4913310">pos252</option> <option value="4914891">steve-sunypoly</option>
<option value="4747244">idt575</option> <option value="4747244">idt575</option>
</$select> </$select>
\end \end
@ -16,6 +16,7 @@ Specify the Zotero group ID to import
$basetitle={{{ =[[_zotero_import ]] =[<item>jsonget[key]] =[[ ]] =[<item>jsonget[title]] +[join[]] }}} $basetitle={{{ =[[_zotero_import ]] =[<item>jsonget[key]] =[[ ]] =[<item>jsonget[title]] +[join[]] }}}
text={{{ [<item>jsonget[title]] }}} text={{{ [<item>jsonget[title]] }}}
tags="$:/tags/ZoteroImport" tags="$:/tags/ZoteroImport"
zotero-group={{$:/config/zotero-group}}
> >
<$action-setmultiplefields $tiddler=<<createTiddler-title>> $fields="[<item>jsonindexes[]addprefix[zotero-]]" $values="[<item>jsonindexes[]] :map[<item>jsonget<currentTiddler>else[.XXXXX.]]"/> <$action-setmultiplefields $tiddler=<<createTiddler-title>> $fields="[<item>jsonindexes[]addprefix[zotero-]]" $values="[<item>jsonindexes[]] :map[<item>jsonget<currentTiddler>else[.XXXXX.]]"/>
<$list filter="[<item>jsonindexes[creators]]" variable="creatorIndex"> <$list filter="[<item>jsonindexes[creators]]" variable="creatorIndex">

2
editions/tw5.com/tiddlers/releasenotes/Releases.tid
View File

@ -4,6 +4,6 @@ tags: About
title: Releases title: Releases
type: text/vnd.tiddlywiki type: text/vnd.tiddlywiki
New releases of TiddlyWiki and TiddlyDesktop are announced via the [[official discussion groups|Forums]] and [[Twitter|https://twitter.com/TiddlyWiki]] (you can also subscribe to an Atom/RSS feed of [[TiddlyWiki releases from GitHub|https://github.com/jermolene/tiddlywiki5/releases.atom]]) New releases of TiddlyWiki and TiddlyDesktop are announced via the [[official discussion groups|Forums]] and [[Twitter|https://twitter.com/TiddlyWiki]]
<<tabs "[[TiddlyWiki Releases]] [[TiddlyDesktop Releases]]" "TiddlyWiki Releases" "$:/state/tab">> <<tabs "[[TiddlyWiki Releases]] [[TiddlyDesktop Releases]]" "TiddlyWiki Releases" "$:/state/tab">>

2
editions/tw5.com/tiddlers/releasenotes/TiddlyWiki Releases.tid
View File

@ -5,7 +5,7 @@ tags: Releases
title: TiddlyWiki Releases title: TiddlyWiki Releases
type: text/vnd.tiddlywiki type: text/vnd.tiddlywiki
Here are the details of recent releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named. Note that archived versions of release source files are available at https://github.com/Jermolene/TiddlyWiki5/releases Here are the details of recent releases of TiddlyWiki5. See [[TiddlyWiki5 Versioning]] for details of how releases are named.
If you are using node.js, you can also install prior versions like this: If you are using node.js, you can also install prior versions like this:

2
editions/tw5.com/tiddlers/widgets/SelectWidget.tid
View File

@ -41,7 +41,7 @@ The content of the `<$select>` widget should be one or more HTML `<option>` or `
|size |The number of rows to display in multiple selection mode | |size |The number of rows to display in multiple selection mode |
|actions |A string containing ActionWidgets to be triggered when the key combination is detected | |actions |A string containing ActionWidgets to be triggered when the key combination is detected |
|focus |<<.from-version "5.2.4">> Optional. Set to "yes" to automatically focus the HTML select element after creation | |focus |<<.from-version "5.2.4">> Optional. Set to "yes" to automatically focus the HTML select element after creation |
|tabindex |<<.from-version "5.3.1">> Optional. Sets the `tabindex` attribute of the HTML select element to the given value |
! Examples ! Examples
!! Simple Lists !! Simple Lists

2
editions/tw5.com/tiddlers/wikitext/Anchor Links using HTML.tid
View File

@ -46,7 +46,7 @@ That's it.
<a id="#Bottom_of_tiddler"></a> <a id="#Bottom_of_tiddler"></a>
``` ```
*Add an <<.attr id>> attribute to any HTML5 tag and place a single `#` before the 'address' value. <a href="##Suggestions%0">Here are some suggestions of tags you can use.</a> *Add an <<.attr id>> attribute to any HTML5 tag and place a single `#` before the 'address' value. <a href=<<qualify "##Suggestions-for-elements">>>Here are some suggestions of tags you can use.</a>
* Place this code at the target location. E.g. at the bottom of the tiddler. * Place this code at the target location. E.g. at the bottom of the tiddler.
''Step 2: Create a link to the target anchor'' ''Step 2: Create a link to the target anchor''

2
editions/tw5.com/tiddlers/wikitext/Widget Attributes.tid
View File

@ -8,7 +8,7 @@ Attributes of HTML elements and widgets can be specified in several different wa
* [[a literal string|Literal Attribute Values]] * [[a literal string|Literal Attribute Values]]
* [[a transclusion of a textReference|Transcluded Attribute Values]] * [[a transclusion of a textReference|Transcluded Attribute Values]]
* [[a transclusion of a macro/variable|Transcluded Attribute Values]] * [[a transclusion of a macro/variable|Variable Attribute Values]]
* [[as the result of a filter expression|Filtered Attribute Values]] * [[as the result of a filter expression|Filtered Attribute Values]]
* <<.from-version "5.3.0">> [[as the result of performing filter and variable substitutions on the given string|Substituted Attribute Values]] * <<.from-version "5.3.0">> [[as the result of performing filter and variable substitutions on the given string|Substituted Attribute Values]]

1
plugins/tiddlywiki/jasmine/jasmine-plugin.js
View File

@ -94,6 +94,7 @@ exports.runTests = function(callback,specFilter) {
if($tw.browser) { if($tw.browser) {
window.jasmineRequire = jasmineCore; window.jasmineRequire = jasmineCore;
$tw.modules.execute("$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core/jasmine-html.js"); $tw.modules.execute("$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core/jasmine-html.js");
// Prevent jasmine-core/boot.js from installing its own onload handler. We'll execute it explicitly when everything is ready
var previousOnloadHandler = window.onload; var previousOnloadHandler = window.onload;
window.onload = function() {}; window.onload = function() {};
$tw.modules.execute("$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core/boot.js"); $tw.modules.execute("$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core/boot.js");