diff --git a/.gitignore b/.gitignore index ad7e8e07f..351c576ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store .c9/ +.vs/ .vscode/ tmp/ output/ diff --git a/bin/build-site.sh b/bin/build-site.sh index b77a18434..a9133c2b7 100755 --- a/bin/build-site.sh +++ b/bin/build-site.sh @@ -5,7 +5,7 @@ # Default to the current version number for building the plugin library if [ -z "$TW5_BUILD_VERSION" ]; then - TW5_BUILD_VERSION=v5.2.8 + TW5_BUILD_VERSION=v5.3.0 fi echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]" diff --git a/boot/boot.js b/boot/boot.js index 89fafce6a..58c06b566 100644 --- a/boot/boot.js +++ b/boot/boot.js @@ -569,10 +569,23 @@ $tw.utils.getTypeEncoding = function(ext) { return typeInfo ? typeInfo.encoding : "utf8"; }; +var globalCheck =[ + " Object.defineProperty(Object.prototype, '__temp__', {", + " get: function () { return this; },", + " configurable: true", + " });", + " if(Object.keys(__temp__).length){", + " console.log(Object.keys(__temp__));", + " delete Object.prototype.__temp__;", + " throw \"Global assignment is not allowed within modules on node.\";", + " }", + " delete Object.prototype.__temp__;", +].join('\n'); + /* Run code globally with specified context variables in scope */ -$tw.utils.evalGlobal = function(code,context,filename) { +$tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) { var contextCopy = $tw.utils.extend(Object.create(null),context); // Get the context variables as a pair of arrays of names and values var contextNames = [], contextValues = []; @@ -581,25 +594,38 @@ $tw.utils.evalGlobal = function(code,context,filename) { contextValues.push(value); }); // Add the code prologue and epilogue - code = "(function(" + contextNames.join(",") + ") {(function(){\n" + code + "\n;})();\nreturn exports;\n})\n"; + code = [ + "(function(" + contextNames.join(",") + ") {", + " (function(){\n" + code + "\n;})();", + (!$tw.browser && sandbox && !allowGlobals) ? globalCheck : "", + " return exports;\n", + "})" + ].join("\n"); + // Compile the code into a function var fn; if($tw.browser) { fn = window["eval"](code + "\n\n//# sourceURL=" + filename); } else { - fn = vm.runInThisContext(code,filename); + if(sandbox){ + fn = vm.runInContext(code,sandbox,filename) + } else { + fn = vm.runInThisContext(code,filename); + } } // Call the function and return the exports return fn.apply(null,contextValues); }; - +$tw.utils.sandbox = !$tw.browser ? vm.createContext({}) : undefined; /* Run code in a sandbox with only the specified context variables in scope */ -$tw.utils.evalSandboxed = $tw.browser ? $tw.utils.evalGlobal : function(code,context,filename) { - var sandbox = $tw.utils.extend(Object.create(null),context); - vm.runInNewContext(code,sandbox,filename); - return sandbox.exports; +$tw.utils.evalSandboxed = $tw.browser ? $tw.utils.evalGlobal : function(code,context,filename,allowGlobals) { + return $tw.utils.evalGlobal( + code,context,filename, + allowGlobals ? vm.createContext({}) : $tw.utils.sandbox, + allowGlobals + ); }; /* @@ -1920,7 +1946,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) { // Read the specification var filesInfo = $tw.utils.parseJSONSafe(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8")); // Helper to process a file - var processFile = function(filename,isTiddlerFile,fields,isEditableFile) { + var processFile = function(filename,isTiddlerFile,fields,isEditableFile,rootPath) { var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)], type = (extInfo || {}).type || fields.type || "text/plain", typeInfo = $tw.config.contentTypeInfo[type] || {}, @@ -1941,6 +1967,12 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) { } else { var value = tiddler[name]; switch(fieldInfo.source) { + case "subdirectories": + value = path.relative(rootPath, filename).split('/').slice(0, -1); + break; + case "filepath": + value = path.relative(rootPath, filename); + break; case "filename": value = path.basename(filename); break; @@ -2023,7 +2055,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) { var thisPath = path.relative(filepath, files[t]), filename = path.basename(thisPath); if(filename !== "tiddlywiki.files" && !metaRegExp.test(filename) && fileRegExp.test(filename)) { - processFile(thisPath,dirSpec.isTiddlerFile,dirSpec.fields,dirSpec.isEditableFile); + processFile(thisPath,dirSpec.isTiddlerFile,dirSpec.fields,dirSpec.isEditableFile,dirSpec.path); } } } else { @@ -2048,7 +2080,11 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) { console.log("Warning: missing plugin.info file in " + filepath); return null; } - var pluginInfo = $tw.utils.parseJSONSafe(fs.readFileSync(infoPath,"utf8")); + var pluginInfo = $tw.utils.parseJSONSafe(fs.readFileSync(infoPath,"utf8"),function() {return null;}); + if(!pluginInfo) { + console.log("warning: invalid JSON in plugin.info file at " + infoPath); + pluginInfo = {}; + } // Read the plugin files var pluginFiles = $tw.loadTiddlersFromPath(filepath,excludeRegExp); // Save the plugin tiddlers into the plugin info @@ -2165,7 +2201,11 @@ $tw.loadWikiTiddlers = function(wikiPath,options) { pluginFields; // Bail if we don't have a wiki info file if(fs.existsSync(wikiInfoPath)) { - wikiInfo = $tw.utils.parseJSONSafe(fs.readFileSync(wikiInfoPath,"utf8")); + wikiInfo = $tw.utils.parseJSONSafe(fs.readFileSync(wikiInfoPath,"utf8"),function() {return null;}); + if(!wikiInfo) { + console.log("warning: invalid JSON in tiddlywiki.info file at " + wikiInfoPath); + wikiInfo = {}; + } } else { return null; } @@ -2408,7 +2448,7 @@ $tw.boot.initStartup = function(options) { $tw.utils.registerFileType("video/webm","base64",".webm"); $tw.utils.registerFileType("video/mp4","base64",".mp4"); $tw.utils.registerFileType("audio/mp3","base64",".mp3"); - $tw.utils.registerFileType("audio/mpeg","base64"); + $tw.utils.registerFileType("audio/mpeg","base64",[".mp3",".m2a",".mp2",".mpa",".mpg",".mpga"]); $tw.utils.registerFileType("text/markdown","utf8",[".md",".markdown"],{deserializerType:"text/x-markdown"}); $tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]); $tw.utils.registerFileType("application/enex+xml","utf8",".enex"); diff --git a/core/acknowledgements.tid b/core/acknowledgements.tid index e7acee129..cb54e3d23 100644 --- a/core/acknowledgements.tid +++ b/core/acknowledgements.tid @@ -3,7 +3,7 @@ title: $:/Acknowledgements TiddlyWiki incorporates code from these fine OpenSource projects: * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]] -* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]] +* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]] * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]] And media from these projects: diff --git a/core/icon.tid b/core/icon.tid index b327440df..21246d176 100644 --- a/core/icon.tid +++ b/core/icon.tid @@ -1,4 +1,5 @@ title: $:/core/icon tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/add-comment.tid b/core/images/add-comment.tid index 178221806..a118506ed 100644 --- a/core/images/add-comment.tid +++ b/core/images/add-comment.tid @@ -1,4 +1,5 @@ title: $:/core/images/add-comment tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-add-comment tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/advanced-search-button.tid b/core/images/advanced-search-button.tid index 6fda3fe8b..8e5699c4d 100755 --- a/core/images/advanced-search-button.tid +++ b/core/images/advanced-search-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/advanced-search-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-advanced-search-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/auto-height.tid b/core/images/auto-height.tid index 78f95418b..76deecbad 100755 --- a/core/images/auto-height.tid +++ b/core/images/auto-height.tid @@ -1,4 +1,5 @@ title: $:/core/images/auto-height tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-auto-height tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/blank.tid b/core/images/blank.tid index 731b55a5a..565ef6bec 100755 --- a/core/images/blank.tid +++ b/core/images/blank.tid @@ -1,4 +1,5 @@ title: $:/core/images/blank tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-blank tc-image-button" viewBox="0 0 128 128"/> \ No newline at end of file diff --git a/core/images/bold.tid b/core/images/bold.tid index 67a00f894..d9259e4a1 100755 --- a/core/images/bold.tid +++ b/core/images/bold.tid @@ -1,4 +1,5 @@ title: $:/core/images/bold tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-bold tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/cancel-button.tid b/core/images/cancel-button.tid index c55620b06..3bb982bc1 100755 --- a/core/images/cancel-button.tid +++ b/core/images/cancel-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/cancel-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-cancel-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/chevron-down.tid b/core/images/chevron-down.tid index f1b363dfc..df28c87a4 100755 --- a/core/images/chevron-down.tid +++ b/core/images/chevron-down.tid @@ -1,4 +1,5 @@ title: $:/core/images/chevron-down tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-chevron-down tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/chevron-left.tid b/core/images/chevron-left.tid index e4c69d95a..b7f9ad7ae 100755 --- a/core/images/chevron-left.tid +++ b/core/images/chevron-left.tid @@ -1,4 +1,5 @@ title: $:/core/images/chevron-left tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-chevron-left tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/chevron-right.tid b/core/images/chevron-right.tid index 6ff5b6c0d..9ec7c96fe 100755 --- a/core/images/chevron-right.tid +++ b/core/images/chevron-right.tid @@ -1,4 +1,5 @@ title: $:/core/images/chevron-right tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-chevron-right tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/chevron-up.tid b/core/images/chevron-up.tid index 9acbdec40..45366f286 100755 --- a/core/images/chevron-up.tid +++ b/core/images/chevron-up.tid @@ -1,4 +1,5 @@ title: $:/core/images/chevron-up tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-chevron-up tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/clone-button.tid b/core/images/clone-button.tid index 9ff4903ad..cc0ed7595 100755 --- a/core/images/clone-button.tid +++ b/core/images/clone-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/clone-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-clone-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/close-all-button.tid b/core/images/close-all-button.tid index 3334c5dbc..02d25fa6f 100755 --- a/core/images/close-all-button.tid +++ b/core/images/close-all-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/close-all-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-close-all-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/close-button.tid b/core/images/close-button.tid index c462c9bac..a05669ccd 100755 --- a/core/images/close-button.tid +++ b/core/images/close-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/close-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-close-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/close-others-button.tid b/core/images/close-others-button.tid index 1cd54d797..6eb779018 100755 --- a/core/images/close-others-button.tid +++ b/core/images/close-others-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/close-others-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-close-others-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/copy-clipboard.tid b/core/images/copy-clipboard.tid index e4e55b6e9..d6514ad7c 100644 --- a/core/images/copy-clipboard.tid +++ b/core/images/copy-clipboard.tid @@ -1,4 +1,5 @@ title: $:/core/images/copy-clipboard tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-copy-clipboard tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/delete-button.tid b/core/images/delete-button.tid index e8c9b6108..99f83b3ba 100755 --- a/core/images/delete-button.tid +++ b/core/images/delete-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/delete-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-delete-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/done-button.tid b/core/images/done-button.tid index 265528d06..7672b7d27 100755 --- a/core/images/done-button.tid +++ b/core/images/done-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/done-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-done-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/down-arrow.tid b/core/images/down-arrow.tid index 4cac65a00..7f1273b2c 100755 --- a/core/images/down-arrow.tid +++ b/core/images/down-arrow.tid @@ -1,4 +1,5 @@ title: $:/core/images/down-arrow tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-down-arrow tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/download-button.tid b/core/images/download-button.tid index e3a549639..8b06356ab 100755 --- a/core/images/download-button.tid +++ b/core/images/download-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/download-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-download-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/edit-button.tid b/core/images/edit-button.tid index 190dffc41..e4644ef7c 100755 --- a/core/images/edit-button.tid +++ b/core/images/edit-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/edit-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-edit-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/erase.tid b/core/images/erase.tid index 22b31e7cc..6cc2011a9 100755 --- a/core/images/erase.tid +++ b/core/images/erase.tid @@ -1,4 +1,5 @@ title: $:/core/images/erase tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-erase tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/excise.tid b/core/images/excise.tid index e6c2c9404..fa351baff 100755 --- a/core/images/excise.tid +++ b/core/images/excise.tid @@ -1,4 +1,5 @@ title: $:/core/images/excise tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-excise tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/export-button.tid b/core/images/export-button.tid index eb3284c80..b9f0dca7f 100755 --- a/core/images/export-button.tid +++ b/core/images/export-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/export-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-export-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/file.tid b/core/images/file.tid index 67ebc22ac..682796fbf 100755 --- a/core/images/file.tid +++ b/core/images/file.tid @@ -1,4 +1,5 @@ title: $:/core/images/file tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-file tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/fixed-height.tid b/core/images/fixed-height.tid index c15162267..b2b5083b9 100755 --- a/core/images/fixed-height.tid +++ b/core/images/fixed-height.tid @@ -1,4 +1,5 @@ title: $:/core/images/fixed-height tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-fixed-height tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/fold-all-button.tid b/core/images/fold-all-button.tid index edff8b22b..260efe9b8 100755 --- a/core/images/fold-all-button.tid +++ b/core/images/fold-all-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/fold-all-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-fold-all tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/fold-button.tid b/core/images/fold-button.tid index f0b2b474d..cfc2291a5 100755 --- a/core/images/fold-button.tid +++ b/core/images/fold-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/fold-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-fold tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/fold-others-button.tid b/core/images/fold-others-button.tid index 5cb086f85..a5457c461 100755 --- a/core/images/fold-others-button.tid +++ b/core/images/fold-others-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/fold-others-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-fold-others tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/folder.tid b/core/images/folder.tid index 4b89418ff..8c5d7efb1 100755 --- a/core/images/folder.tid +++ b/core/images/folder.tid @@ -1,4 +1,5 @@ title: $:/core/images/folder tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-folder tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/full-screen-button.tid b/core/images/full-screen-button.tid index 8572ff646..7e20183b7 100755 --- a/core/images/full-screen-button.tid +++ b/core/images/full-screen-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/full-screen-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-full-screen-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/github.tid b/core/images/github.tid index 6389f5cdc..b82c54e72 100755 --- a/core/images/github.tid +++ b/core/images/github.tid @@ -1,4 +1,5 @@ title: $:/core/images/github tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-github tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/gitter.tid b/core/images/gitter.tid index 876fc3da1..4af54ddba 100644 --- a/core/images/gitter.tid +++ b/core/images/gitter.tid @@ -1,4 +1,5 @@ title: $:/core/images/gitter tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-gitter tc-image-button" viewBox="0 0 18 25"> \ No newline at end of file diff --git a/core/images/globe.tid b/core/images/globe.tid index 9448ed7a4..0e2c56b40 100755 --- a/core/images/globe.tid +++ b/core/images/globe.tid @@ -1,4 +1,5 @@ title: $:/core/images/globe tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-globe tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/heading-1.tid b/core/images/heading-1.tid index f8a98123b..d160284c9 100755 --- a/core/images/heading-1.tid +++ b/core/images/heading-1.tid @@ -1,4 +1,5 @@ title: $:/core/images/heading-1 tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-heading-1 tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/heading-2.tid b/core/images/heading-2.tid index ef0022cc6..8daad0f10 100755 --- a/core/images/heading-2.tid +++ b/core/images/heading-2.tid @@ -1,4 +1,5 @@ title: $:/core/images/heading-2 tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-heading-2 tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/heading-3.tid b/core/images/heading-3.tid index d706d067b..8a489e799 100755 --- a/core/images/heading-3.tid +++ b/core/images/heading-3.tid @@ -1,4 +1,5 @@ title: $:/core/images/heading-3 tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-heading-3 tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/heading-4.tid b/core/images/heading-4.tid index 16d4440db..5aee3f3f8 100755 --- a/core/images/heading-4.tid +++ b/core/images/heading-4.tid @@ -1,4 +1,5 @@ title: $:/core/images/heading-4 tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-heading-4 tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/heading-5.tid b/core/images/heading-5.tid index 8f34b7058..c9a54a335 100755 --- a/core/images/heading-5.tid +++ b/core/images/heading-5.tid @@ -1,4 +1,5 @@ title: $:/core/images/heading-5 tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-heading-5 tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/heading-6.tid b/core/images/heading-6.tid index b348c70af..1034e7116 100755 --- a/core/images/heading-6.tid +++ b/core/images/heading-6.tid @@ -1,4 +1,5 @@ title: $:/core/images/heading-6 tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-heading-6 tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/help.tid b/core/images/help.tid index 07167ae93..5c0cf13ab 100755 --- a/core/images/help.tid +++ b/core/images/help.tid @@ -1,4 +1,5 @@ title: $:/core/images/help tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-help tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/home-button.tid b/core/images/home-button.tid index 10c00626a..952ab9a60 100755 --- a/core/images/home-button.tid +++ b/core/images/home-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/home-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-home-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/import-button.tid b/core/images/import-button.tid index 6850513ef..a42c416e5 100755 --- a/core/images/import-button.tid +++ b/core/images/import-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/import-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-import-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/info-button.tid b/core/images/info-button.tid index 2679a135a..e8f8e98c4 100755 --- a/core/images/info-button.tid +++ b/core/images/info-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/info-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-info-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/italic.tid b/core/images/italic.tid index 06aada589..766d3707a 100755 --- a/core/images/italic.tid +++ b/core/images/italic.tid @@ -1,4 +1,5 @@ title: $:/core/images/italic tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-italic tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/layout-button.tid b/core/images/layout-button.tid index 19371cde1..a859edbc5 100755 --- a/core/images/layout-button.tid +++ b/core/images/layout-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/layout-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-layout-button tc-image-button" viewBox="0 0 24 24" stroke-width="1" stroke="none"> \ No newline at end of file diff --git a/core/images/left-arrow.tid b/core/images/left-arrow.tid index a418581cd..b64fc2ab6 100755 --- a/core/images/left-arrow.tid +++ b/core/images/left-arrow.tid @@ -3,4 +3,5 @@ modified: 20150315235324760 tags: $:/tags/Image title: $:/core/images/left-arrow - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-left-arrow tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/line-width.tid b/core/images/line-width.tid index f77763ce6..9cecc33cb 100755 --- a/core/images/line-width.tid +++ b/core/images/line-width.tid @@ -1,4 +1,5 @@ title: $:/core/images/line-width tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-line-width tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/link.tid b/core/images/link.tid index 395307c42..c1d134f7e 100644 --- a/core/images/link.tid +++ b/core/images/link.tid @@ -1,4 +1,5 @@ title: $:/core/images/link tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-link tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/linkify.tid b/core/images/linkify.tid index 40acdc19a..d616c2ac9 100644 --- a/core/images/linkify.tid +++ b/core/images/linkify.tid @@ -1,4 +1,5 @@ title: $:/core/images/linkify tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-linkify-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/list-bullet.tid b/core/images/list-bullet.tid index 322dd4ae6..065d96c4f 100755 --- a/core/images/list-bullet.tid +++ b/core/images/list-bullet.tid @@ -1,4 +1,5 @@ title: $:/core/images/list-bullet tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-list-bullet tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/list-number.tid b/core/images/list-number.tid index 161917823..b70d4db15 100755 --- a/core/images/list-number.tid +++ b/core/images/list-number.tid @@ -1,4 +1,5 @@ title: $:/core/images/list-number tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-list-number tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/list.tid b/core/images/list.tid index 22b784bfe..793b47957 100644 --- a/core/images/list.tid +++ b/core/images/list.tid @@ -1,4 +1,5 @@ title: $:/core/images/list tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-list tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/locked-padlock.tid b/core/images/locked-padlock.tid index 14d95560c..f6722cddd 100755 --- a/core/images/locked-padlock.tid +++ b/core/images/locked-padlock.tid @@ -1,4 +1,5 @@ title: $:/core/images/locked-padlock tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-locked-padlock tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/mail.tid b/core/images/mail.tid index cf0f4eab7..9d46d6eff 100755 --- a/core/images/mail.tid +++ b/core/images/mail.tid @@ -1,4 +1,5 @@ title: $:/core/images/mail tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-mail tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/mastodon.tid b/core/images/mastodon.tid index b27c751fd..a6b41d355 100644 --- a/core/images/mastodon.tid +++ b/core/images/mastodon.tid @@ -1,6 +1,7 @@ title: $:/core/images/mastodon tags: $:/tags/Image - +\parameters (size:"22pt") +> height=<> class="tc-image-mastodon tc-image-button" viewBox="0 0 128 128"> diff --git a/core/images/menu-button.tid b/core/images/menu-button.tid index 6d1872e4c..958721d31 100755 --- a/core/images/menu-button.tid +++ b/core/images/menu-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/menu-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-menu-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/minus-button.tid b/core/images/minus-button.tid index 7132ed3e9..40ee75a8e 100644 --- a/core/images/minus-button.tid +++ b/core/images/minus-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/minus-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-minus-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/mono-block.tid b/core/images/mono-block.tid index f8695302b..bf58400aa 100755 --- a/core/images/mono-block.tid +++ b/core/images/mono-block.tid @@ -1,4 +1,5 @@ title: $:/core/images/mono-block tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-mono-block tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/mono-line.tid b/core/images/mono-line.tid index 09cfe513e..1ab73b829 100755 --- a/core/images/mono-line.tid +++ b/core/images/mono-line.tid @@ -1,4 +1,5 @@ title: $:/core/images/mono-line tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-mono-line tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/new-button.tid b/core/images/new-button.tid index 6e592ada9..d4cfd34f6 100755 --- a/core/images/new-button.tid +++ b/core/images/new-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/new-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-new-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/new-here-button.tid b/core/images/new-here-button.tid index ab0f7a6f3..8e304f5e7 100755 --- a/core/images/new-here-button.tid +++ b/core/images/new-here-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/new-here-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-new-here-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/new-image-button.tid b/core/images/new-image-button.tid index 16b63c3c3..53b10d481 100755 --- a/core/images/new-image-button.tid +++ b/core/images/new-image-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/new-image-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-new-image-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/new-journal-button.tid b/core/images/new-journal-button.tid index fb67c8007..3b04d5786 100755 --- a/core/images/new-journal-button.tid +++ b/core/images/new-journal-button.tid @@ -1,4 +1,6 @@ title: $:/core/images/new-journal-button tags: $:/tags/Image -<> \ No newline at end of file +<$parameters size="22pt" day=<>> +> height=<> class="tc-image-new-journal-button tc-image-button" viewBox="0 0 128 128"><$text text=<>/> + \ No newline at end of file diff --git a/core/images/opacity.tid b/core/images/opacity.tid index e9a29aea2..0211644f9 100755 --- a/core/images/opacity.tid +++ b/core/images/opacity.tid @@ -1,4 +1,5 @@ title: $:/core/images/opacity tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-opacity tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/open-window.tid b/core/images/open-window.tid index 14b556484..d918b1fc8 100755 --- a/core/images/open-window.tid +++ b/core/images/open-window.tid @@ -1,4 +1,5 @@ title: $:/core/images/open-window tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-open-window tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/options-button.tid b/core/images/options-button.tid index bd0ffcb1a..18fbf8b00 100755 --- a/core/images/options-button.tid +++ b/core/images/options-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/options-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-options-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/paint.tid b/core/images/paint.tid index bb536b53a..660fda2bf 100755 --- a/core/images/paint.tid +++ b/core/images/paint.tid @@ -1,4 +1,5 @@ title: $:/core/images/paint tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-paint tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/palette.tid b/core/images/palette.tid index d605fd853..1c7903549 100755 --- a/core/images/palette.tid +++ b/core/images/palette.tid @@ -1,4 +1,5 @@ title: $:/core/images/palette tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-palette tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/permalink-button.tid b/core/images/permalink-button.tid index e8fd0aecd..f1cf38b41 100755 --- a/core/images/permalink-button.tid +++ b/core/images/permalink-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/permalink-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-permalink-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/permaview-button.tid b/core/images/permaview-button.tid index b2ad9a408..82e533475 100755 --- a/core/images/permaview-button.tid +++ b/core/images/permaview-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/permaview-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-permaview-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/picture.tid b/core/images/picture.tid index 7d035e2fc..2af427e2e 100755 --- a/core/images/picture.tid +++ b/core/images/picture.tid @@ -1,4 +1,5 @@ title: $:/core/images/picture tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-picture tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/plugin-generic-language.tid b/core/images/plugin-generic-language.tid index 5c777d98d..d663d1563 100755 --- a/core/images/plugin-generic-language.tid +++ b/core/images/plugin-generic-language.tid @@ -1,4 +1,5 @@ title: $:/core/images/plugin-generic-language tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> viewBox="0 0 128 128" class="tc-image-plugin-generic-language tc-image-button"> \ No newline at end of file diff --git a/core/images/plugin-generic-plugin.tid b/core/images/plugin-generic-plugin.tid index ab2e6670e..06073dd7c 100755 --- a/core/images/plugin-generic-plugin.tid +++ b/core/images/plugin-generic-plugin.tid @@ -1,4 +1,5 @@ title: $:/core/images/plugin-generic-plugin tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> viewBox="0 0 128 128" class="tc-image-plugin-generic-plugin tc-image-button"> \ No newline at end of file diff --git a/core/images/plugin-generic-theme.tid b/core/images/plugin-generic-theme.tid index 9ae3cd779..ab899b3e4 100755 --- a/core/images/plugin-generic-theme.tid +++ b/core/images/plugin-generic-theme.tid @@ -1,4 +1,5 @@ title: $:/core/images/plugin-generic-theme tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> viewBox="0 0 128 128" class="tc-image-plugin-generic-theme tc-image-button"> \ No newline at end of file diff --git a/core/images/plus-button.tid b/core/images/plus-button.tid index b001f3e2f..c9a696d43 100644 --- a/core/images/plus-button.tid +++ b/core/images/plus-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/plus-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-plus-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/preview-closed.tid b/core/images/preview-closed.tid index 5986d8966..cf17730d5 100755 --- a/core/images/preview-closed.tid +++ b/core/images/preview-closed.tid @@ -1,4 +1,5 @@ title: $:/core/images/preview-closed tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-preview-closed tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/preview-open.tid b/core/images/preview-open.tid index 4664990b4..cb30bf474 100755 --- a/core/images/preview-open.tid +++ b/core/images/preview-open.tid @@ -1,4 +1,5 @@ title: $:/core/images/preview-open tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-preview-open tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/print-button.tid b/core/images/print-button.tid index 55b33c896..12bffd41d 100644 --- a/core/images/print-button.tid +++ b/core/images/print-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/print-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-print-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/quote.tid b/core/images/quote.tid index 7134306a6..0c4fcf25a 100755 --- a/core/images/quote.tid +++ b/core/images/quote.tid @@ -1,4 +1,5 @@ title: $:/core/images/quote tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-quote tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/refresh-button.tid b/core/images/refresh-button.tid index 2422b0679..f8e3fc69e 100755 --- a/core/images/refresh-button.tid +++ b/core/images/refresh-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/refresh-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-refresh-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/right-arrow.tid b/core/images/right-arrow.tid index 42e7dea56..64f839b55 100755 --- a/core/images/right-arrow.tid +++ b/core/images/right-arrow.tid @@ -1,4 +1,5 @@ title: $:/core/images/right-arrow tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-right-arrow tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/rotate-left.tid b/core/images/rotate-left.tid index 188d3b45c..da6034b19 100644 --- a/core/images/rotate-left.tid +++ b/core/images/rotate-left.tid @@ -1,4 +1,5 @@ title: $:/core/images/rotate-left tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-rotate-left tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/save-button-dynamic.tid b/core/images/save-button-dynamic.tid index d0aa13f83..7a351d617 100644 --- a/core/images/save-button-dynamic.tid +++ b/core/images/save-button-dynamic.tid @@ -1,7 +1,8 @@ title: $:/core/images/save-button-dynamic tags: $:/tags/Image - +\parameters (size:"22pt") +> height=<> class="tc-image-save-button-dynamic tc-image-button" viewBox="0 0 128 128"> diff --git a/core/images/save-button.tid b/core/images/save-button.tid index a66756616..912ad248c 100755 --- a/core/images/save-button.tid +++ b/core/images/save-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/save-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-save-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/size.tid b/core/images/size.tid index db84ecf9b..ea9aa1094 100755 --- a/core/images/size.tid +++ b/core/images/size.tid @@ -1,4 +1,5 @@ title: $:/core/images/size tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-size tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/spiral.tid b/core/images/spiral.tid index ca4684cab..f3a5271ac 100755 --- a/core/images/spiral.tid +++ b/core/images/spiral.tid @@ -1,4 +1,5 @@ title: $:/core/images/spiral tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-spiral tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/stamp.tid b/core/images/stamp.tid index ba385aaae..8511a457f 100755 --- a/core/images/stamp.tid +++ b/core/images/stamp.tid @@ -1,4 +1,5 @@ title: $:/core/images/stamp tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-stamp tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/star-filled.tid b/core/images/star-filled.tid index 10b8f1c3d..262448d51 100755 --- a/core/images/star-filled.tid +++ b/core/images/star-filled.tid @@ -1,4 +1,5 @@ title: $:/core/images/star-filled tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-star-filled tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/storyview-classic.tid b/core/images/storyview-classic.tid index 86872817b..457434bc9 100755 --- a/core/images/storyview-classic.tid +++ b/core/images/storyview-classic.tid @@ -1,4 +1,5 @@ title: $:/core/images/storyview-classic tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-storyview-classic tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/storyview-pop.tid b/core/images/storyview-pop.tid index a610c89d5..a4a9fb9ee 100755 --- a/core/images/storyview-pop.tid +++ b/core/images/storyview-pop.tid @@ -1,4 +1,5 @@ title: $:/core/images/storyview-pop tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-storyview-pop tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/storyview-zoomin.tid b/core/images/storyview-zoomin.tid index 61b7ff273..725f36e71 100755 --- a/core/images/storyview-zoomin.tid +++ b/core/images/storyview-zoomin.tid @@ -1,4 +1,5 @@ title: $:/core/images/storyview-zoomin tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-storyview-zoomin tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/strikethrough.tid b/core/images/strikethrough.tid index 1f7a1c202..de4eefeec 100755 --- a/core/images/strikethrough.tid +++ b/core/images/strikethrough.tid @@ -1,4 +1,5 @@ title: $:/core/images/strikethrough tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-strikethrough tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/subscript.tid b/core/images/subscript.tid index 96548bdb5..76ec35399 100755 --- a/core/images/subscript.tid +++ b/core/images/subscript.tid @@ -1,4 +1,5 @@ title: $:/core/images/subscript tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-subscript tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/superscript.tid b/core/images/superscript.tid index 149e44893..ab0d0d1b2 100755 --- a/core/images/superscript.tid +++ b/core/images/superscript.tid @@ -1,4 +1,5 @@ title: $:/core/images/superscript tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-superscript tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/tag-button.tid b/core/images/tag-button.tid index 9f6cad8b4..ab407f780 100755 --- a/core/images/tag-button.tid +++ b/core/images/tag-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/tag-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-tag-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/theme-button.tid b/core/images/theme-button.tid index d80a0e82a..6b7aab2af 100755 --- a/core/images/theme-button.tid +++ b/core/images/theme-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/theme-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-theme-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/timestamp-off.tid b/core/images/timestamp-off.tid index 0d20f28d6..33e018f3a 100644 --- a/core/images/timestamp-off.tid +++ b/core/images/timestamp-off.tid @@ -1,4 +1,5 @@ title: $:/core/images/timestamp-off tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-timestamp-off tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/timestamp-on.tid b/core/images/timestamp-on.tid index 3a16df7eb..cad04aada 100644 --- a/core/images/timestamp-on.tid +++ b/core/images/timestamp-on.tid @@ -1,4 +1,5 @@ title: $:/core/images/timestamp-on tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-timestamp-on tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/tip.tid b/core/images/tip.tid index f8109ada4..025918306 100755 --- a/core/images/tip.tid +++ b/core/images/tip.tid @@ -1,4 +1,5 @@ title: $:/core/images/tip tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-tip tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/transcludify.tid b/core/images/transcludify.tid index 0579feb10..5102d1370 100644 --- a/core/images/transcludify.tid +++ b/core/images/transcludify.tid @@ -1,4 +1,5 @@ title: $:/core/images/transcludify tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-transcludify-button tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/twitter.tid b/core/images/twitter.tid index 28cfccdbd..e3ae13dc1 100755 --- a/core/images/twitter.tid +++ b/core/images/twitter.tid @@ -1,4 +1,5 @@ title: $:/core/images/twitter tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-twitter tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/underline.tid b/core/images/underline.tid index 768d2a199..341b27cfa 100755 --- a/core/images/underline.tid +++ b/core/images/underline.tid @@ -1,4 +1,5 @@ title: $:/core/images/underline tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-underline tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/unfold-all-button.tid b/core/images/unfold-all-button.tid index e496bdd89..e44000b18 100755 --- a/core/images/unfold-all-button.tid +++ b/core/images/unfold-all-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/unfold-all-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-unfold-all tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/unfold-button.tid b/core/images/unfold-button.tid index cfad70570..57f53fd6f 100755 --- a/core/images/unfold-button.tid +++ b/core/images/unfold-button.tid @@ -1,4 +1,5 @@ title: $:/core/images/unfold-button tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-unfold tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/unlocked-padlock.tid b/core/images/unlocked-padlock.tid index c5367c085..941f7bec5 100755 --- a/core/images/unlocked-padlock.tid +++ b/core/images/unlocked-padlock.tid @@ -1,4 +1,5 @@ title: $:/core/images/unlocked-padlock tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-unlocked-padlock tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/up-arrow.tid b/core/images/up-arrow.tid index a1bd132bf..4d157352b 100755 --- a/core/images/up-arrow.tid +++ b/core/images/up-arrow.tid @@ -3,4 +3,5 @@ modified: 20150316000831867 tags: $:/tags/Image title: $:/core/images/up-arrow - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-up-arrow tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/video.tid b/core/images/video.tid index 3bf0bb259..b4fef628d 100755 --- a/core/images/video.tid +++ b/core/images/video.tid @@ -1,4 +1,5 @@ title: $:/core/images/video tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-video tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/images/warning.tid b/core/images/warning.tid index 53bff59ec..1822da89f 100755 --- a/core/images/warning.tid +++ b/core/images/warning.tid @@ -1,4 +1,5 @@ title: $:/core/images/warning tags: $:/tags/Image - \ No newline at end of file +\parameters (size:"22pt") +> height=<> class="tc-image-warning tc-image-button" viewBox="0 0 128 128"> \ No newline at end of file diff --git a/core/language/en-GB/Help/listen.tid b/core/language/en-GB/Help/listen.tid index 45df72381..d9f6a247f 100644 --- a/core/language/en-GB/Help/listen.tid +++ b/core/language/en-GB/Help/listen.tid @@ -18,7 +18,7 @@ All parameters are optional with safe defaults, and can be specified in any orde * ''anon-username'' - the username for signing edits for anonymous users * ''username'' - optional username for basic authentication * ''password'' - optional password for basic authentication -* ''authenticated-user-header'' - optional name of header to be used for trusted authentication +* ''authenticated-user-header'' - optional name of request header to be used for trusted authentication. * ''readers'' - comma-separated list of principals allowed to read from this wiki * ''writers'' - comma-separated list of principals allowed to write to this wiki * ''csrf-disable'' - set to "yes" to disable CSRF checks (defaults to "no") diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids index 52545bd86..2c10d1acb 100644 --- a/core/language/en-GB/Misc.multids +++ b/core/language/en-GB/Misc.multids @@ -25,6 +25,8 @@ Encryption/RepeatPassword: Repeat password Encryption/PasswordNoMatch: Passwords do not match Encryption/SetPassword: Set password Error/Caption: Error +Error/DeserializeOperator/MissingOperand: Filter Error: Missing operand for 'deserialize' operator +Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserializer provided as operand for the 'deserialize' operator Error/Filter: Filter error Error/FilterSyntax: Syntax error in filter expression Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run diff --git a/core/language/en-GB/SiteTitle.tid b/core/language/en-GB/SiteTitle.tid index 9f522664a..a32da7dfe 100644 --- a/core/language/en-GB/SiteTitle.tid +++ b/core/language/en-GB/SiteTitle.tid @@ -1,3 +1,3 @@ title: $:/SiteTitle -My ~TiddlyWiki \ No newline at end of file +My TiddlyWiki \ No newline at end of file diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js index 948890645..a4cf983b0 100644 --- a/core/modules/editor/engines/framed.js +++ b/core/modules/editor/engines/framed.js @@ -118,6 +118,8 @@ FramedEngine.prototype.copyStyles = function() { this.domNode.style.margin = "0"; // In Chrome setting -webkit-text-fill-color overrides the placeholder text colour this.domNode.style["-webkit-text-fill-color"] = "currentcolor"; + // Ensure we don't force text direction to LTR + this.domNode.style.removeProperty("direction"); }; /* diff --git a/core/modules/filters.js b/core/modules/filters.js index b705c994c..aa82a352a 100644 --- a/core/modules/filters.js +++ b/core/modules/filters.js @@ -12,6 +12,8 @@ Adds tiddler filtering methods to the $tw.Wiki object. /*global $tw: false */ "use strict"; +var widgetClass = require("$:/core/modules/widgets/widget.js").widget; + /* Maximum permitted filter recursion depth */ var MAX_FILTER_DEPTH = 300; @@ -269,7 +271,7 @@ exports.compileFilter = function(filterString) { operand.value = self.getTextReference(operand.text,"",currTiddlerTitle); } else if(operand.variable) { var varTree = $tw.utils.parseFilterVariable(operand.text); - operand.value = widget.evaluateVariable(varTree.name,{params: varTree.params, source: source})[0] || ""; + operand.value = widgetClass.evaluateVariable(widget,varTree.name,{params: varTree.params, source: source})[0] || ""; } else { operand.value = operand.text; } diff --git a/core/modules/filters/deserialize.js b/core/modules/filters/deserialize.js new file mode 100644 index 000000000..5511f29e8 --- /dev/null +++ b/core/modules/filters/deserialize.js @@ -0,0 +1,39 @@ +/*\ +title: $:/core/modules/filters/deserialize.js +type: application/javascript +module-type: filteroperator +Filter operator for deserializing string data into JSON representing tiddlers +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports["deserialize"] = function(source,operator,options) { + var results = [], + deserializer; + if(operator.operand) { + // Get the deserializer identified by the operand + deserializer = $tw.Wiki.tiddlerDeserializerModules[operator.operand]; + if(deserializer) { + source(function(tiddler,title) { + var tiddlers; + try { + tiddlers = deserializer(title); + } catch(e) { + // Return an empty array if we could not extract any tiddlers + tiddlers = []; + } + results.push(JSON.stringify(tiddlers)); + }); + } else { + return [$tw.language.getString("Error/DeserializeOperator/UnknownDeserializer")]; + } + } else { + return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")]; + } + return results; +} + +})(); \ No newline at end of file diff --git a/core/modules/filters/format/timestamp.js b/core/modules/filters/format/timestamp.js new file mode 100644 index 000000000..d6f5afe30 --- /dev/null +++ b/core/modules/filters/format/timestamp.js @@ -0,0 +1,25 @@ +/*\ +title: $:/core/modules/filters/format/timestamp.js +type: application/javascript +module-type: formatfilteroperator +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +/* +Export our filter function +*/ +exports.timestamp = function(source,operand,options) { + var results = []; + source(function(tiddler,title) { + if (title.match(/^-?\d+$/)) { + var value = new Date(Number(title)); + results.push($tw.utils.formatDateString(value,operand || "[UTC]YYYY0MM0DD0hh0mm0ss0XXX")); + } + }); + return results; +}; +})(); \ No newline at end of file diff --git a/core/modules/filters/function.js b/core/modules/filters/function.js index f6a8c034d..79210fb78 100644 --- a/core/modules/filters/function.js +++ b/core/modules/filters/function.js @@ -17,9 +17,13 @@ Export our filter function */ exports.function = function(source,operator,options) { var functionName = operator.operands[0], - variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName); + params = []; + $tw.utils.each(operator.operands.slice(1),function(param) { + params.push({value: param}); + }); + var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(functionName,{params: params, source: source}); if(variableInfo && variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) { - return options.widget.evaluateVariable(functionName,{params: operator.operands.slice(1), source: source}); + return variableInfo.resultList ? variableInfo.resultList : [variableInfo.text]; } // Return the input list if the function wasn't found var results = []; diff --git a/core/modules/filters/unknown.js b/core/modules/filters/unknown.js index 21856766b..6ae5baaf0 100644 --- a/core/modules/filters/unknown.js +++ b/core/modules/filters/unknown.js @@ -21,10 +21,14 @@ Export our filter function */ exports["[unknown]"] = function(source,operator,options) { // Check for a user defined filter operator - if(operator.operator.charAt(0) === ".") { - var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(operator.operator); - if(variableInfo && variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition) { - var list = options.widget.evaluateVariable(operator.operator,{params: operator.operands, source: source}); + if(operator.operator.indexOf(".") !== -1) { + var params = []; + $tw.utils.each(operator.operands,function(param) { + params.push({value: param}); + }); + var variableInfo = options.widget && options.widget.getVariableInfo && options.widget.getVariableInfo(operator.operator,{params: params, source: source}); + if(variableInfo && variableInfo.srcVariable) { + var list = variableInfo.resultList ? variableInfo.resultList : [variableInfo.text]; if(operator.prefix === "!") { var results = []; source(function(tiddler,title) { diff --git a/core/modules/parsers/wikiparser/rules/html.js b/core/modules/parsers/wikiparser/rules/html.js index 64469e3b2..4dbd6a07c 100644 --- a/core/modules/parsers/wikiparser/rules/html.js +++ b/core/modules/parsers/wikiparser/rules/html.js @@ -78,7 +78,7 @@ exports.parseTag = function(source,pos,options) { orderedAttributes: [] }; // Define our regexps - var reTagName = /([a-zA-Z0-9\-\$]+)/g; + var reTagName = /([a-zA-Z0-9\-\$\.]+)/g; // Skip whitespace pos = $tw.utils.skipWhiteSpace(source,pos); // Look for a less than sign @@ -138,7 +138,7 @@ exports.parseTag = function(source,pos,options) { exports.findNextTag = function(source,pos,options) { // A regexp for finding candidate HTML tags - var reLookahead = /<([a-zA-Z\-\$]+)/g; + var reLookahead = /<([a-zA-Z\-\$\.]+)/g; // Find the next candidate reLookahead.lastIndex = pos; var match = reLookahead.exec(source); diff --git a/core/modules/parsers/wikiparser/rules/parameters.js b/core/modules/parsers/wikiparser/rules/parameters.js index 561c1c545..f288740aa 100644 --- a/core/modules/parsers/wikiparser/rules/parameters.js +++ b/core/modules/parsers/wikiparser/rules/parameters.js @@ -26,7 +26,7 @@ Instantiate parse rule exports.init = function(parser) { this.parser = parser; // Regexp to match - this.matchRegExp = /^\\parameters\s*\(([^)]*)\)\s*\r?\n/mg; + this.matchRegExp = /^\\parameters\s*\(([^)]*)\)(\s*\r?\n)?/mg; }; /* diff --git a/core/modules/parsers/wikiparser/rules/wikilinkprefix.js b/core/modules/parsers/wikiparser/rules/wikilinkprefix.js new file mode 100644 index 000000000..60cb3d992 --- /dev/null +++ b/core/modules/parsers/wikiparser/rules/wikilinkprefix.js @@ -0,0 +1,40 @@ +/*\ +title: $:/core/modules/parsers/wikiparser/rules/wikilinkprefix.js +type: application/javascript +module-type: wikirule + +Wiki text inline rule for suppressed wiki links. For example: + +``` +~SuppressedLink +``` + +\*/ +(function(){ + +/*jslint node: true, browser: true */ +/*global $tw: false */ +"use strict"; + +exports.name = "wikilinkprefix"; +exports.types = {inline: true}; + +exports.init = function(parser) { + this.parser = parser; + // Regexp to match + this.matchRegExp = new RegExp($tw.config.textPrimitives.unWikiLink + $tw.config.textPrimitives.wikiLink,"mg"); +}; + +/* +Parse the most recent match +*/ +exports.parse = function() { + // Get the details of the match + var linkText = this.match[0]; + // Move past the wikilink + this.parser.pos = this.matchRegExp.lastIndex; + // Return the link without unwikilink character as plain text + return [{type: "text", text: linkText.substr(1)}]; +}; + +})(); diff --git a/core/modules/server/authenticators/header.js b/core/modules/server/authenticators/header.js index 78ae6cb0a..9d9990d31 100644 --- a/core/modules/server/authenticators/header.js +++ b/core/modules/server/authenticators/header.js @@ -37,7 +37,7 @@ HeaderAuthenticator.prototype.authenticateRequest = function(request,response,st return false; } else { // authenticatedUsername will be undefined for anonymous users - state.authenticatedUsername = username; + state.authenticatedUsername = $tw.utils.decodeURIComponentSafe(username); return true; } }; diff --git a/core/modules/startup/rootwidget.js b/core/modules/startup/rootwidget.js index 70d262a2c..5afac5e86 100644 --- a/core/modules/startup/rootwidget.js +++ b/core/modules/startup/rootwidget.js @@ -72,12 +72,8 @@ exports.startup = function() { $tw.rootWidget.addEventListener("tm-focus-selector",function(event) { var selector = event.param || "", element, - doc = event.event && event.event.target ? event.event.target.ownerDocument : document; - try { - element = doc.querySelector(selector); - } catch(e) { - console.log("Error in selector: ",selector) - } + baseElement = event.event && event.event.target ? event.event.target.ownerDocument : document; + element = $tw.utils.querySelectorSafe(selector,baseElement); if(element && element.focus) { element.focus(event.paramObject); } diff --git a/core/modules/storyviews/zoomin.js b/core/modules/storyviews/zoomin.js index 6452e6225..d02f705e7 100644 --- a/core/modules/storyviews/zoomin.js +++ b/core/modules/storyviews/zoomin.js @@ -129,7 +129,7 @@ function findTitleDomNode(widget,targetClass) { targetClass = targetClass || "tc-title"; var domNode = widget.findFirstDomNode(); if(domNode && domNode.querySelector) { - return domNode.querySelector("." + targetClass); + return $tw.utils.querySelectorSafe("." + targetClass,domNode); } return null; } diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js index 6d8f2a76d..9c06fc8b0 100644 --- a/core/modules/utils/dom/dom.js +++ b/core/modules/utils/dom/dom.js @@ -365,5 +365,25 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) { return variables; }; +/* +Make sure the CSS selector is not invalid +*/ +exports.querySelectorSafe = function(selector,baseElement) { + baseElement = baseElement || document; + try { + return baseElement.querySelector(selector); + } catch(e) { + console.log("Invalid selector: ",selector); + } +}; + +exports.querySelectorAllSafe = function(selector,baseElement) { + baseElement = baseElement || document; + try { + return baseElement.querySelectorAll(selector); + } catch(e) { + console.log("Invalid selector: ",selector); + } +}; })(); diff --git a/core/modules/utils/dom/dragndrop.js b/core/modules/utils/dom/dragndrop.js index 6c90ed1bb..0b5360216 100644 --- a/core/modules/utils/dom/dragndrop.js +++ b/core/modules/utils/dom/dragndrop.js @@ -159,7 +159,7 @@ exports.importDataTransfer = function(dataTransfer,fallbackTitle,callback) { if(!$tw.browser.isIE || importDataTypes[t].IECompatible) { // Get the data var dataType = importDataTypes[t]; - var data = dataTransfer.getData(dataType.type); + var data = dataTransfer.getData(dataType.type); // Import the tiddlers in the data if(data !== "" && data !== null) { if($tw.log.IMPORT) { @@ -173,6 +173,36 @@ exports.importDataTransfer = function(dataTransfer,fallbackTitle,callback) { } }; +exports.importPaste = function(item,fallbackTitle,callback) { + // Try each provided data type in turn + for(var t=0; t> diff --git a/core/templates/exporters/TidFile.tid b/core/templates/exporters/TidFile.tid index 1dbd3503b..7b0bb2d78 100644 --- a/core/templates/exporters/TidFile.tid +++ b/core/templates/exporters/TidFile.tid @@ -7,5 +7,5 @@ condition: [compare:lte[1]] \define renderContent() {{{ $(exportFilter)$ +[limit[1]] ||$:/core/templates/tid-tiddler}}} \end -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] <> \ No newline at end of file diff --git a/core/templates/external-js/save-all-external-js.tid b/core/templates/external-js/save-all-external-js.tid index 2616fed20..ff5bbc851 100644 --- a/core/templates/external-js/save-all-external-js.tid +++ b/core/templates/external-js/save-all-external-js.tid @@ -1,11 +1,14 @@ title: $:/core/save/all-external-js \whitespace trim -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] \define saveTiddlerFilter() [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$ \end + + \define defaultCoreURL() %24%3A%2Fcore%2Ftemplates%2Ftiddlywiki5.js + <$let coreURL={{{ [[coreURL]is[variable]thenelse] }}}> {{$:/core/templates/tiddlywiki5-external-js.html}} diff --git a/core/templates/external-js/save-offline-external-js.tid b/core/templates/external-js/save-offline-external-js.tid index 01ae88aa0..564a34948 100644 --- a/core/templates/external-js/save-offline-external-js.tid +++ b/core/templates/external-js/save-offline-external-js.tid @@ -1,7 +1,7 @@ title: $:/core/save/offline-external-js \whitespace trim -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] \define saveTiddlerFilter() [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$ \end diff --git a/core/templates/save-all.tid b/core/templates/save-all.tid index b298ad49f..d7473ba5b 100644 --- a/core/templates/save-all.tid +++ b/core/templates/save-all.tid @@ -1,6 +1,6 @@ title: $:/core/save/all -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] \define saveTiddlerFilter() [is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$ \end diff --git a/core/templates/server/static.tiddler.html.tid b/core/templates/server/static.tiddler.html.tid index 1a803bd86..a8409e50f 100644 --- a/core/templates/server/static.tiddler.html.tid +++ b/core/templates/server/static.tiddler.html.tid @@ -2,7 +2,7 @@ title: $:/core/templates/server/static.tiddler.html \whitespace trim \define tv-wikilink-template() $uri_encoded$ -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] diff --git a/core/templates/single.tiddler.window.tid b/core/templates/single.tiddler.window.tid index 0d14509e5..aa5175c01 100644 --- a/core/templates/single.tiddler.window.tid +++ b/core/templates/single.tiddler.window.tid @@ -4,7 +4,7 @@ title: $:/core/templates/single.tiddler.window \define containerClasses() tc-page-container tc-page-view-$(storyviewTitle)$ tc-language-$(languageTitle)$ \end -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] <$vars tv-config-toolbar-icons={{$:/config/Toolbar/Icons}} diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid index a4537305a..f90818464 100644 --- a/core/templates/static.tiddler.html.tid +++ b/core/templates/static.tiddler.html.tid @@ -4,7 +4,7 @@ title: $:/core/templates/static.tiddler.html \define tv-config-toolbar-icons() no \define tv-config-toolbar-text() no \define tv-config-toolbar-class() tc-btn-invisible -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] ` diff --git a/core/ui/Components/VisibleTransclude.tid b/core/ui/Components/VisibleTransclude.tid index cbc981abe..27fdff998 100644 --- a/core/ui/Components/VisibleTransclude.tid +++ b/core/ui/Components/VisibleTransclude.tid @@ -30,15 +30,15 @@ Block transclusions are shown in red, and inline transclusions are shown in gree <$list filter="[<@params>jsonindexes[]] :filter[prefix[$]] +[limit[1]]" variable="ignore" emptyMessage=""" - <$genesis $type="$transclude" $remappable="no" $names="[<@params>jsonindexes[]]" $values="[<@params>jsonindexes[]] :map[<@params>jsonget]" recursionMarker="no" mode=<>> + <$genesis $type="$transclude" $remappable="no" $names="[<@params>jsonindexes[]]" $values="[<@params>jsonindexes[]] :map[<@params>jsonget]" recursionMarker="no" mode=<> $$fillignore="yes"> - <$slot $name="ts-raw" $depth="2"/> + <$slot $name="ts-raw"/> """> - <$genesis $type="$transclude" $remappable="no" $names="[<@params>jsonindexes[]]" $values="[<@params>jsonindexes[]] :map[<@params>jsonget]" $$recursionMarker="no" $$mode=<>> + <$genesis $type="$transclude" $remappable="no" $names="[<@params>jsonindexes[]]" $values="[<@params>jsonindexes[]] :map[<@params>jsonget]" $$recursionMarker="no" $$mode=<> $$fillignore="yes"> - <$slot $name="ts-raw" $depth="2"/> + <$slot $name="ts-raw"/> diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid index ce8612b72..56d3d5085 100644 --- a/core/ui/ControlPanel/Modals/AddPlugins.tid +++ b/core/ui/ControlPanel/Modals/AddPlugins.tid @@ -211,7 +211,7 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$ \end -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] \whitespace trim
diff --git a/core/ui/ControlPanel/Settings.tid b/core/ui/ControlPanel/Settings.tid index f4a4b13c2..74004ffa0 100644 --- a/core/ui/ControlPanel/Settings.tid +++ b/core/ui/ControlPanel/Settings.tid @@ -2,18 +2,6 @@ title: $:/core/ui/ControlPanel/Settings tags: $:/tags/ControlPanel caption: {{$:/language/ControlPanel/Settings/Caption}} -\define lingo-base() $:/language/ControlPanel/Settings/ - -<> - -<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]"> - -
- -!! <$link><$transclude field="caption"/> - -<$transclude/> - -
- - +
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/SettingsTab]!has[draft.of]]" default="$:/core/ui/ControlPanel/Settings/TiddlyWiki" explicitState="$:/state/tab--697582678"/> +
\ No newline at end of file diff --git a/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid b/core/ui/ControlPanel/TiddlyWiki.tid similarity index 96% rename from plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid rename to core/ui/ControlPanel/TiddlyWiki.tid index f88865997..40be32139 100644 --- a/plugins/tiddlywiki/codemirror/ui/controlpanel/tiddlywiki.tid +++ b/core/ui/ControlPanel/TiddlyWiki.tid @@ -1,6 +1,7 @@ title: $:/core/ui/ControlPanel/Settings/TiddlyWiki tags: $:/tags/ControlPanel/SettingsTab caption: TiddlyWiki +list-before: \define lingo-base() $:/language/ControlPanel/Settings/ diff --git a/core/ui/EditTemplate/Preview/output.tid b/core/ui/EditTemplate/Preview/output.tid index 4e5bf0e33..5c53d8c22 100644 --- a/core/ui/EditTemplate/Preview/output.tid +++ b/core/ui/EditTemplate/Preview/output.tid @@ -2,7 +2,7 @@ title: $:/core/ui/EditTemplate/body/preview/output tags: $:/tags/EditPreview caption: {{$:/language/EditTemplate/Body/Preview/Type/Output}} -\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]] +\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View/Body]!is[draft]] <$set name="tv-tiddler-preview" value="yes"> <$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} /> diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid index 8d829b30e..5084478b4 100644 --- a/core/ui/EditTemplate/tags.tid +++ b/core/ui/EditTemplate/tags.tid @@ -14,8 +14,8 @@ color:$(foregroundColor)$; \define tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags") \whitespace trim <$vars foregroundColor=<> backgroundColor="""$colour$"""> -> class="tc-tag-label tc-tag-list-item tc-small-gap-right"> -<$transclude tiddler="""$icon$"""/><$view field="title" format="text" /> +> class="tc-tag-label tc-tag-list-item tc-small-gap-right" data-tag-title=<>> +<$transclude tiddler="""$icon$"""/><$view field="title" format="text"/> <$button class="tc-btn-invisible tc-remove-tag-button" style=<>><$action-listops $tiddler=<> $field=<<__tagField__>> $subfilter="-[{!!title}]"/>{{$:/core/images/close-button}} diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid index f7df349e9..0b32df5f8 100644 --- a/core/ui/PageStylesheet.tid +++ b/core/ui/PageStylesheet.tid @@ -1,6 +1,6 @@ title: $:/core/ui/PageStylesheet -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] \whitespace trim <$set name="currentTiddler" value={{$:/language}}> diff --git a/core/ui/PageTemplate.tid b/core/ui/PageTemplate.tid index 892e1b166..f0ab4852a 100644 --- a/core/ui/PageTemplate.tid +++ b/core/ui/PageTemplate.tid @@ -4,7 +4,7 @@ description: {{$:/language/PageTemplate/Description}} icon: $:/core/images/layout-button \whitespace trim -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] <$vars tv-config-toolbar-icons={{$:/config/Toolbar/Icons}} diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid index 1f84654cd..d3e528148 100644 --- a/core/ui/SideBar/Open.tid +++ b/core/ui/SideBar/Open.tid @@ -26,7 +26,7 @@ $button$
<$list filter="[list]" history=<> storyview="pop">
-<$macrocall $name="droppable-item" button="<$button message='tm-close-tiddler' tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class='tc-btn-invisible tc-btn-mini tc-small-gap-right'>{{$:/core/images/close-button}}<$link to={{!!title}}><$view field='title'/>"/> +<$macrocall $name="droppable-item" button="<$button message='tm-close-tiddler' tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class='tc-btn-invisible tc-btn-mini tc-small-gap-right'>{{$:/core/images/close-button}}<$link/>"/>
<$tiddler tiddler=""> diff --git a/core/ui/StoryTiddlerTemplate.tid b/core/ui/StoryTiddlerTemplate.tid index 7379f00b1..7cc26a849 100644 --- a/core/ui/StoryTiddlerTemplate.tid +++ b/core/ui/StoryTiddlerTemplate.tid @@ -1,3 +1,3 @@ title: $:/core/ui/StoryTiddlerTemplate -<$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/StoryTiddlerTemplateFilter]!is[draft]get[text]] :and[!is[blank]else{$:/config/ui/ViewTemplate}] }}} /> +<$transclude tiddler={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/StoryTiddlerTemplateFilter]!is[draft]get[text]] :and[has[title]else[$:/core/ui/ViewTemplate]] }}} /> diff --git a/core/ui/TagPickerTagTemplate.tid b/core/ui/TagPickerTagTemplate.tid index 9545725b3..6329f86ae 100644 --- a/core/ui/TagPickerTagTemplate.tid +++ b/core/ui/TagPickerTagTemplate.tid @@ -15,7 +15,7 @@ title: $:/core/ui/TagPickerTagTemplate <> <$set name="backgroundColor" value={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}> <$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target=<> fallbackTarget=<> colourA=<> colourB=<>/>"""> ->> +> data-tag-title=<> > {{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/> diff --git a/core/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid index f0aba9c97..dcba5c953 100644 --- a/core/ui/ViewTemplate.tid +++ b/core/ui/ViewTemplate.tid @@ -5,10 +5,10 @@ title: $:/core/ui/ViewTemplate $:/state/folded/$(currentTiddler)$ \end \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/> -\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] +\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View]!is[draft]] <$vars storyTiddler=<> tiddlerInfoState=<>>
> data-tags={{!!tags}} class={{{ [all[shadows+tiddlers]tag[$:/tags/ClassFilters/TiddlerTemplate]!is[draft]] :map:flat[subfilter{!!text}] tc-tiddler-frame tc-tiddler-view-frame [is[tiddler]then[tc-tiddler-exists]] [is[missing]!is[shadow]then[tc-tiddler-missing]] [is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [is[system]then[tc-tiddler-system]] [{!!class}] [tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}} role="article"> -<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!is[draft]]" variable="listItem"> <$transclude tiddler=<>/>
diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid index 86d83bf30..34e6aaa38 100644 --- a/core/ui/ViewTemplate/body.tid +++ b/core/ui/ViewTemplate/body.tid @@ -1,7 +1,7 @@ title: $:/core/ui/ViewTemplate/body tags: $:/tags/ViewTemplate -\import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]] +\import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View/Body]!is[draft]] <$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<> text="hide" retain="yes" animate="yes"> diff --git a/core/wiki/config/GlobalImportFilter.tid b/core/wiki/config/GlobalImportFilter.tid new file mode 100644 index 000000000..4d07e3f37 --- /dev/null +++ b/core/wiki/config/GlobalImportFilter.tid @@ -0,0 +1,2 @@ +title: $:/core/config/GlobalImportFilter +text: [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global]!is[draft]] diff --git a/core/wiki/config/wikilink.tid b/core/wiki/config/wikilink.tid index 9a395abd6..6cd5cd8cb 100644 --- a/core/wiki/config/wikilink.tid +++ b/core/wiki/config/wikilink.tid @@ -1,3 +1,3 @@ title: $:/config/WikiParserRules/Inline/wikilink -enable \ No newline at end of file +disable \ No newline at end of file diff --git a/core/wiki/macros/translink.tid b/core/wiki/macros/translink.tid index 1a1f54c99..9cc465422 100644 --- a/core/wiki/macros/translink.tid +++ b/core/wiki/macros/translink.tid @@ -3,14 +3,26 @@ tags: $:/tags/Macro \define translink(title,mode:"block") \whitespace trim -
+<$list filter="[<__mode__>match[block]]"> +
+
<$link to="""$title$"""> -<$text text="""$title$"""/> +

<$text text="""$title$"""/>

-
-<$transclude tiddler="""$title$""" mode="$mode$"> -"<$text text="""$title$"""/>" is missing +<$transclude tiddler="""$title$""" mode="block"> +<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/>
+ +<$list filter="[<__mode__>match[inline]]"> + +<$link to="""$title$"""> +<$text text="""$title$"""/> + + (<$transclude tiddler="""$title$""" mode="inline"> +<$set name="currentTiddler" value="""$title$"""><$transclude tiddler="$:/language/MissingTiddler/Hint"/> +) + + \end diff --git a/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid b/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid index c334ab256..37659629f 100644 --- a/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid +++ b/editions/dev/tiddlers/from tw5.com/mechanisms/TestingMechanism.tid @@ -2,7 +2,7 @@ modified: 20141013085608911 tags: Mechanisms title: TestingMechanism -TiddlyWiki5 incorporates the Jasmine JavaScript testing framework (see http://pivotal.github.io/jasmine/). It allows the same tests to be run both in the browser and under Node.js. +TiddlyWiki5 incorporates the Jasmine JavaScript testing framework (see https://jasmine.github.io/). It allows the same tests to be run both in the browser and under Node.js. ! TiddlyWiki5 Testing Components diff --git a/editions/dev/tiddlers/new/dragndropinterop.html b/editions/dev/tiddlers/new/dragndropinterop.html index ecd7aba12..ecadca603 100644 --- a/editions/dev/tiddlers/new/dragndropinterop.html +++ b/editions/dev/tiddlers/new/dragndropinterop.html @@ -15,6 +15,10 @@
Drag me to a TiddlyWiki window
+ + \ No newline at end of file diff --git a/editions/dev/tiddlers/system/configWikiParserRulesInlineWikilink.tid b/editions/dev/tiddlers/system/configWikiParserRulesInlineWikilink.tid new file mode 100644 index 000000000..9a395abd6 --- /dev/null +++ b/editions/dev/tiddlers/system/configWikiParserRulesInlineWikilink.tid @@ -0,0 +1,3 @@ +title: $:/config/WikiParserRules/Inline/wikilink + +enable \ No newline at end of file diff --git a/editions/dynaviewdemo/tiddlers/ViewTemplate.tid b/editions/dynaviewdemo/tiddlers/ViewTemplate.tid index cbf6eca2a..91bcfae86 100644 --- a/editions/dynaviewdemo/tiddlers/ViewTemplate.tid +++ b/editions/dynaviewdemo/tiddlers/ViewTemplate.tid @@ -5,7 +5,7 @@ title: $:/core/ui/ViewTemplate $:/state/folded/$(currentTiddler)$ \end \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/> -\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] +\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View]!is[draft]] <$vars storyTiddler=<> tiddlerInfoState=<>>
> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [is[tiddler]then[tc-tiddler-exists]] [is[missing]!is[shadow]then[tc-tiddler-missing]] [is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [is[system]then[tc-tiddler-system]] [{!!class}] [tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}> <$set name="state" value={{{ [[$:/state/viewtemplate/visibility/]addsuffix] }}}> diff --git a/editions/es-ES/tiddlers/$__Acknowledgements.tid b/editions/es-ES/tiddlers/$__Acknowledgements.tid index 48074d928..d907bc9e6 100644 --- a/editions/es-ES/tiddlers/$__Acknowledgements.tid +++ b/editions/es-ES/tiddlers/$__Acknowledgements.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki TiddlyWiki incorpora código de los siguientes proyectos OpenSource: * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]] -* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]] +* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]] * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]] ...y materiales de estos otros proyectos: diff --git a/editions/fr-FR/tiddlers/$__Acknowledgements.tid b/editions/fr-FR/tiddlers/$__Acknowledgements.tid index 1adf217a0..6e9f6e0e5 100644 --- a/editions/fr-FR/tiddlers/$__Acknowledgements.tid +++ b/editions/fr-FR/tiddlers/$__Acknowledgements.tid @@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki TiddlyWiki intègre du code provenant de ces excellents projets OpenSource<> * [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]] -* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]] +* [[The Jasmine JavaScript Test Framework|https://jasmine.github.io/]] * [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]] Et des contenus provenenant de ces sources<> diff --git a/editions/fr-FR/tiddlers/ReadMe.tid b/editions/fr-FR/tiddlers/ReadMe.tid index b02b564cb..aedcfd423 100644 --- a/editions/fr-FR/tiddlers/ReadMe.tid +++ b/editions/fr-FR/tiddlers/ReadMe.tid @@ -5,7 +5,7 @@ type: text/vnd.tiddlywiki \define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html -<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +<$importvariables filter={{$:/core/config/GlobalImportFilter}}> Bienvenue sur <>, un carnet de notes personnel web et non-linéaire que tout le monde peut utiliser et conserver, sans dépendre d'une quelconque entreprise. diff --git a/editions/introduction/tiddlers/slides/Formatting.tid b/editions/introduction/tiddlers/slides/Formatting.tid index d3a074967..7cce34a4a 100644 --- a/editions/introduction/tiddlers/slides/Formatting.tid +++ b/editions/introduction/tiddlers/slides/Formatting.tid @@ -8,6 +8,6 @@ Tiddlers can contain formatted text: Formatting is typed with special codes: -<$edit-text tiddler="FormattingDemoText" class="tc-edit-texteditor" minHeight="10px"/> +<$edit-text tiddler="FormattingDemoText" class="tc-edit-texteditor" minHeight="100px"/> TiddlyWiki is not just for text. [[Images]] are first class citizens, too. diff --git a/editions/introduction/tiddlywiki.info b/editions/introduction/tiddlywiki.info index 456316e06..680730452 100644 --- a/editions/introduction/tiddlywiki.info +++ b/editions/introduction/tiddlywiki.info @@ -49,14 +49,6 @@ ], "build": { "index": [ - "--rendertiddler","$:/core/save/all","index.html","text/plain"], - "favicon": [ - "--savetiddler","$:/favicon.ico","favicon.ico", - "--savetiddler","$:/green_favicon.ico","static/favicon.ico"], - "static": [ - "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", - "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", - "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain", - "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"] + "--rendertiddler","$:/core/save/all","index.html","text/plain"] } } diff --git a/editions/prerelease/tiddlers/Release 5.3.0.tid b/editions/prerelease/tiddlers/Release 5.3.0.tid index 63a57cd4d..db7e3a3b9 100644 --- a/editions/prerelease/tiddlers/Release 5.3.0.tid +++ b/editions/prerelease/tiddlers/Release 5.3.0.tid @@ -1,19 +1,19 @@ caption: 5.3.0 -created: 20230419103154368 -modified: 20230419103154368 +created: 20230506164543446 +modified: 20230506164543446 tags: ReleaseNotes title: Release 5.3.0 type: text/vnd.tiddlywiki -//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/master...parameterised-transclusions]]// +//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.2.7...master]]// -! About v5.3.0 +! Overview of v5.3.0 -This pre-release introduces a number of significant improvements and new features related to some of TiddlyWiki's most fundamental components: macros, widgets, operators and transclusion. +This release introduces a number of significant improvements and new features related to some of TiddlyWiki's most fundamental components: macros, widgets, operators and transclusion. v5.3.0 also contains several other bug fixes and improvements. -! Introduction to v5.3.0 +! Introduction to Parameterised Transclusion, Procedures, Functions and Custom Widgets -The motivation of these changes is to fix one of ~TiddlyWiki 5's early design flaws: the reliance on macros using textual substitution as the primary way to modularise and reuse wikitext and filters. +<<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/6666">> The motivation of these changes is to fix one of ~TiddlyWiki 5's early design flaws: the reliance on macros using textual substitution as the primary way to modularise and reuse wikitext and filters. Experience has shown that while macros are a good match for a small number of tasks, they are brittle and error prone for many common operations. See [[Macro Pitfalls]] for a discussion of the problems that accompany this approach. Over the years we have introduced mitigations for the worst problems but these have come at a cost of increased complexity. @@ -30,9 +30,15 @@ These changes lay the groundwork for macros and related features to be deprecate The new transclusion architecture is not by itself sufficient to enable us to fully deprecate macros yet. To handle the remaining use cases we propose a new backtick quoted attribute format that allows for the substitution of variable values. See https://github.com/Jermolene/TiddlyWiki5/issues/6663 for details. +! Defaulting to Disabling CamelCase Links + +<<.link-badge-updated "https://github.com/Jermolene/TiddlyWiki5/pull/7513">> CamelCase linking is now disabled by default. (Note that this wiki has CamelCase linking explicitly enabled) + ! Plugin Improvements -* +* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7260">> Dynannotate pugin to support three additional search modes +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7365">> problem with [[BrowserStorage Plugin]] unnecessarily saving shadow tiddlers +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7493">> [[CodeMirror Plugin]] to add an option to make trailing spaces visible ! Translation improvement @@ -54,15 +60,30 @@ Improvements to the following translations: ! Filter improvements -* +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7511"> new [[deserialize Operator]] for converting various textual representations of tiddlers into JSON data +* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7292">> [[format Operator]] to support converting Unix timestamps to TiddlyWiki's native date format + ! Hackability Improvements -* +* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7413">> [[Core Icons]] to allow the size to be controlled with a parameter +** <<.warning """This change can cause problems with non-standard usage of the core icons where the text is directly rendered instead of being transcluded""">> +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7182">> new [[thisTiddler Variable]] that refers to the tiddler currently being rendered +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7332">> [[Story Tiddler Template Cascade]] handling to fall back to the default template if the output of the cascade is not valid +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7378">> missing file extensions for "audio/mpeg" files ! Bug Fixes -* +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7215">> importing tiddlers by pasting tiddler data +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7400">> unneeded 14px bottom border for textareas with autoheight enabled +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7380">> crashes when using an invalid CSS selector for [[WidgetMessage: tm-focus-selector]] and [[WidgetMessage: tm-scroll]] +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7401">> bug whereby scrolling occurs if the linkcatcher widget triggers an action-navigate and the $scroll attribute is set to "no" +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7409">> problem switching between LTR and RTL text +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/7448">> bug when checkbox widget's listField attribute was given the name of a date field (like <<.field created>> or <<.field modified>>) +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7529">> size of buttons in dropdown for editor "link" toolbar button +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/commit/8e132948b6bec623d81d300fbe6dc3a0307bcc6d">> crash when transcluding a lazily loaded tiddler as an attribute value +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/issues/7462">> DiffTextWidget crash with missing or empty attributes +* <<.link-badge-improved "https://github.com/Jermolene/TiddlyWiki5/pull/7448">> CheckboxWidget to avoid writing to date fields ! Developer Improvements @@ -70,14 +91,36 @@ Improvements to the following translations: ! Node.js Improvements -* +* <<.link-badge-extended "https://github.com/Jermolene/TiddlyWiki5/pull/7471">> [[WebServer Parameter: authenticated-user-header]] to require URI encoding of authenticated username header, permitting non-ASCII characters in usernames +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/pull/7253">> support for `filepath` source attribute to [[tiddlywiki.files Files]] +* <<.link-badge-added "https://github.com/Jermolene/TiddlyWiki5/commit/48b22abdaab62c281c207127c66883b50898f9dd">> a warning message for JSON errors in [[tiddlywiki.info Files]] or [[plugin.info Files|PluginFolders]] ! Performance Improvements -* +* <<.link-badge-fixed "https://github.com/Jermolene/TiddlyWiki5/pull/4624">> module execution to reuse the same sandbox, saving memory and improving performance + ! Acknowledgements [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki: <<.contributors """ +Arlen22 +BramChen +btheado +donmor +flibbles +GameDungeon +JoshuaFontany +kookma +linonetwo +Marxsal +mateuszwilczek +michsa +muzimuzhi +pmario +rmunn +saqimtiaz +tavin +twMat +yaisog """>> diff --git a/editions/prerelease/tiddlers/system/configWikiParserRulesInlineWikilink.tid b/editions/prerelease/tiddlers/system/configWikiParserRulesInlineWikilink.tid new file mode 100644 index 000000000..9a395abd6 --- /dev/null +++ b/editions/prerelease/tiddlers/system/configWikiParserRulesInlineWikilink.tid @@ -0,0 +1,3 @@ +title: $:/config/WikiParserRules/Inline/wikilink + +enable \ No newline at end of file diff --git a/editions/server-external-js/tiddlers/config/$__DefaultTiddlers.tid b/editions/server-external-js/tiddlers/config/$__DefaultTiddlers.tid new file mode 100644 index 000000000..a1f1a0a27 --- /dev/null +++ b/editions/server-external-js/tiddlers/config/$__DefaultTiddlers.tid @@ -0,0 +1,7 @@ +created: 20230314153132081 +modified: 20230314153243008 +title: $:/DefaultTiddlers +type: text/vnd.tiddlywiki + +GettingStarted +[[Using the external JavaScript template]] diff --git a/editions/server-external-js/tiddlers/config/$__config_SaveWikiButton_Filename.tid b/editions/server-external-js/tiddlers/config/$__config_SaveWikiButton_Filename.tid new file mode 100644 index 000000000..071c85fe9 --- /dev/null +++ b/editions/server-external-js/tiddlers/config/$__config_SaveWikiButton_Filename.tid @@ -0,0 +1,4 @@ +title: $:/config/SaveWikiButton/Filename +type: text/vnd.tiddlywiki + +external-<>.html \ No newline at end of file diff --git a/editions/server-external-js/tiddlers/external/tiddlywiki.files b/editions/server-external-js/tiddlers/external/tiddlywiki.files new file mode 100644 index 000000000..73474d2ce --- /dev/null +++ b/editions/server-external-js/tiddlers/external/tiddlywiki.files @@ -0,0 +1,8 @@ +{ + "tiddlers": [ + { + "file": "../../../tw5.com/tiddlers/webserver/Using the external JavaScript template.tid", + "isTiddlerFile": true + } + ] +} \ No newline at end of file diff --git a/editions/server-external-js/tiddlywiki.info b/editions/server-external-js/tiddlywiki.info index b8d4c37ee..cb02accd5 100644 --- a/editions/server-external-js/tiddlywiki.info +++ b/editions/server-external-js/tiddlywiki.info @@ -2,8 +2,7 @@ "description": "Client-server edition with external tiddlywiki.js", "plugins": [ "tiddlywiki/tiddlyweb", - "tiddlywiki/filesystem", - "tiddlywiki/highlight" + "tiddlywiki/filesystem" ], "themes": [ "tiddlywiki/vanilla", @@ -13,7 +12,7 @@ "listen": [ "--listen","root-tiddler=$:/core/save/all-external-js","use-browser-cache=yes"], "index": [ - "--render","$:/core/save/offline-external-js","index.html","text/plain", + "--render","$:/core/save/offline-external-js","[[external-]addsuffixaddsuffix[.html]]","text/plain", "--render","$:/core/templates/tiddlywiki5.js","[[tiddlywikicore-]addsuffixaddsuffix[.js]]","text/plain"], "static": [ "--render","$:/core/templates/static.template.html","static.html","text/plain", diff --git a/editions/test/tiddlers/tests/data/deserializers/case 6.tid b/editions/test/tiddlers/tests/data/deserializers/case 6.tid new file mode 100644 index 000000000..b6e653c39 --- /dev/null +++ b/editions/test/tiddlers/tests/data/deserializers/case 6.tid @@ -0,0 +1,8 @@ +title: dezerializer test data case 6 +type: application/json + +[ + {"created":"20230601125557184","text":"Before you start storing important information in ~TiddlyWiki it is vital to make sure that you can reliably save changes. See https://tiddlywiki.com/#GettingStarted for details\n\n","title":"GettingStarted","modified":"20230601125601619"}, + {"created":"20230601125507054","text":"Welcome to \"TiddlyWiki\".\n\nThis is a test tiddler.","tags":"","title":"Hello There \"Welcome\"","modified":"20230601125551144"}, + {"title":"TiddlyWiki","created":"20130822170700000","modified":"20170127221451610","tags":"Concepts","type":"text/vnd.tiddlywiki","text":"~TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.\n\n~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit."} +] diff --git a/editions/test/tiddlers/tests/data/this-tiddler/Simple.tid b/editions/test/tiddlers/tests/data/this-tiddler/Simple.tid new file mode 100644 index 000000000..4aad83c98 --- /dev/null +++ b/editions/test/tiddlers/tests/data/this-tiddler/Simple.tid @@ -0,0 +1,29 @@ +title: ThisTiddler/Simple +description: Simple usage of thisTiddler variable +type: text/vnd.tiddlywiki-multiple +tags: [[$:/tags/wiki-test-spec]] + +title: Output + +\whitespace trim +\import Macro +\define print-this-tiddler() +<$text text=<>/> +\end + +(<$text text=<>/>) + +(<>) + +(<>) + ++ +title: Macro + +\define imported-print-this-tiddler() +<$text text=<>/> +\end ++ +title: ExpectedResult + +

(Output)

(Output)

(Output)

\ No newline at end of file diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid index 0be77a9a3..296aa6931 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-ActionWidget.tid @@ -12,15 +12,15 @@ title: Output title: Actions \whitespace trim - -\widget $$action-mywidget(one:'Jaguar') + +\widget $action.mywidget(one:'Jaguar') \whitespace trim <$action-setfield $tiddler="Result" $field="text" $value=<>/> \end -<$$action-mywidget one="Dingo"> +<$action.mywidget one="Dingo"> Crocodile - + + title: ExpectedResult diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid index 15d0c8d9e..ccb590d4f 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Simple.tid @@ -12,21 +12,21 @@ title: Output title: TiddlerOne \whitespace trim - -\widget $$mywidget(one:'Jaguar') + +\widget $my.widget(one:'Jaguar') \whitespace trim <$text text=<>/> <$slot $name="ts-raw"> Whale \end -<$$mywidget one="Dingo"> +<$my.widget one="Dingo"> Crocodile - -<$$mywidget one="BumbleBee"> + +<$my.widget one="BumbleBee"> Squirrel - -<$$mywidget/> + +<$my.widget/> + title: ExpectedResult diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted-Empty.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted-Empty.tid index efd1e7041..0ada5100b 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted-Empty.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted-Empty.tid @@ -6,13 +6,13 @@ tags: [[$:/tags/wiki-test-spec]] title: Output \whitespace trim -\widget $$mywidget() +\widget $my.widget() <$slot $name=ts-raw>the body is empty \end -#<$$mywidget/> -#<$$mywidget> -#<$$mywidget>the body is not empty +#<$my.widget/> +#<$my.widget> +#<$my.widget>the body is not empty + title: ExpectedResult diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid index c10e84127..eb7d61756 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-Slotted.tid @@ -6,21 +6,21 @@ tags: [[$:/tags/wiki-test-spec]] title: Output \whitespace trim -\widget $$mywidget(one:'Jaguar') +\widget $my.widget(one:'Jaguar') \whitespace trim <$text text=<>/> <$slot $name="ts-stuff"> Whale \end -<$$mywidget one="Dingo"> +<$my.widget one="Dingo"> <$fill $name="ts-stuff"> Crocodile - -<$$mywidget one="BumbleBee"> + +<$my.widget one="BumbleBee"> Squirrel - + + title: ExpectedResult diff --git a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid index 8ef700b41..e4e7dbaaf 100644 --- a/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid +++ b/editions/test/tiddlers/tests/data/transclude/CustomWidget-VariableAttribute.tid @@ -12,17 +12,17 @@ title: Output title: TiddlerOne \whitespace trim - -\widget $$mywidget($variable:'Jaguar') + +\widget $my.widget($variable:'Jaguar') \whitespace trim <$text text=<<$variable>>/> <$slot $name="ts-raw"> Whale \end -<$$mywidget $variable="Dingo"> +<$my.widget $variable="Dingo"> Crocodile - + + title: ExpectedResult diff --git a/editions/test/tiddlers/tests/data/transclude/Macro-Missing.tid b/editions/test/tiddlers/tests/data/transclude/Macro-Missing.tid new file mode 100644 index 000000000..8a1a837e5 --- /dev/null +++ b/editions/test/tiddlers/tests/data/transclude/Macro-Missing.tid @@ -0,0 +1,40 @@ +title: Transclude/Macro/Missing +description: Transcluding a missing or blank variable +type: text/vnd.tiddlywiki-multiple +tags: [[$:/tags/wiki-test-spec]] + +title: Output + +\whitespace trim +<$macrocall $name="missingmacro"> +Fallback content + + +<$transclude $variable="missingmacro"> +Fallback content + + +<$macrocall $name=""> +Fallback content + + +<$transclude $variable=""> +Fallback content + + +<$let emptyVariable=""> + +<$macrocall $name="emptyVariable"> +Fallback content + + +<$transclude $variable="emptyVariable"> +Fallback content + + + + ++ +title: ExpectedResult + +

Fallback content

Fallback content

Fallback content

Fallback content

Fallback content

Fallback content

\ No newline at end of file diff --git a/editions/test/tiddlers/tests/test-checkbox-widget.js b/editions/test/tiddlers/tests/test-checkbox-widget.js index a6572afd6..b0921e286 100644 --- a/editions/test/tiddlers/tests/test-checkbox-widget.js +++ b/editions/test/tiddlers/tests/test-checkbox-widget.js @@ -56,7 +56,7 @@ Tests the checkbox widget thoroughly. * Test data for checkbox widget tests */ - const fieldModeTests = [ + var fieldModeTests = [ { testName: "field mode checked", tiddlers: [{title: "TiddlerOne", text: "Jolly Old World", expand: "yes"}], @@ -95,16 +95,16 @@ Tests the checkbox widget thoroughly. }, ]; - const indexModeTests = fieldModeTests.map(data => { - const newData = {...data}; - const newName = data.testName.replace('field mode', 'index mode'); - const newTiddlers = data.tiddlers.map(tiddler => { + var indexModeTests = fieldModeTests.map(data => { + var newData = {...data}; + var newName = data.testName.replace('field mode', 'index mode'); + var newTiddlers = data.tiddlers.map(tiddler => { return {title: tiddler.title, type: "application/x-tiddler-dictionary", text: `one: a\nexpand: ${tiddler.expand}\ntwo: b`} }); - const newWidgetText = data.widgetText.replace("field='expand'", "index='expand'"); - const newChange = {}; - for (const key of Object.keys(data.expectedChange)) { - const oldChange = data.expectedChange[key]; + var newWidgetText = data.widgetText.replace("field='expand'", "index='expand'"); + var newChange = {}; + for (var key of Object.keys(data.expectedChange)) { + var oldChange = data.expectedChange[key]; if (oldChange.expand) { newChange[key] = { text: `one: a\nexpand: ${oldChange.expand}\ntwo: b` } } else { @@ -119,7 +119,26 @@ Tests the checkbox widget thoroughly. return newData; }); - const listModeTests = [ + var listModeTestsForDateFields = [ + { + testName: "list mode created date field", + tiddlers: [{title: "Colors", created: "201304152222", modified: "202301022222"}], + widgetText: "<$checkbox tiddler='Colors' listField='created' checked='green' />", + startsOutChecked: false, + finalValue: false, + expectedChange: { "Colors": { created: new Date("2013-04-15T22:22:00Z")}} // created field should *not* be touched by a listField checkbox + }, + { + testName: "list mode modified date field", + tiddlers: [{title: "Colors", created: "201304152222", modified: "202301022222"}], + widgetText: "<$checkbox tiddler='Colors' listField='modified' checked='green' />", + startsOutChecked: false, + finalValue: false, + expectedChange: { "Colors": { modified: new Date("2023-01-02T22:22:00Z")}} // modified field should *not* be touched by a listField checkbox + }, + ] + + var listModeTests = [ { testName: "list mode add", tiddlers: [{title: "Colors", colors: "orange yellow"}], @@ -235,11 +254,11 @@ Tests the checkbox widget thoroughly. ]; // https://github.com/Jermolene/TiddlyWiki5/issues/6871 - const listModeTestsWithListField = ( + var listModeTestsWithListField = ( listModeTests .filter(data => data.widgetText.includes("listField='colors'")) .map(data => { - const newData = { + var newData = { ...data, tiddlers: data.tiddlers.map(tiddler => ({...tiddler, list: tiddler.colors, colors: undefined})), widgetText: data.widgetText.replace("listField='colors'", "listField='list'"), @@ -250,11 +269,11 @@ Tests the checkbox widget thoroughly. return newData; }) ); - const listModeTestsWithTagsField = ( + var listModeTestsWithTagsField = ( listModeTests .filter(data => data.widgetText.includes("listField='colors'")) .map(data => { - const newData = { + var newData = { ...data, tiddlers: data.tiddlers.map(tiddler => ({...tiddler, tags: tiddler.colors, colors: undefined})), widgetText: data.widgetText.replace("listField='colors'", "listField='tags'"), @@ -266,20 +285,20 @@ Tests the checkbox widget thoroughly. }) ); - const indexListModeTests = listModeTests.map(data => { - const newData = {...data}; - const newName = data.testName.replace('list mode', 'index list mode'); - const newTiddlers = data.tiddlers.map(tiddler => { + var indexListModeTests = listModeTests.map(data => { + var newData = {...data}; + var newName = data.testName.replace('list mode', 'index list mode'); + var newTiddlers = data.tiddlers.map(tiddler => { if (tiddler.hasOwnProperty('colors')) { return {title: tiddler.title, type: "application/x-tiddler-dictionary", text: `one: a\ncolors: ${tiddler.colors}\ntwo: b`} } else if (tiddler.hasOwnProperty('someField')) { return {title: tiddler.title, type: "application/x-tiddler-dictionary", text: `one: a\nsomeField: ${tiddler.someField}\ntwo: b`} } }); - const newWidgetText = data.widgetText.replace("listField='colors'", "listIndex='colors'").replace(/\$field/g, '$index').replace("listField='someField'", "listIndex='someField'"); - const newChange = {}; - for (const key of Object.keys(data.expectedChange)) { - const oldChange = data.expectedChange[key]; + var newWidgetText = data.widgetText.replace("listField='colors'", "listIndex='colors'").replace(/\$field/g, '$index').replace("listField='someField'", "listIndex='someField'"); + var newChange = {}; + for (var key of Object.keys(data.expectedChange)) { + var oldChange = data.expectedChange[key]; if (oldChange.colors) { newChange[key] = { text: `one: a\ncolors: ${oldChange.colors}\ntwo: b` } } else if (oldChange.someField !== undefined) { @@ -296,7 +315,7 @@ Tests the checkbox widget thoroughly. return newData; }); - const filterModeTests = [ + var filterModeTests = [ { testName: "filter mode false -> true", tiddlers: [{title: "Colors", colors: "red orange yellow"}], @@ -482,9 +501,10 @@ Tests the checkbox widget thoroughly. }, ]; - const checkboxTestData = fieldModeTests.concat( + var checkboxTestData = fieldModeTests.concat( indexModeTests, listModeTests, + listModeTestsForDateFields, listModeTestsWithListField, listModeTestsWithTagsField, indexListModeTests, @@ -494,7 +514,7 @@ Tests the checkbox widget thoroughly. /* * Checkbox widget tests using the test data above */ - for (const data of checkboxTestData) { + for (var data of checkboxTestData) { it('checkbox widget test: ' + data.testName, function() { // Setup @@ -505,7 +525,7 @@ Tests the checkbox widget thoroughly. // Check initial state - const widget = findNodeOfType('checkbox', widgetNode); + var widget = findNodeOfType('checkbox', widgetNode); // Verify that the widget is or is not checked as expected expect(widget.getValue()).toBe(data.startsOutChecked); @@ -519,16 +539,16 @@ Tests the checkbox widget thoroughly. widget.handleChangeEvent(null); // Check state again: in most tests, checkbox should be inverse of what it was - const finalValue = data.hasOwnProperty('finalValue') ? data.finalValue : !data.startsOutChecked; + var finalValue = data.hasOwnProperty('finalValue') ? data.finalValue : !data.startsOutChecked; expect(widget.getValue()).toBe(finalValue); // Check that tiddler(s) has/have gone through expected change(s) - for (const key of Object.keys(data.expectedChange)) { - const tiddler = wiki.getTiddler(key); - const change = data.expectedChange[key]; - for (const fieldName of Object.keys(change)) { - const expectedValue = change[fieldName]; - const fieldValue = tiddler.fields[fieldName]; + for (var key of Object.keys(data.expectedChange)) { + var tiddler = wiki.getTiddler(key); + var change = data.expectedChange[key]; + for (var fieldName of Object.keys(change)) { + var expectedValue = change[fieldName]; + var fieldValue = tiddler.fields[fieldName]; expect(fieldValue).toEqual(expectedValue); } } diff --git a/editions/test/tiddlers/tests/test-deserialize-operator.js b/editions/test/tiddlers/tests/test-deserialize-operator.js new file mode 100644 index 000000000..c629de3ae --- /dev/null +++ b/editions/test/tiddlers/tests/test-deserialize-operator.js @@ -0,0 +1,44 @@ +/*\ +title: test-deserialize-operator.js +type: application/javascript +tags: [[$:/tags/test-spec]] + +Tests deserialize[] filter operator with various core deserializers + +\*/ +(function(){ + + /* jslint node: true, browser: true */ + /* eslint-env node, browser, jasmine */ + /* eslint no-mixed-spaces-and-tabs: ["error", "smart-tabs"]*/ + /* global $tw, require */ + "use strict"; + + + describe("deserialize operator tests", function() { + + it("should support the deserialize[] operator", function() { + //Unknown deserializer as operand + expect($tw.wiki.filterTiddlers("[{dezerializer test data case 4}deserialize[unknown/deserializer]]")).toEqual([$tw.language.getString("Error/DeserializeOperator/UnknownDeserializer")]); + + //Missing operand + expect($tw.wiki.filterTiddlers("[{dezerializer test data case 4}deserialize[]]")).toEqual([$tw.language.getString("Error/DeserializeOperator/MissingOperand")]); + + //Deserialize TiddlyWiki file + expect($tw.wiki.filterTiddlers("[{dezerializer test data case 4}deserialize[text/html]]")).toEqual(['[{"type":"text/vnd.tiddlywiki","text":"Abacus","title":"Hello \\"There\\""},{"title":"Hello \\"There\\"","text":"Calculator"}]']); + expect($tw.wiki.filterTiddlers("[{dezerializer test data case 5}deserialize[text/html]]")).toEqual(['[{"type":"text/vnd.tiddlywiki","text":"Abacus","title":"Hello \\"There\\""},{"title":"Hello \\"There\\"","text":"Calculator"},{"title":"Hello \\"There\\"","text":"Protractor"}]']); + + // Deserialize JSON payload containing tiddlers + expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]]")).toEqual( [ `[{"created":"20230601125557184","text":"Before you start storing important information in ~TiddlyWiki it is vital to make sure that you can reliably save changes. See https://tiddlywiki.com/#GettingStarted for details\\n\\n","title":"GettingStarted","modified":"20230601125601619"},{"created":"20230601125507054","text":"Welcome to \\"TiddlyWiki\\".\\n\\nThis is a test tiddler.","tags":"","title":"Hello There \\"Welcome\\"","modified":"20230601125551144"},{"title":"TiddlyWiki","created":"20130822170700000","modified":"20170127221451610","tags":"Concepts","type":"text/vnd.tiddlywiki","text":"~TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.\\n\\n~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit."}]` ]); + expect($tw.wiki.filterTiddlers("[{dezerializer test data case 6}deserialize[application/json]jsonindexes[]] :map[{dezerializer test data case 6}jsonget,[title]]")).toEqual([ 'GettingStarted', 'Hello There "Welcome"', 'TiddlyWiki' ]); + + //Deserialize TiddlyWiki file with an mismatched deserializer + expect($tw.wiki.filterTiddlers("[{dezerializer test data case 5}deserialize[application/json]]")).toEqual([jasmine.stringMatching('JSON error')]); + }); + }); + +})(); + + + + \ No newline at end of file diff --git a/editions/test/tiddlers/tests/test-filters.js b/editions/test/tiddlers/tests/test-filters.js index e00d0bf8d..1ffc73f17 100644 --- a/editions/test/tiddlers/tests/test-filters.js +++ b/editions/test/tiddlers/tests/test-filters.js @@ -99,14 +99,14 @@ Tests the filtering mechanism. }, "TiddlerSix": { title: "TiddlerSix", - text: "Missing inaction from TiddlerOne", + text: "Missing inaction from [[TiddlerOne]]", filter: "[[one]] [[a a]] [subfilter{hasList!!list}]", tags: [] }, "TiddlerSeventh": { title: "TiddlerSeventh", text: "", - list: "TiddlerOne [[Tiddler Three]] [[a fourth tiddler]] MissingTiddler", + list: "[[TiddlerOne]] [[Tiddler Three]] [[a fourth tiddler]] [[MissingTiddler]]", tags: ["one"] }, "Tiddler8": { @@ -144,7 +144,7 @@ Tests the filtering mechanism. modified: "201304152211" },{ title: "Tiddler Three", - text: "The speed of sound in light\n\nThere is no TiddlerZero but TiddlerSix", + text: "The speed of sound in light\n\nThere is no [[TiddlerZero]] but [[TiddlerSix]]", tags: ["one","two"], cost: "56", value: "80", @@ -252,9 +252,9 @@ Tests the filtering mechanism. }); it("should handle the lookup operator", function() { - expect(wiki.filterTiddlers("Six Seventh 8 +[lookup[Tiddler]]").join(",")).toBe("Missing inaction from TiddlerOne,,Tidd"); - expect(wiki.filterTiddlers("Six Seventh 8 +[lookup:8[Tiddler]]").join(",")).toBe("Missing inaction from TiddlerOne,8,Tidd"); - expect(wiki.filterTiddlers("Six Seventh 8 +[lookup:8[Tiddler],[text]]").join(",")).toBe("Missing inaction from TiddlerOne,8,Tidd"); + expect(wiki.filterTiddlers("Six Seventh 8 +[lookup[Tiddler]]").join(",")).toBe("Missing inaction from [[TiddlerOne]],,Tidd"); + expect(wiki.filterTiddlers("Six Seventh 8 +[lookup:8[Tiddler]]").join(",")).toBe("Missing inaction from [[TiddlerOne]],8,Tidd"); + expect(wiki.filterTiddlers("Six Seventh 8 +[lookup:8[Tiddler],[text]]").join(",")).toBe("Missing inaction from [[TiddlerOne]],8,Tidd"); expect(wiki.filterTiddlers("Six Seventh 8 +[lookup[Tiddler],[tags]]").join(",")).toBe(",one,one"); }); @@ -990,10 +990,10 @@ Tests the filtering mechanism. expect(wiki.filterTiddlers("[!sortsub:number]",anchorWidget).join(",")).toBe("filter regexp test,a fourth tiddler,$:/ShadowPlugin,$:/TiddlerTwo,Tiddler Three,has filter,TiddlerOne,hasList,one"); expect(wiki.filterTiddlers("[sortsub:string]",anchorWidget).join(",")).toBe("has filter,TiddlerOne,$:/TiddlerTwo,Tiddler Three,$:/ShadowPlugin,a fourth tiddler,filter regexp test,one,hasList"); expect(wiki.filterTiddlers("[!sortsub:string]",anchorWidget).join(",")).toBe("hasList,one,filter regexp test,a fourth tiddler,$:/ShadowPlugin,$:/TiddlerTwo,Tiddler Three,has filter,TiddlerOne"); - expect(wiki.filterTiddlers("[sortsub:number]",anchorWidget).join(",")).toBe("one,TiddlerOne,hasList,has filter,a fourth tiddler,Tiddler Three,$:/TiddlerTwo,filter regexp test,$:/ShadowPlugin"); - expect(wiki.filterTiddlers("[!sortsub:number]",anchorWidget).join(",")).toBe("$:/ShadowPlugin,filter regexp test,$:/TiddlerTwo,Tiddler Three,a fourth tiddler,has filter,hasList,TiddlerOne,one"); - expect(wiki.filterTiddlers("[sortsub:string]",anchorWidget).join(",")).toBe("one,TiddlerOne,hasList,has filter,$:/ShadowPlugin,a fourth tiddler,Tiddler Three,$:/TiddlerTwo,filter regexp test"); - expect(wiki.filterTiddlers("[!sortsub:string]",anchorWidget).join(",")).toBe("filter regexp test,$:/TiddlerTwo,Tiddler Three,a fourth tiddler,$:/ShadowPlugin,has filter,hasList,TiddlerOne,one"); + expect(wiki.filterTiddlers("[sortsub:number]",anchorWidget).join(",")).toBe("one,TiddlerOne,hasList,has filter,a fourth tiddler,$:/TiddlerTwo,Tiddler Three,filter regexp test,$:/ShadowPlugin"); + expect(wiki.filterTiddlers("[!sortsub:number]",anchorWidget).join(",")).toBe("$:/ShadowPlugin,filter regexp test,Tiddler Three,$:/TiddlerTwo,a fourth tiddler,has filter,hasList,TiddlerOne,one"); + expect(wiki.filterTiddlers("[sortsub:string]",anchorWidget).join(",")).toBe("one,TiddlerOne,hasList,has filter,$:/ShadowPlugin,a fourth tiddler,$:/TiddlerTwo,Tiddler Three,filter regexp test"); + expect(wiki.filterTiddlers("[!sortsub:string]",anchorWidget).join(",")).toBe("filter regexp test,Tiddler Three,$:/TiddlerTwo,a fourth tiddler,$:/ShadowPlugin,has filter,hasList,TiddlerOne,one"); expect(wiki.filterTiddlers("[[TiddlerOne]] [[$:/TiddlerTwo]] [[Tiddler Three]] [[a fourth tiddler]] +[!sortsub:number]",anchorWidget).join(",")).toBe("$:/TiddlerTwo,Tiddler Three,TiddlerOne,a fourth tiddler"); expect(wiki.filterTiddlers("a1 a10 a2 a3 b10 b3 b1 c9 c11 c1 +[sortsub:alphanumeric]",anchorWidget).join(",")).toBe("a1,a2,a3,a10,b1,b3,b10,c1,c9,c11"); // #7155. The order of the output is the same as the input when an undefined variable is used in the subfitler @@ -1060,6 +1060,9 @@ Tests the filtering mechanism. expect(wiki.filterTiddlers("[[Hello There]] [[GettingStarted]] +[format:titlelist[]]").join(" ")).toBe("[[Hello There]] GettingStarted"); expect(wiki.filterTiddlers("[title[Hello There]] +[format:titlelist[]]").join(" ")).toBe("[[Hello There]]"); expect(wiki.filterTiddlers("[title[HelloThere]] +[format:titlelist[]]").join(" ")).toBe("HelloThere"); + expect(wiki.filterTiddlers("0 +[format:timestamp[]]").join(",")).toBe("19700101000000000"); + expect(wiki.filterTiddlers("1603188514443 +[format:timestamp[]]").join(",")).toBe("20201020100834443"); + expect(wiki.filterTiddlers("void +[format:timestamp[]]").join(",")).toBe(""); }); it("should handle the deserializers operator", function() { diff --git a/editions/test/tiddlers/tests/test-wikitext.js b/editions/test/tiddlers/tests/test-wikitext.js index cdd729cfc..eddef73f7 100644 --- a/editions/test/tiddlers/tests/test-wikitext.js +++ b/editions/test/tiddlers/tests/test-wikitext.js @@ -45,16 +45,6 @@ describe("WikiText tests", function() { it("should support attributes specified as macro invocations", function() { expect(wiki.renderTiddler("text/html","TiddlerFour")).toBe("

This is a link

"); }); - it("should identify wikiwords to automatically link", function() { - expect(wiki.renderText("text/html","text/vnd-tiddlywiki","No wikilinks here").indexOf("header"); expect(wiki.renderText("text/html","text/vnd-tiddlywiki","@@.myclass\n
\n\nContent
\n@@")).toBe("

Content

"); diff --git a/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid b/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid index 25b2553a4..141138283 100644 --- a/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Edit Template Body Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The edit template body cascade is a [[cascade|Cascades]] used by the default edit template to choose the template for displaying the tiddler body. +The core edit template body cascade can be found in $:/core/ui/EditTemplate/body + The default edit template body cascade consists of: # If the tiddler has the field ''_canonical_uri'' then use the template $:/core/ui/EditTemplate/body/canonical-uri to display the remote URL @@ -13,4 +15,4 @@ The default edit template body cascade consists of: You can see the current settings for the view template body cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Edit Template Body'' tab. -<> \ No newline at end of file +<> diff --git a/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid b/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid index 2211786e8..114a2fb05 100644 --- a/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Field Editor Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The field editor cascade is a [[cascade|Cascades]] used to choose a template for rendering the field editor within the [[EditTemplate|$:/core/ui/EditTemplate/fields]]. +The core field editor cascade can be found in $:/core/ui/EditTemplate/fields + The default field editor cascade only contains one element: # Use the tiddler $:/core/ui/EditTemplate/fieldEditor/default to render the field @@ -14,4 +16,4 @@ See [[Customizing EditTemplate field rendering]] for more details. You can see the current settings for the field editor cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Field Editor'' tab. -<> \ No newline at end of file +<> diff --git a/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid b/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid index 448079454..50ef0d87c 100644 --- a/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid +++ b/editions/tw5.com/tiddlers/concepts/Story Tiddler Template.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki "Story tiddler template" refers to the template used to display a tiddler within the story river. +The core story tiddler template can be found in $:/core/ui/StoryTiddlerTemplate + The [[Story Tiddler Template Cascade]] is used to choose the template to be used for a particular tiddler. By default, the edit template is used for tiddlers in draft mode, and the view template used otherwise. See also: diff --git a/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid b/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid index 1a290938e..8ec685929 100644 --- a/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Tiddler Colour Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The tiddler colour cascade is a [[cascade|Cascades]] used to choose which colour should be used for a particular tiddler. +Core tiddler colour cascades can be found in $:/core/macros/tag, $:/core/ui/Components/tag-link, $:/core/ui/EditTemplate/tags, $:/core/ui/TagPickerTagTemplate, $:/core/ui/TagTemplate and $:/core/ui/ViewTemplate/title + The default tiddler colour cascade consists of: # If the tiddler has a ''color'' field, use the value as the colour @@ -13,4 +15,4 @@ The default tiddler colour cascade consists of: You can see the current settings for the tiddler colour cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Tiddler Colour'' tab. -<> \ No newline at end of file +<> diff --git a/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid b/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid index 01af98e1a..4eef508c1 100644 --- a/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/Tiddler Icon Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The tiddler icon cascade is a [[cascade|Cascades]] used to choose which icon should be used for a particular tiddler. +The core tiddler icon cascade can be found in $:/core/ui/TiddlerIcon + The default tiddler icon cascade consists of: # If the tiddler has an ''icon'' field, use the value as the title of the icon tiddler @@ -13,4 +15,4 @@ The default tiddler icon cascade consists of: You can see the current settings for the tiddler icon cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''Tiddler Icon'' tab. -<> \ No newline at end of file +<> diff --git a/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid b/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid index ef3a29c48..cac8f5ac5 100644 --- a/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid +++ b/editions/tw5.com/tiddlers/concepts/View Template Title Cascade.tid @@ -6,6 +6,8 @@ type: text/vnd.tiddlywiki The view template title cascade is a [[cascade|Cascades]] used by the default view template to choose the template for displaying the tiddler title. +The core view template title cascade can be found in $:/core/ui/ViewTemplate/title + The default view template title cascade consists of: # If the tiddler title starts with `$:/` then use the template $:/core/ui/ViewTemplate/title/system which causes the `$:/` prefix to be displayed in pale text @@ -13,4 +15,4 @@ The default view template title cascade consists of: You can see the current settings for the view template title cascade in $:/ControlPanel under the ''Info'' -> ''Advanced'' -> ''Cascades'' -> ''View Template Title'' tab. -<> \ No newline at end of file +<> diff --git a/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid b/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid index 78990f453..bf3357fae 100644 --- a/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid +++ b/editions/tw5.com/tiddlers/customising/Customising TiddlyWiki's user interface.tid @@ -45,7 +45,7 @@ Special tags assign special behaviour or appearance to all of the tiddlers to wh For example: -* $:/tags/Macro causes the macros defined in a tiddler to be available globally +* $:/tags/Global causes the definitions in a tiddler to be available globally * $:/tags/Stylesheet causes the tiddler to be interpreted as a CSS stylesheet * $:/tags/SideBar causes the tiddler to be displayed as a sidebar tab diff --git a/editions/tw5.com/tiddlers/demonstrations/ImageGallery Example.tid b/editions/tw5.com/tiddlers/demonstrations/ImageGallery Example.tid index c9df4ac0b..e702b16b7 100644 --- a/editions/tw5.com/tiddlers/demonstrations/ImageGallery Example.tid +++ b/editions/tw5.com/tiddlers/demonstrations/ImageGallery Example.tid @@ -1,6 +1,5 @@ created: 20140809113603449 modified: 20211022195248529 -tags: Learning title: ImageGallery Example type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/features/Core Icons.tid b/editions/tw5.com/tiddlers/features/Core Icons.tid new file mode 100644 index 000000000..9799f48d7 --- /dev/null +++ b/editions/tw5.com/tiddlers/features/Core Icons.tid @@ -0,0 +1,41 @@ +title: Core Icons +tags: Features +modified: 20230423103154329 +created: 20230423103154329 + + +!! Introduction + +TiddlyWiki includes over 100 custom vector icons. They feature in the user interface and are also available for authors to use in their own applications. See [[Icon Gallery]] for a complete listing. + +!! Usage + +The core icons are used by transcluding them. For example: + +<> + +The core icons are parameterised. The first parameter `size` specified the size at which the icon should be rendered: + +< +""">> + +Here is an example of dynamically resizing icons: + +< +<$text text={{{ [addsuffix[px]] }}} /> +<$transclude $tiddler="$:/core/icon" size=<>/> + +""">> + +Some icons take further parameters to customise how they are rendered. For example, the $:/core/images/new-journal-button icon takes an additional parameter `day` that specifies the day of the month that should be shown on the calendar. It defaults to the current date if not specified + +< +""">> + +The core icons are implemented as embedded [[SVG elements|Using SVG]], and not as full-blown SVG images. This means that they can be styled using CSS. For example, the CSS property `fill` can be used to change the colour of the icons. For example: + +<{{$:/core/images/opacity}} +""">> diff --git a/editions/tw5.com/tiddlers/features/StartupActions.tid b/editions/tw5.com/tiddlers/features/StartupActions.tid index 29edb8378..596b92564 100644 --- a/editions/tw5.com/tiddlers/features/StartupActions.tid +++ b/editions/tw5.com/tiddlers/features/StartupActions.tid @@ -36,7 +36,7 @@ The initial startup actions are useful for customising TiddlyWiki according to e Note that global macros are not available within initial startup action tiddlers by default. If you need to access them then you'll need to explicitly include them with an [[Pragma: \import]] at the top of the tiddler: ``` -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] ``` !! Post-Render Startup Actions diff --git a/editions/tw5.com/tiddlers/filters/deserialize Operator.tid b/editions/tw5.com/tiddlers/filters/deserialize Operator.tid new file mode 100644 index 000000000..616e5ae19 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/deserialize Operator.tid @@ -0,0 +1,26 @@ +caption: deserialize +created: 20230601195749377 +from-version: 5.3.0 +modified: 20230602105513132 +op-input: a selection of strings +op-output: JSON representations of tiddlers extracted from input titles. +op-parameter: the deserializer module to be used to extract tiddlers from the input +op-purpose: extract JSON representation of tiddlers from the input strings +tags: [[Filter Operators]] [[Special Operators]] +title: deserialize Operator +type: text/vnd.tiddlywiki + +<<.tip "Deserializer modules parse text in various formats into their JSON representation as tiddlers. You can see the deserializers available in a wiki using the [[deserializers operator|deserializers Operator]].">> + +|!Deserializer |!Description | +|(DOM)|Extracts tiddlers from a DOM node, should not be used with the <<.op deserialize[]>> operator | +|application/javascript|Parses a JavaScript module as a tiddler extracting fields from the header comment| +|application/json|Parses [[JSON|JSON in TiddlyWiki]] into tiddlers| +|application/x-tiddler|Parses the [[.tid file format|TiddlerFiles]] as a tiddler| +|application/x-tiddler-html-div|Parses the [[
.tiddler file format|TiddlerFiles]] as a tiddler| +|application/x-tiddlers|Parses the [[MultiTiddlerFile format|MultiTiddlerFiles]] as tiddlers| +|text/css|Parses CSS as a tiddler extracting fields from the header comment| +|text/html|Parses an HTML file into tiddlers. Supports ~TiddlyWiki Classic HTML files, ~TiddlyWiki5 HTML files and ordinary HTML files| +|text/plain|Parses plain text as a tiddler| + +<<.operator-examples "deserialize">> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/filters/examples/deserialize Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/deserialize Operator (Examples).tid new file mode 100644 index 000000000..5170809b7 --- /dev/null +++ b/editions/tw5.com/tiddlers/filters/examples/deserialize Operator (Examples).tid @@ -0,0 +1,29 @@ +created: 20230601200356736 +modified: 20230602105036887 +tags: [[Operator Examples]] [[deserialize Operator]] +title: deserialize Operator (Examples) +type: text/vnd.tiddlywiki + +\define html-data() + + + + + Test Data + + + + + + + + +\end + +This example uses the predefined variable `html-data`: +<$codeblock code=<> language="HTML"/> + +<<.operator-example 1 "[deserialize[text/html]]">> diff --git a/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid index c1d79ea8c..b6ad505a1 100644 --- a/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid +++ b/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid @@ -1,5 +1,5 @@ created: 20201020102735123 -modified: 20220611104737314 +modified: 20230226135641976 tags: [[Operator Examples]] [[format Operator]] title: format Operator (Examples) type: text/vnd.tiddlywiki @@ -15,20 +15,23 @@ Created date with a format string supplied as operator parameter: Modified date shown as a relative date: <<.operator-example 3 "[[HelloThere]get[modified]format:relativedate[]]">> +Get the date and time exactly 24 hours (86,400,000 milliseconds) from now: +<<.operator-example 4 "[format:date[TIMESTAMP]add[86400000]format:timestamp[DDth mmm YYYY 0hh:0mm:0ss]]">> + A tiddler title with spaces formatted as a title list: -<<.operator-example 4 """[[Hello There]format:titlelist[]]""">> +<<.operator-example 5 """[[Hello There]format:titlelist[]]""">> All tiddler titles tagged with <> formatted as a title list: -<<.operator-example 5 """[tag[TableOfContents]format:titlelist[]]""">> +<<.operator-example 6 """[tag[TableOfContents]format:titlelist[]]""">> A JSON string formatted as JSON – note how the JSON string is normalised to remove the duplicated properties: -<<.operator-example 6 """[[{"one":"first","one":"another","two":"second"}]format:json[]]""">> +<<.operator-example 7 """[[{"one":"first","one":"another","two":"second"}]format:json[]]""">> <<.tip "To create a string to save a [[title list|Title List]] into a list field, use `format:titlelist[]` with the [[join operator|join Operator]]">> -<<.operator-example 6 """[tag[TableOfContents]format:titlelist[]join[ ]]""">> +<<.operator-example 8 """[tag[TableOfContents]format:titlelist[]join[ ]]""">> For example, to save titles tagged `TableOfContents` to the titles field of the tiddler [[format titlelist test]]: <$macrocall $name='wikitext-example-without-html' -src='<$button> test +src='<$button>Try it <$action-setfield $tiddler="format titlelist test" titles={{{ [tag[TableOfContents]format:titlelist[]join[ ]] }}}/> '/> diff --git a/editions/tw5.com/tiddlers/filters/format.tid b/editions/tw5.com/tiddlers/filters/format.tid index e5b12b134..d62a82169 100644 --- a/editions/tw5.com/tiddlers/filters/format.tid +++ b/editions/tw5.com/tiddlers/filters/format.tid @@ -20,8 +20,11 @@ The suffix <<.place B>> is one of the following supported string formats: |^`date` |The input string is interpreted as a UTC date and displayed according to the DateFormat specified in the optional operator operand. (Defaults to "YYYY MM DD 0hh:0mm") | |^`json` |<<.from-version "5.2.4">> The input string is interpreted as JSON and displayed with standard formatting. The optional operator operand specifies the number of spaces to use for indenting, or a string to use for indenting. Nothing is returned if the input string is not valid JSON | |^`relativedate` |The input string is interpreted as a UTC date and displayed as the interval from the present instant. Any operator parameters are ignored | +|^`timestamp` |<<.from-version "5.3.0">> The input string is interpreted as number of milliseconds since the [[ECMAScript epoch|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#the_ecmascript_epoch_and_timestamps]], 1 January 1970, and displayed according to the DateFormat specified in the optional operator operand. (Defaults to "[UTC]YYYY0MM0DD0hh0mm0ss0XXX") | |^`titlelist` |<<.from-version "5.2.0">> The input string wrapped in double square brackets if it contains a space. Appropriate for use in a [[title list|Title List]]. | +Invalid input strings are dropped by the <<.op format>> operator. + <<.warning """The [[Title List]] format cannot reliably represent items that contain certain specific character sequences such as `]] `. Thus it should not be used where there is a possibility of such sequences occurring.""">> <<.operator-examples "format">> diff --git a/editions/tw5.com/tiddlers/functions/Functions.tid b/editions/tw5.com/tiddlers/functions/Functions.tid index 3b06dddc7..dadce73a1 100644 --- a/editions/tw5.com/tiddlers/functions/Functions.tid +++ b/editions/tw5.com/tiddlers/functions/Functions.tid @@ -21,7 +21,7 @@ Functions can be invoked in several ways: * Directly transclude functions with the syntax `<>` * Assign functions to widget attributes with the syntax `
>>` * Invoke functions via the [[function Operator]] with the syntax `[function[myfn],[value],...]` -* Directly invoke functions whose names start with a period as custom filter operators with the syntax `[.myfn[value]]` +* Directly invoke functions whose names contain a period as custom filter operators with the syntax `[my.fn[value]]` or `[.myfn[value]]` !! How Functions Work diff --git a/editions/tw5.com/tiddlers/howtos/Custom tag pill styles.tid b/editions/tw5.com/tiddlers/howtos/Custom tag pill styles.tid new file mode 100644 index 000000000..f7472e9b2 --- /dev/null +++ b/editions/tw5.com/tiddlers/howtos/Custom tag pill styles.tid @@ -0,0 +1,32 @@ +created: 20230608121519758 +modified: 20230608123444591 +tags: [[How to apply custom styles]] +title: Custom tag pill styles +type: text/vnd.tiddlywiki + +! Attribute: data-tag-title + +<<.from-version "5.2.0">> The attribute <<.attr data-tag-title>> was added to tag pills visible in the tiddler view template. + +<<.from-version "5.3.0">> The attribute was added to every tag pill visible in the standard ~TiddlyWiki UI. Especially the edit template tag list, the tag-picker dropdown, the Right sidebar -> More -> Tags tab and the $:/TagManager + +The <<.attr data-tag-title>> HTML attribute only contains the tag-title visible in the tag pill. It can be used to style the tag-pill. + +If you want to style the whole tiddler have a look at: [[Custom styles by data-tiddler-title]] + +!! Examples + +If you use the following CSS in a new tiddler tagged: `$:/tags/Stylesheet` every tag that starts with a `#` will have a new border radius. So those tags stand out in contrast to the default tags. + +''You have to define both CSS rules'', due to the existing UI structure to catch all tag-pills in the existing TW UI. + +``` +[data-tag-title^="#"] .tc-tag-label, +[data-tag-title^="#"].tc-tag-label { + border-radius: 3px; +} +``` + +!! More Possibilities + +{{Attribute Selectors}} diff --git a/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid b/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid index 16243cd54..a149b7539 100644 --- a/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid +++ b/editions/tw5.com/tiddlers/howtos/How to create keyboard shortcuts.tid @@ -77,11 +77,11 @@ In the [[Keyboard Shortcuts Tab|$:/core/ui/ControlPanel/KeyboardShortcuts]] the > If the tiddler has the tag <>, the field ''key'' with the [[Keyboard Shortcut Descriptor]] as its value and some actions in its text field, the actions will be triggered when the mechanism detects the configured key-combination
-<$macrocall $name=".tip" _="""''Macros'' defined ''outside'' a global keyboard-shortcut (through a tiddler tagged `$:/tags/Macro`) need to be ''imported'' in order to be accessible. +<$macrocall $name=".tip" _="""''Macros'' defined ''outside'' a global keyboard-shortcut (through a tiddler tagged `$:/tags/Global`) need to be ''imported'' in order to be accessible. The [[import pragma|Pragma]] can be used for that"""/> 
-\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\import [subfilter{$:/core/config/GlobalImportFilter}]
If the tiddler that contains the macro definition is known and - for example - titled `my-macro-tiddler` diff --git a/editions/tw5.com/tiddlers/howtos/Using Excise.tid b/editions/tw5.com/tiddlers/howtos/Using Excise.tid index ef3be9a96..7d618a3b9 100644 --- a/editions/tw5.com/tiddlers/howtos/Using Excise.tid +++ b/editions/tw5.com/tiddlers/howtos/Using Excise.tid @@ -1,22 +1,18 @@ created: 20160810122928198 -modified: 20160810122934291 +modified: 20230505104214168 tags: [[Editor toolbar]] title: Using Excise type: text/vnd.tiddlywiki - ! Excise text From the EditorToolbar you can export selected text to a new tiddler and insert a [[link|Linking in WikiText]] [[Transclusion]] or [[macro|Macros]] in its place. Click ''Excise text'' (<<.icon $:/core/images/excise>>), input name of the new tiddler, and choose excise method. !! How to excise text # Highlight the relevant piece of text -#Click ''Excise text'' (<<.icon $:/core/images/excise>>) +# Click ''Excise text'' (<<.icon $:/core/images/excise>>) # Give the new tiddler a title. -# Chosse if the new tiddler will be tagged with the title of the current tiddler''*''. -# Choose replacing method. [[link|Linking in WikiText]] [[Transclusion]] or [[macro|Macros]]. - +# Chosse if the new tiddler will be tagged with the title of the current tiddler (see note below). +# Choose replacing method: [[link|Linking in WikiText]], [[transclusion|Transclusion]], or [[macro|Macros]]. # Click the ''{{$:/language/Buttons/Excise/Caption/Excise}}'' button - - -''*NOTE:'' If you choose tic the option to `Tag new tiddler with the title of this tiddler`. The tag will be the'' draft title''. If you create a new tiddler (or clone an existing one), the draft title and the tag, will be `New Tiddler`. __You have to save the tiddler and re-edit it to get the new title as tag.__ +<<.strong Note!>> If you choose the option to `Tag new tiddler with the title of this tiddler`, the new tiddler will be tagged with the name of the current tiddler before it has been edited. If you have changed the title of the current tiddler, save it first and edit it again to perform excision with this option. diff --git a/editions/tw5.com/tiddlers/images/Icon Gallery.tid b/editions/tw5.com/tiddlers/images/Icon Gallery.tid index 9985cbc0f..acd710a05 100644 --- a/editions/tw5.com/tiddlers/images/Icon Gallery.tid +++ b/editions/tw5.com/tiddlers/images/Icon Gallery.tid @@ -1,6 +1,6 @@ created: 20211013132515594 modified: 20211018102307833 -tags: Learning +tags: Learning [[Core Icons]] title: Icon Gallery type: text/vnd.tiddlywiki diff --git a/editions/tw5.com/tiddlers/images/Reddit Logo.tid b/editions/tw5.com/tiddlers/images/Reddit Logo.tid index 76bb6bf7c..f4153ebb0 100644 --- a/editions/tw5.com/tiddlers/images/Reddit Logo.tid +++ b/editions/tw5.com/tiddlers/images/Reddit Logo.tid @@ -1,6 +1,7 @@ title: Reddit Logo - +\parameters (size:"22pt") +> height=<> viewBox="0 0 20 20"> diff --git a/editions/tw5.com/tiddlers/macros/TranslinkMacro.tid b/editions/tw5.com/tiddlers/macros/TranslinkMacro.tid new file mode 100644 index 000000000..2e486e501 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/TranslinkMacro.tid @@ -0,0 +1,21 @@ +created: 20230505090333510 +modified: 20230505090333510 +tags: Macros [[Core Macros]] +title: translink Macro +type: text/vnd.tiddlywiki +caption: translink + +The <<.def translink>> [[macro|Macros]] returns a frame with the title and [[transcluded|Transclusion]] text of a chosen tiddler. The title links to the transcluded tiddler. + +If the chosen tiddler is missing, an appropriate message will be shown instead of the transcluded text. + +This is the default macro used when [[excising|Using Excise]] text and replacing it with a macro. + +!! Parameters + +; title +: The title of the tiddler to be transcluded +; mode +: The mode of the [[transclude widget|TranscludeWidget]] used inside the macro, defaults to `block` + +<<.macro-examples "translink">> diff --git a/editions/tw5.com/tiddlers/macros/examples/translink.tid b/editions/tw5.com/tiddlers/macros/examples/translink.tid new file mode 100644 index 000000000..aaf8b8aa0 --- /dev/null +++ b/editions/tw5.com/tiddlers/macros/examples/translink.tid @@ -0,0 +1,9 @@ +created: 20230505092952569 +modified: 20230505092952569 +tags: [[translink Macro]] [[Macro Examples]] +title: translink Macro (Examples) +type: text/vnd.tiddlywiki + +<$macrocall $name=".example" n="1" eg="""<>"""/> +<$macrocall $name=".example" n="2" eg="""<>"""/> +<$macrocall $name=".example" n="3" eg="""<>"""/> diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-windows.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-windows.tid index d916460e9..75fbbfc09 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-windows.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-close-all-windows.tid @@ -3,6 +3,7 @@ modified: 20220301180818011 tags: Messages title: WidgetMessage: tm-close-all-windows type: text/vnd.tiddlywiki +caption: tm-close-all-windows <<.from-version 5.2.2>> The `tm-close-all-windows` [[message|Messages]] closes all additional //browser// window that were opened with [[tm-open-window|WidgetMessage: tm-open-window]]. diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid index 8788ceac0..9737c3b24 100644 --- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid +++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid @@ -13,7 +13,7 @@ Excises the currently selected text into a new tiddler and replaces it with a li |!Name |!Description | |title |Title of the new tiddler the selected content is excised to| |type |Type of the replacement to be inserted: Can be one of <<.value "transclude">>, <<.value "link">> or <<.value "macro">>| -|macro |In case //type=<<.value "macro">>//, specifies the name of the macro to be inserted. The title of the new tiddler is provided as the first parameter to the macro. Defaults to the ''translink'' macro| +|macro |In case //type=<<.value "macro">>//, specifies the name of the macro to be inserted. The title of the new tiddler is provided as the first parameter to the macro. Defaults to the [[translink macro|translink Macro]]| |tagnew |If '<<.value "yes">>', will tag the new tiddler with the title of the tiddler currently being edited |
diff --git a/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid index 6086dfebc..87ddf9b40 100644 --- a/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid +++ b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid @@ -29,6 +29,8 @@ Each field can be specified as either a ''string'' or ''array'' value to be assi ** //extname// the extension of the filename of the file containing the tiddler ** //created// the creation date/time of the file containing the tiddler ** //modified// the modification date/time of the file containing the tiddler +** <<.from-version "5.3.0">> //filepath// the path of the file containing the tiddler, relative to the ''path'' property of the directory (only usable in ''directories'' declarations) +** <<.from-version "5.3.0">> //subdirectories// an array of the subdirectories in the file's path relative, to the ''path'' property of the directory (only usable in ''directories'' declarations) * ''prefix'' - (optional) a string to be prepended to the value of the field * ''suffix'' - (optional) a string to be appended to the value of the field @@ -52,7 +54,7 @@ Directory specifications in the `directories` array may take the following forms ** ''filesRegExp'' - (optional) a [[regular expression|https://developer.mozilla.org/en/docs/Web/JavaScript/Guide/Regular_Expressions]] that matches the filenames of the files that should be processed within the directory ** ''isTiddlerFile'' - (required) if `true`, the file will be treated as a [[tiddler file|TiddlerFiles]] and deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing ** ''isEditableFile'' - <<.from-version "5.1.23">> (optional) if `true`, changes to the tiddler be saved back to the original file. The tiddler will be saved back to the original filepath as long as it does not generate a result from the $:/config/FileSystemPath filters, which will override the final filepath generated if a result is returned from a filter. -** ''searchSubdirectories'' - <<.from-version "5.1.23">> (optional) if `true`, all subdirectories of the //path// are searched recursively for files that match the (optional) //filesRegExp//. If no //filesRegExp// is provided, all files in all subdirectories of the //path// are loaded. Tiddler titles generated via a //source// attribute (see above) will only include the filename, not any of the subdirectories of the path. If this results in multiple files with loaded with the same tiddler title, then only the last file loaded under that tiddler title will be in memory. In order to prevent this, you must have multiple directory objects listed and customise the title field with a //prefix// or //suffix// alongside the //source// attribute. +** ''searchSubdirectories'' - <<.from-version "5.1.23">> (optional) if `true`, all subdirectories of the //path// are searched recursively for files that match the (optional) //filesRegExp//. If no //filesRegExp// is provided, all files in all subdirectories of the //path// are loaded. Tiddler titles generated via the //source// attribute //filename// (see above) will only include the filename, not any of the subdirectories of the path. If this results in multiple files with loaded with the same tiddler title, then only the last file loaded under that tiddler title will be in memory. In order to prevent this, you can use the //filepath// attribute instead of //filename//. Alternately, you can include multiple directory objects and customise the title field with a //prefix// or //suffix// alongside the //source// attribute. ** ''fields'' - (required) an object containing values that override or customise the fields provided in the tiddler file (see above) Fields can also be overridden for particular files by creating a file with the same name plus the suffix `.meta` -- see TiddlerFiles. @@ -95,6 +97,7 @@ This example retrieves all the files with the extension `.pdf` from a folder spe ] } ``` + !! Importing a folder of text files This example retrieves all the files with the extension `.txt` from a folder specified by a relative path. This folder is within the wiki's base directory, and the current config file is in a directory within the wiki's "tiddlers/" directory. So, in this case the path starts with "../../" to traverse upwards two directory levels, and then down into the "externalnotes/" directory. Each tiddler is set up with the following fields: @@ -130,4 +133,39 @@ This will load all text files in the `../../externalnotes/` directory into the w From the examples in [[Customising Tiddler File Naming]] we see that the final `[!tag[externalnote]addprefix[wiki/]]` filter in the $:/config/FileSystemPaths tiddler excludes all tiddlers tagged with `externalnotes` (that have not matched an earlier filter). These tiddlers have their filepath retrieved from the $:/config/OriginalTiddlerPaths generated upon boot startup. -Then, the `[tag[.txt]then[.txt]]` filter in the $:/config/FileSystemExtensions tiddler forces all these tiddlers to be saved back to disk as *.txt and accompanying *.txt.meta files (overriding the normal tiddler-type to file-type mapping). In this case, allowing the snippets of Tiddlywiki wikitext or markdown-text to be saved back to "text" *.txt files. \ No newline at end of file +Then, the `[tag[.txt]then[.txt]]` filter in the $:/config/FileSystemExtensions tiddler forces all these tiddlers to be saved back to disk as *.txt and accompanying *.txt.meta files (overriding the normal tiddler-type to file-type mapping). In this case, allowing the snippets of Tiddlywiki wikitext or markdown-text to be saved back to "text" *.txt files. + +!! Importing and auto-tagging images + +This example imports all the image files in the `files` directory and all its subdirectories as external-image tiddlers, and tags them based on their filepath. Each tiddler is set up with the following fields: + +* ''title'' - set to the URI decoded base filename of the text file +* ''created'' - set to the creation date/time of the text file +* ''modified'' - set to the modification date/time of the text file +* ''type'' - set to `image/jpeg`. There is currently no way to infer the correct ContentType of the image tiddler from the file, but `image/jpeg` tiddlers should render correctly even with png or gif images. As an alternative, you could create separate definitions for jpg, png, and gif files with the `image/jpeg`, `image/png`, and `image/gif` types respectively. +* ''tags'' - generated based on the path of the image relative to the parent directory (`files` in this case). Eg, images in `files/photos` will be tagged with `photos`, those in `files/photos/family` will be tagged with both `photos` and `family`, and those in the root `files` directory will have no tags. +* ''text'' - set to an empty string +* ''_canonical_uri'' - set to the full filepath of the image relative to the wiki root + + +``` +{ + "directories": [ + { + "path": "../../files/", + "filesRegExp": "^.*\\.(?:jpg|jpeg|png|gif)$", + "isTiddlerFile": false, + "searchSubdirectories": true, + "fields": { + "title": {"source": "basename-uri-decoded"}, + "created": {"source": "created"}, + "modified": {"source": "modified"}, + "type": "image/jpeg", + "tags": { "source": "subdirectories" }, + "text": "", + "_canonical_uri": { "source": "filepath", "prefix": "files/" } + } + } + ] +} +``` diff --git a/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid b/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid index 5971a5490..121ba8525 100644 --- a/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid +++ b/editions/tw5.com/tiddlers/pragmas/Pragma_ _import.tid @@ -13,5 +13,5 @@ The ''\import'' [[pragma|Pragmas]] is used to import definitions from other tidd For example: ``` -\import [all[shadows+tiddlers]tag[$:/tags/Macro]] +\import [all[shadows+tiddlers]tag[$:/tags/Global]] ``` diff --git a/editions/tw5.com/tiddlers/pragmas/Pragma_ _parameters.tid b/editions/tw5.com/tiddlers/pragmas/Pragma_ _parameters.tid index 5f32b06eb..c8086569a 100644 --- a/editions/tw5.com/tiddlers/pragmas/Pragma_ _parameters.tid +++ b/editions/tw5.com/tiddlers/pragmas/Pragma_ _parameters.tid @@ -1,10 +1,10 @@ created: 20220917113154900 -modified: 20230419103154329 +modified: 20230518143557045 tags: Pragmas title: Pragma: \parameters type: text/vnd.tiddlywiki -<<.from-version "5.3.0">> The ''\parameters'' [[pragma|Pragmas]] is used within [[procedure|Procedure Definitions]] and [[widget|Widget Definitions]] definitions to declare the parameters that are expected, and their default values. It is a shortcut syntax for the ParametersWidget. +<<.from-version "5.3.0">> The ''\parameters'' [[pragma|Pragmas]] is used within [[procedure|Procedure Definitions]] and [[widget|Custom Widgets]] definitions to declare the parameters that are expected, and their default values. It is a shortcut syntax for the ParametersWidget. ``` \parameters ([:],[:]...) @@ -16,3 +16,11 @@ For example: \parameters (firstname:"Joe",lastname:"Blogs") ``` +To illustrate the use of ''\parameters'' pragma, see [[Core Icons]] which are parameterised. The first parameter `size` specified the size at which the icon should be rendered. For example see the text of [[$:/core/images/print-button]] tiddler. The first line defines the size parameter as `\parameters (size:"22pt")` + +< +""">> + +In the above example, the first line shows a simple transclusion of [[$:/core/images/print-button]] icon with `size` parameter passed by position and is set to 16px. The second line is a transclusion of image with `size` parameter passed by name and is set to 32px. + diff --git a/editions/tw5.com/tiddlers/pragmas/Pragma_ _procedure.tid b/editions/tw5.com/tiddlers/pragmas/Pragma_ _procedure.tid index 082bc466d..076d26687 100644 --- a/editions/tw5.com/tiddlers/pragmas/Pragma_ _procedure.tid +++ b/editions/tw5.com/tiddlers/pragmas/Pragma_ _procedure.tid @@ -1,5 +1,5 @@ created: 20221007132845007 -modified: 20230419103154329 +modified: 20230518152756112 tags: Pragmas title: Pragma: \procedure type: text/vnd.tiddlywiki @@ -52,4 +52,59 @@ Procedure definitions can be nested by specifying the name of the procedure in t \end special-button <> +""">> + +! Use of Parameters Inside Procedures +The parameters can be declared inside procedures. The parameters widget is necessary in a procedure if you want to use computed default values. For example: + +< +This is <> demonstrates <>. + +\end + +<> +""">> + +!! Caution in Using Positional Parameters +Procedures are a shortcut syntax for the SetVariableWidget with an implicit ParametersWidget, so generally there is no reason to have multiple parameters widgets within a definition. In the below example when passing `x` to `myproc`, it will also be set to `a`: + +<>, a=<>, b=<> +\end + +<> +""">> + +The reason for that result is clearer if we consider an equivalent with explicit parameters widgets. + +<$macrocall $name=wikitext-example-without-html +src='<$let myprog=""" +\parameters (x:10) +\parameters (a:100, b:200) + +x=<>, a=<>, b=<> +"""> +<> +' +/> + +This is because those two parameters widgets are entirely independent. They are both processed as if the other parameter widget is not there. + +<<.tip "The positional parameters are only required when using the parameterised transclusion shortcut syntax, and that in other cases it is generally clearer to use named parameters.">> + +To prevent such situation of above example, pass parameters by name as below. + +<>, a=<>, b=<> +\end + +<> """>> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/procedures/Procedure Calls.tid b/editions/tw5.com/tiddlers/procedures/Procedure Calls.tid index d66d8f274..0078d5396 100644 --- a/editions/tw5.com/tiddlers/procedures/Procedure Calls.tid +++ b/editions/tw5.com/tiddlers/procedures/Procedure Calls.tid @@ -1,4 +1,4 @@ -caption: Macro Calls +caption: Procedure Calls created: 20221007130006705 modified: 20230419103154329 tags: WikiText Procedures @@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki !! Introduction -This tiddler describes the different ways in which [[macros|Procedures]] can be called. +This tiddler describes the different ways in which [[procedure|Procedures]] can be called. !! Procedure Call Transclusion Shortcut diff --git a/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid b/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid index e108f219d..0c9741c7e 100644 --- a/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid +++ b/editions/tw5.com/tiddlers/procedures/Procedure Definitions.tid @@ -6,15 +6,15 @@ type: text/vnd.tiddlywiki !! Introduction -This tiddler describes the different ways in which [[macros|Procedures]] can be defined. +This tiddler describes the different ways in which [[Procedures|Procedures]] can be defined. !! Procedure Definition Pragma -Macros are created using the [[Pragma: \procedure]] at the start of a tiddler. The definitions are available in the rest of the tiddler that defines them, plus any tiddlers that it transcludes. +Procedures are created using the [[Pragma: \procedure]] at the start of a tiddler. The definitions are available in the rest of the tiddler that defines them, plus any tiddlers that it transcludes. ``` \define my-procedure(param) -This is the macro text (param=<>) +This is the procedure text (param=<>) \end ``` @@ -34,10 +34,10 @@ Procedures are implemented as a special kind of [[variable|Variables]] and so in The [[Pragma: \import]] or <<.wlink ImportVariablesWidget>> widget can be used to copy procedure definitions from another tiddler. -!! `$:/tags/Macro` Tag +!! `$:/tags/Global` Tag -Global procedures can be defined using the [[SystemTag: $:/tags/Macro]]. +Global procedures can be defined using the [[SystemTag: $:/tags/Global]]. -The tag [[SystemTag: $:/tags/Macro/View]] is used to define procedures that should only be available within the main view template and the preview panel. +The tag [[SystemTag: $:/tags/Global/View]] is used to define procedures that should only be available within the main view template and the preview panel. -The tag [[SystemTag: $:/tags/Macro/View/Body]] is used to define procedures that should only be available within the main view template body and the preview panel. +The tag [[SystemTag: $:/tags/Global/View/Body]] is used to define procedures that should only be available within the main view template body and the preview panel. diff --git a/editions/tw5.com/tiddlers/readme/ReadMe.tid b/editions/tw5.com/tiddlers/readme/ReadMe.tid index 615b3ab68..2fbf83eab 100644 --- a/editions/tw5.com/tiddlers/readme/ReadMe.tid +++ b/editions/tw5.com/tiddlers/readme/ReadMe.tid @@ -4,7 +4,7 @@ title: ReadMe type: text/vnd.tiddlywiki \define tv-wikilink-template() https://tiddlywiki.com/static/$uri_doubleencoded$.html -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation. diff --git a/editions/tw5.com/tiddlers/system/$__SplashScreen.tid b/editions/tw5.com/tiddlers/system/$__SplashScreen.tid index 7d632140f..a4301de46 100644 --- a/editions/tw5.com/tiddlers/system/$__SplashScreen.tid +++ b/editions/tw5.com/tiddlers/system/$__SplashScreen.tid @@ -4,7 +4,14 @@ tags: $:/tags/RawMarkupWikified/TopBody title: $:/SplashScreen type: text/vnd.tiddlywiki -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] + +\procedure show-icon(title) +<$wikify name="icon" text={{{ [addprefix[{{]addsuffix[}}]] }}} output="html"> +<$text text=<<icon>>/> +</$wikify> +\end + \rules only filteredtranscludeinline transcludeinline macrocallinline <div class="tc-remove-when-wiki-loaded"> <style scoped> @@ -116,7 +123,7 @@ Please wait while {{$:/SiteTitle}} is loading <!-- Demonstrating how to embed a wikitext SVG graphic --> <div class="tc-splash-text"> -{{$:/core/icon||$:/core/templates/plain-text-tiddler}} +<<show-icon "$:/core/icon">> </div> </div> diff --git a/editions/tw5.com/tiddlers/system/configWikiParserRulesInlineWikilink.tid b/editions/tw5.com/tiddlers/system/configWikiParserRulesInlineWikilink.tid new file mode 100644 index 000000000..9a395abd6 --- /dev/null +++ b/editions/tw5.com/tiddlers/system/configWikiParserRulesInlineWikilink.tid @@ -0,0 +1,3 @@ +title: $:/config/WikiParserRules/Inline/wikilink + +enable \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/system/doc-macros.tid b/editions/tw5.com/tiddlers/system/doc-macros.tid index f1c99b748..e4a425f9a 100644 --- a/editions/tw5.com/tiddlers/system/doc-macros.tid +++ b/editions/tw5.com/tiddlers/system/doc-macros.tid @@ -134,7 +134,11 @@ This is an example tiddler. See [[Table-of-Contents Macros (Examples)]]. </dl> <blockquote class="doc-example-result"> <$reveal default="$egvar$" type="match" text="NO-SUCH-VAR"> - $eg$ + +$$$text/vnd.tiddlywiki +$eg$ +$$$ + </$reveal> <$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR"> <<$egvar$>> diff --git a/editions/tw5.com/tiddlers/system/operator-template.tid b/editions/tw5.com/tiddlers/system/operator-template.tid index 7d7ba9311..4d7abc334 100644 --- a/editions/tw5.com/tiddlers/system/operator-template.tid +++ b/editions/tw5.com/tiddlers/system/operator-template.tid @@ -1,6 +1,6 @@ created: 20150203173506000 list-before: $:/core/ui/ViewTemplate/body -modified: 20220316121232243 +modified: 20230602181119360 tags: $:/tags/ViewTemplate title: $:/editions/tw5.com/operator-template @@ -72,10 +72,10 @@ title: $:/editions/tw5.com/operator-template <!-- --> </table> -[[Learn more about how to use Filters|Filters]] +<p>[[Learn more about how to use Filters|Filters]]</p> <$list filter="[all[current]has[from-version]]" variable="listItem"> -<$macrocall $name=".from-version" version={{!!from-version}}/> +<p><$macrocall $name=".from-version" version={{!!from-version}}/></p> </$list> </$list> </$set> diff --git a/editions/tw5.com/tiddlers/system/static.content.tid b/editions/tw5.com/tiddlers/system/static.content.tid index 3725b25ac..13ab4c926 100644 --- a/editions/tw5.com/tiddlers/system/static.content.tid +++ b/editions/tw5.com/tiddlers/system/static.content.tid @@ -17,14 +17,6 @@ It looks like this browser doesn't run JavaScript. You can use one of these stat --- -{{HelloThere}} - {{TiddlyWiki}} -{{Features}} - -{{Community}} - -{{HelpingTiddlyWiki}} - </$reveal> diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global.tid new file mode 100644 index 000000000..ff04dd990 --- /dev/null +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global.tid @@ -0,0 +1,9 @@ +caption: $:/tags/Global +created: 20230419103154329 +description: marks global definitions +modified: 20230419103154329 +tags: SystemTags +title: SystemTag: $:/tags/Global +type: text/vnd.tiddlywiki + +The [[system tag|SystemTags]] `$:/tags/Global` marks global definitions that are made available everywhere. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View.tid new file mode 100644 index 000000000..ce317d6bd --- /dev/null +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View.tid @@ -0,0 +1,9 @@ +caption: $:/tags/Global/View +created: 20230419103154329 +description: marks global definitions only active in View template +modified: 20230419103154329 +tags: SystemTags +title: SystemTag: $:/tags/Global/View +type: text/vnd.tiddlywiki + +The [[system tag|SystemTags]] `$:/tags/Global/View` marks definitions that are only made available within the main view templates and the preview panel. diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View_Body.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View_Body.tid new file mode 100644 index 000000000..af3f94a87 --- /dev/null +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Global_View_Body.tid @@ -0,0 +1,9 @@ +caption: $:/tags/Global/View/Body +created: 20230419103154329 +description: marks global definitions only active in View template body +modified: 20230419103154329 +tags: SystemTags +title: SystemTag: $:/tags/Global/View/Body +type: text/vnd.tiddlywiki + +The [[system tag|SystemTags]] `$:/tags/Global/View/Body` marks definitions that are only made available within the main view template bodies and the preview panel. diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid index a031fc998..6eaa005ab 100644 --- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro.tid @@ -6,4 +6,4 @@ tags: SystemTags title: SystemTag: $:/tags/Macro type: text/vnd.tiddlywiki -The [[system tag|SystemTags]] `$:/tags/Macro` marks global macros \ No newline at end of file +The [[system tag|SystemTags]] `$:/tags/Macro` marks global macros. It is now deprecated in favour of [[SystemTag $:/tags/Global]]. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid index 723b0b130..a1831affd 100644 --- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid @@ -6,4 +6,4 @@ tags: SystemTags title: SystemTag: $:/tags/Macro/View type: text/vnd.tiddlywiki -The [[system tag|SystemTags]] `$:/tags/Macro/View` marks macros that are only made available within the main view templates and the preview panel. +The [[system tag|SystemTags]] `$:/tags/Macro/View` marks macros that are only made available within the main view templates and the preview panel. It is now deprecated in favour of [[SystemTag $:/tags/Global/View]]. diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid index 88a00fb2a..e413dcf89 100644 --- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View_Body.tid @@ -6,4 +6,4 @@ tags: SystemTags title: SystemTag: $:/tags/Macro/View/Body type: text/vnd.tiddlywiki -The [[system tag|SystemTags]] `$:/tags/Macro/View/Body` marks macros that are only made available within the main view template bodies and the preview panel. +The [[system tag|SystemTags]] `$:/tags/Macro/View/Body` marks macros that are only made available within the main view template bodies and the preview panel. It is now deprecated in favour of [[SystemTag $:/tags/Global/View/Body]]. diff --git a/editions/tw5.com/tiddlers/variables/SampleTemplate.tid b/editions/tw5.com/tiddlers/variables/SampleTemplate.tid new file mode 100644 index 000000000..e7306504e --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/SampleTemplate.tid @@ -0,0 +1,10 @@ +created: 20230506165016526 +description: I'm a demonstration template +modified: 20230506170529579 +tags: Demonstrations thisTiddler +title: SampleTemplate +type: text/vnd.tiddlywiki + +''thisTiddler'': <$text text=<<thisTiddler>> /> + +''currentTiddler'': <$text text=<<currentTiddler>> /> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/variables/Variable Usage.tid b/editions/tw5.com/tiddlers/variables/Variable Usage.tid index 2166f206a..bc5f36443 100644 --- a/editions/tw5.com/tiddlers/variables/Variable Usage.tid +++ b/editions/tw5.com/tiddlers/variables/Variable Usage.tid @@ -150,5 +150,5 @@ Below is an example macro, procedure and function definition. All three forms o *''tiddler titles'' - tiddlers are uniquely identified by their title. The namespace for tiddler titles and variable names are completely separate. *''variables'' - \define, <<.wlink SetWidget>>, <<.wlink LetWidget>>, <<.wlink VarsWidget>>, \procedure, \widget, \function all create variables. If the same name is used, then later define will overwrite earlier defined *''<<.op function>> filter operator parameter'' - only variables defined using \function can be called using the <<.olink function>> operator - *''filter operators'' - only the [[javascript defined filter operators|Filter Operators]] and variables defined using \function with name starting with a dot can be called + *''filter operators'' - only the [[javascript defined filter operators|Filter Operators]] and variables defined using \function with name containing a dot can be called *''widgets'' - variables defined using \widget can be invoked using `<$widget/>` syntax ONLY if the name starts a dollar sign (to override existing javascript defined widgets) or double dollar sign (to define [[custom widgets|Custom Widgets]]). Without the dollar sign prefix, defining variables using \widget is no different than using \procedure. diff --git a/editions/tw5.com/tiddlers/variables/thisTiddler Variable (Examples).tid b/editions/tw5.com/tiddlers/variables/thisTiddler Variable (Examples).tid new file mode 100644 index 000000000..7bb396aa5 --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/thisTiddler Variable (Examples).tid @@ -0,0 +1,18 @@ +created: 20230304123606350 +modified: 20230304124149055 +tags: [[thisTiddler Variable]] [[Variable Examples]] +title: thisTiddler Variable (Examples) +type: text/vnd.tiddlywiki + +The first example shows how <<.def thisTiddler>> works whithin transcluded template. Here the [[SampleTemplate]] is a template for demonstration. + +<$macrocall $name=".example" n="1" eg="""{{||SampleTemplate}}"""/> + +The second example shows <<.def thisTiddler>> in the body of tiddler and inside a macro. + +<$macrocall $name=".example" n="2" eg="""<$text text=<<thisTiddler>>/>"""/> + +<$macrocall $name=".example" n="3" eg="""\define example() <$text text=<<thisTiddler>>/> +<<example>> +"""/> + diff --git a/editions/tw5.com/tiddlers/variables/thisTiddler Variable.tid b/editions/tw5.com/tiddlers/variables/thisTiddler Variable.tid new file mode 100644 index 000000000..9ed2be72f --- /dev/null +++ b/editions/tw5.com/tiddlers/variables/thisTiddler Variable.tid @@ -0,0 +1,17 @@ +caption: thisTiddler +created: 20230304122810114 +modified: 20230505200086200 +tags: Variables [[Core Variables]] +title: thisTiddler Variable +type: text/vnd.tiddlywiki + +<<.from-version "5.3.0">> The <<.def thisTiddler>> [[variable|Variables]] is set by the <<.wlink TranscludeWidget>> widget to contain the title of the tiddler that was transcluded. This means that within transclusions <<.def thisTiddler>> will contain the title of the transcluded tiddler. It is not affected by macros, which means that within a macro <<.def thisTiddler>> will contain the title of the tiddler from which the macro was invoked. Intermediate, nested macro calls are ignored. + +There are two key usages for <<.def thisTiddler>>: + +* Within a transcluded template, <<.def thisTiddler>> points to the template itself, making it possible for the template to access data stored in other fields of the template +* Within a macro, <<.def thisTiddler>> points to the template that invoked the macro. If the macro was invoked by another macro, the template that invoked that macro is returned, and so on + +Compare <<.vlink storyTiddler>> and <<.vlink currentTiddler>>. + +<<.variable-examples "thisTiddler">> diff --git a/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid b/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid index 1aa61e86a..75b5f1484 100644 --- a/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid +++ b/editions/tw5.com/tiddlers/webserver/Using the external JavaScript template.tid @@ -1,9 +1,13 @@ created: 20180905075846391 -modified: 20221207112242775 +modified: 20230319130830880 tags: [[WebServer Guides]] title: Using the external JavaScript template type: text/vnd.tiddlywiki +<!-- +This tiddler is also included in the "server-external-js" edition. Take care before editing or moving it. +--> + You can use a special template to externalise ~TiddlyWiki's core code into a separate file. This configuration allows the browser to cache the core for improved efficiency. ! Background @@ -60,7 +64,7 @@ The "server-external-js" edition lets you save the snapshot from the command lin tiddlywiki YOUR_WIKI_FOLDER --build index ``` -The files `index.html` and `tiddlywikicore-5.x.x.js` will be saved in your wiki folder's `output` directory. +The files `external-5-x-x.html` and `tiddlywikicore-5.x.x.js` will be saved in your wiki folder's `output` directory. !! Obtaining the ~TiddlyWiki core in the browser diff --git a/editions/tw5.com/tiddlers/webserver/WebServer Header Authentication.tid b/editions/tw5.com/tiddlers/webserver/WebServer Header Authentication.tid index d4832d17f..7f6a9a5a4 100644 --- a/editions/tw5.com/tiddlers/webserver/WebServer Header Authentication.tid +++ b/editions/tw5.com/tiddlers/webserver/WebServer Header Authentication.tid @@ -4,6 +4,10 @@ tags: [[WebServer Authentication]] title: WebServer Header Authentication type: text/vnd.tiddlywiki -Header authentication is a web integration technique enabling external entities to securely pass details of the authenticated user to an application. It is commonly used for "single sign on" in corporate environments. +Header authentication is a web integration technique enabling external entities to securely pass details of the authenticated user to an application. Header authentication is activated if is configured via the [[authenticated-user-header|WebServer Parameter: authenticated-user-header]] + +!! Usage in SSO + +Header authentication is commonly used for "single sign on" in corporate environments. When doing header authentication, the user is not prompted for a username and password on TiddlyWiki. Instead, the user is required to login at a SSO proxy server. When the user authenticates themselves to the SSO proxy server, the proxy server redirects the user request to the TiddlyWiki server with this additional request header containing the username. Then TiddlyWiki server is able to use the value of this request header to identify the user. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ authenticated-user-header.tid b/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ authenticated-user-header.tid index acd409220..e19373b66 100644 --- a/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ authenticated-user-header.tid +++ b/editions/tw5.com/tiddlers/webserver/WebServer Parameter_ authenticated-user-header.tid @@ -1,8 +1,16 @@ caption: authenticated-user-header created: 20180630180213047 -modified: 20180702140416583 +modified: 20230522184416583 tags: [[WebServer Parameters]] title: WebServer Parameter: authenticated-user-header type: text/vnd.tiddlywiki -The [[web server configuration parameter|WebServer Parameters]] ''authenticated-user-header'' activates [[header authentication|WebServer Header Authentication]] by specifying the name of the HTTP header that will be used to pass the username to TiddlyWiki. \ No newline at end of file +The [[web server configuration parameter|WebServer Parameters]] ''authenticated-user-header'' activates [[header authentication|WebServer Header Authentication]] by specifying the name of the HTTP header field that will be used to pass the username to TiddlyWiki. + +For example, if the ''authenticated-user-header'' is set to ''X-Authenticated-User'', then the HTTP request must include a header field ''X-Authenticated-User'' with a value that is the username: + +```http +X-Authenticated-User: JeremyRuston +``` + +<<.from-version "5.3.0">> Value of this header field should be URI-encoded before transit on the client (using `encodeURIComponent` JS function or [[encodeuricomponent Operator]]), and will be URI-decoded by the server. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid index c220302cf..3d762bed2 100644 --- a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid +++ b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid @@ -15,26 +15,21 @@ Custom widgets can also be used to override built-in JavaScript widgets to custo Custom widgets are usually defined with the [[Pragma: \widget]]: ``` -\widget $$my-widget(attribute:"Default value") +\widget $my.widget(attribute:"Default value") This is the widget, and the attribute is <<attribute>>. \end ``` -The name of the widget must start with one or two dollar signs: - -* A ''single dollar sign'' is used to override existing core widgets -** for example, `$text` or `$codeblock` -* ''Double dollar signs'' are used to define a custom widget -** for example, `$$mywidget` or `$$acme-logger` +The name of the widget must start with a dollar sign. If it is a user defined widget that does not override an existing widget then it must include at least one period (dot) within the name (for example `$my.widget` or `$acme.logger`). !! Using Custom Widgets Custom widgets are called in the same way as ordinary built-in widgets: ``` -<$my-widget/> +<$my.widget/> -<$my-widget attribute="The parameter"/> +<$my.widget attribute="The parameter"/> ``` The attributes that are specified in the widget call are made available as parameter variables. @@ -45,18 +40,18 @@ Within the definition of a custom widget the content of the calling widget is av For example: -<<wikitext-example-without-html """\widget $$mywidget(one:'Jaguar') +<<wikitext-example-without-html """\widget $my.widget(one:'Jaguar') <$text text=<<one>>/> <$slot $name="ts-raw"> Whale </$slot> \end -<$$mywidget one="Dingo"> +<$my.widget one="Dingo"> Crocodile -</$$mywidget> +</$my.widget> -<$$mywidget/>""">> +<$my.widget/>""">> !! How Custom Widgets Work diff --git a/editions/tw5.com/tiddlers/widgets/FillWidget.tid b/editions/tw5.com/tiddlers/widgets/FillWidget.tid index 3fffd51f0..ba401d1a5 100644 --- a/editions/tw5.com/tiddlers/widgets/FillWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/FillWidget.tid @@ -1,6 +1,6 @@ caption: fill created: 20220909111836951 -modified: 20230419103154328 +modified: 20230511123456782 tags: Widgets title: FillWidget type: text/vnd.tiddlywiki @@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki <<.from-version "5.3.0">> The <<.wlink FillWidget>> widget is used within a <<.wlink TranscludeWidget>> widget to specify the content that should be copied to the named "slot". Slots are defined by the <<.wlink SlotWidget>> widget within the transcluded content. -See the <<.wlink TranscludeWidget>> widget for details. +See the <<.wlink TranscludeWidget>> widget for details and an example. More examples can be found in the <<.wlink SlotWidget>> widget documentation. ! Attributes diff --git a/editions/tw5.com/tiddlers/widgets/ParametersWidget.tid b/editions/tw5.com/tiddlers/widgets/ParametersWidget.tid index 8ddee3151..cfa668c0b 100644 --- a/editions/tw5.com/tiddlers/widgets/ParametersWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/ParametersWidget.tid @@ -1,6 +1,6 @@ caption: parameters created: 20220909111836951 -modified: 20230419103154328 +modified: 20230518134032228 tags: Widgets title: ParametersWidget type: text/vnd.tiddlywiki @@ -48,14 +48,5 @@ These attributes provide low level access to the contents of the transcluding wi * The `$slotFillParseTreeNodes` attribute provides access to the raw parse tree nodes corresponding to the filled slots within the contents of the transcluding widget. Represented in JSON as an object with keys of the slot name and values being an array of parse tree nodes ! Examples +{{ParametersWidget (Examples)}} -Here the <<.wlink ParametersWidget>> widget is used to declare a parameter whose default value is transcluded from another tiddler. - -<$macrocall $name='wikitext-example-without-html' -src="""\procedure mymacro() -<$parameters name={{$:/SiteTitle}} age="21"> -My name is <<name>> and my age is <<age>>. -</$parameters> -\end - -<$transclude $variable="mymacro" age="19"/>"""/> diff --git a/editions/tw5.com/tiddlers/widgets/SlotWidget.tid b/editions/tw5.com/tiddlers/widgets/SlotWidget.tid index f7b26e62d..08f277ea8 100644 --- a/editions/tw5.com/tiddlers/widgets/SlotWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/SlotWidget.tid @@ -1,6 +1,6 @@ caption: slot created: 20220909111836951 -modified: 20230419103154329 +modified: 20230511123922283 tags: Widgets title: SlotWidget type: text/vnd.tiddlywiki @@ -17,3 +17,59 @@ The content of the <<.wlink SlotWidget>> widget is used as a fallback for the sl |!Attribute |!Description | |$name |The name of the slot being defined | +|$depth |Optional number indicating how deep the <<.wlink SlotWidget>> widget is compared to the matching <<.wlink FillWidget>> widget as measured by the number of nested transclude widgets (defaults to 1). Transclude widgets whose <<.attr $fillignore>> attribute is set to ''yes'' are ignored, and do not affect the depth count | + +! Examples + +!! Quoted content +When content contains quotes, passing it through attributes and parameters can be challenging. However, passing the content using the <<.wlink FillWidget>> widget content eliminates the need to wrap it in quotes, making the process easier. + +<$let bold_slot='<b> +<$slot $name="body"/> +</b> +'> + +If a variable named <<.var bold_slot>> contains the following <<.wlink SlotWidget>> definition: +<$codeblock code={{{[[bold_slot]getvariable[]]}}}/> + +then the slot can be filled using this variable transclusion: + +<<wikitext-example-without-html src:'<$transclude $variable=bold_slot> +<$fill $name=body> + +""" +some text +using [[Hard Linebreaks in WikiText]] +syntax +""" +</$fill> +</$transclude> +'>> +</$let> + +!! Depth + +<$let table_slot="|!depth|!slot1|!slot2| +|1|<$slot $name=slot1/>|<$slot $name=slot2/>| +|2|<$slot $name=slot1 $depth=2>missing</$slot>|<$slot $name=slot2 $depth=2>missing</$slot>| +" +table_fill="""<$transclude $variable=table_slot $mode=block> + <$fill $name=slot1>outer1</$fill> + <$fill $name=slot2>outer2 + <$transclude $variable=table_slot $mode=block> + <$fill $name=slot1>inner1</$fill> + <$fill $name=slot2>inner2</$fill> + </$transclude> + </$fill> +</$transclude> +"""> + +If a variable named <<.var table_slot>> contains the following <<.wlink SlotWidget>> definition: + +<$codeblock code={{{[[table_slot]getvariable[]]}}}/> + +then the slot values can be filled at different transclusion depths: + +<$transclude $variable="wikitext-example-without-html" src=<<table_fill>>/> + +The <<.var slot1>> slot is filled at both depths with a simple string (outer1 and outer2). For <<.var slot2>>, the outer instance is a simple string but the inner instance recursively transcludes the same <<.var table_slot>> variable again. The recursion ends at the third transclusion call since both "inner" slots are filled with simple strings. \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid b/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid index 348de1090..a44c91dd6 100644 --- a/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/TranscludeWidget.tid @@ -1,6 +1,6 @@ caption: transclude created: 20130824142500000 -modified: 20230419103154329 +modified: 20230511022612458 tags: Widgets title: TranscludeWidget type: text/vnd.tiddlywiki @@ -51,6 +51,7 @@ Modern mode is recommended for use in new applications. |$type |– |Optional ContentType used when transcluding variables, indexes or fields other than the ''text'' field| |$output |- |ContentType for the output rendering (defaults to `text/html`, can also be `text/plain` or `text/raw`) | |$recursionMarker |recursionMarker |Set to ''no'' to prevent creation of [[Legacy Transclusion Recursion Marker]] (defaults to ''yes'') | +|$fillignore |- |Set to ''yes'' to make this transclusion invisible to the <<.attr $depth>> attribute of the <<.wlink SlotWidget>> widget (defaults to ''no'') | |//{attributes not starting with $}// |– |Any other attributes that do not start with a dollar are used as parameters to the transclusion | |//{other attributes starting with $}// |– |Other attributes starting with a single dollar sign are reserved for future use | |//{attributes starting with $$}// |– |Attributes starting with two dollar signs are used as parameters to the transclusion, but with the name changed to use a single dollar sign | @@ -145,7 +146,7 @@ The output will be equivalent to: </li> </ol> ``` - +See <<.wlink SlotWidget>> for more examples. ! Missing Transclusion Targets diff --git a/editions/tw5.com/tiddlers/widgets/examples/ParametersWidget (Examples).tid b/editions/tw5.com/tiddlers/widgets/examples/ParametersWidget (Examples).tid new file mode 100644 index 000000000..144dd2860 --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/examples/ParametersWidget (Examples).tid @@ -0,0 +1,39 @@ +created: 20230518124403282 +modified: 20230518135109977 +tags: ParametersWidget +title: ParametersWidget (Examples) + +''Example i'': Shows transclusion of [[Sample Tiddler Template]]. The template tiddler has two parameters `name` and `age` and here their default values are used. + +<$macrocall $name=".example" n="1" eg="""<$transclude $tiddler="Sample Tiddler Template" />"""/> + +''Example ii'': Shows, another transclusion of [[Sample Tiddler Template]], here the value of `age` is passed, but `name` uses its default value. + +<$macrocall $name=".example" n="2" eg="""<$transclude $tiddler="Sample Tiddler Template" age=33/>"""/> + +''Example iii'': Shows, another transclusion of [[Sample Tiddler Template]], here the value of both `name` and `age` are passed. + +<$macrocall $name=".example" n="3" eg="""<$transclude $tiddler="Sample Tiddler Template" age=45 name="Jeremy Ruston" />"""/> + +In the simple form the above transclusion is equivalent to + +<$macrocall $name=".example" n="3.1" eg="""{{Sample Tiddler Template|Jeremy Ruston|45}}"""/> + +In this simple form, parameters passed by position not by name. So the first value is passed to the first parameter, here `name` and the second value is passed to the second parameter, here `age`. + +''Remarks'' + +# Passing parameter by name is good practice and is recommended for clarity. So for parameterized transclusions, the use of <<.wid transclude>> is recommended over simple form transclusion. +# When passing parameters value by position, you cannot pass the second parameter while the first one has not been passed. + + +''Example iv'': Here the <<.wlink ParametersWidget>> widget is used to declare a parameter whose default value is transcluded from another tiddler. + +<$macrocall $name=".example" n="4" eg="""\procedure myproc() +<$parameters name={{$:/SiteTitle}} age="21"> +My name is <<name>> and my age is <<age>>. +</$parameters> +\end + +<$transclude $variable="myproc" age="19"/> +"""/> \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/examples/Sample Tiddler Template.tid b/editions/tw5.com/tiddlers/widgets/examples/Sample Tiddler Template.tid new file mode 100644 index 000000000..c9ac24f35 --- /dev/null +++ b/editions/tw5.com/tiddlers/widgets/examples/Sample Tiddler Template.tid @@ -0,0 +1,9 @@ +created: 20230518124140604 +description: This example tiddler is used to illustrate some of the new features in Parameterized Transclusions +modified: 20230518125337219 +tags: [[ParametersWidget Examples]] Demonstrations +title: Sample Tiddler Template + +<$parameters name=Jeremy age="21"> +My name is <<name>> and my age is <<age>>. +</$parameters> \ No newline at end of file diff --git a/languages/zh-Hans/Help/listen.tid b/languages/zh-Hans/Help/listen.tid index 5dbf3be1a..593fa9dcf 100644 --- a/languages/zh-Hans/Help/listen.tid +++ b/languages/zh-Hans/Help/listen.tid @@ -18,7 +18,7 @@ listen 命令使用[[命名的命令参数|NamedCommandParameters]]： * ''anon-username'' - 匿名用户的编辑署名 * ''username'' - 可选的基础验证用户名称 * ''password'' - 可选的基础验证密码 -* ''authenticated-user-header'' - 可选的标头名称，用于受信任身份验证 +* ''authenticated-user-header'' - 可选的请求标头名称，用于受信任身份验证 * ''readers'' - 允许读取此维基，以逗号分隔的用户名称的清单 * ''writers'' - 允许写入此维基，以逗号分隔的用户名称的清单 * ''csrf-disable'' - 设置为 "yes" 以禁用 CSRF 检查 (默认为 "no") diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids index 183a677a6..ce369efa8 100644 --- a/languages/zh-Hans/Misc.multids +++ b/languages/zh-Hans/Misc.multids @@ -25,6 +25,8 @@ Encryption/RepeatPassword: 重复输入密码 Encryption/PasswordNoMatch: 密码不匹配 Encryption/SetPassword: 设定密码 Error/Caption: 错误 +Error/DeserializeOperator/MissingOperand: 筛选器错误：'deserialize' 运算符缺少运算元 +Error/DeserializeOperator/UnknownDeserializer: 筛选器错误：未知的解串器被提供为 'deserialize' 运算符的操作数 Error/Filter: 筛选器错误 Error/FilterRunPrefix: 筛选器错误：筛选器 run 的未知首码 Error/FilterSyntax: 筛选器运算式中的语法错误 diff --git a/languages/zh-Hant/Help/listen.tid b/languages/zh-Hant/Help/listen.tid index c2d96823f..49ccdbcb2 100644 --- a/languages/zh-Hant/Help/listen.tid +++ b/languages/zh-Hant/Help/listen.tid @@ -18,7 +18,7 @@ listen 命令使用[[命名的命令參數|NamedCommandParameters]]： * ''anon-username'' - 匿名使用者的編輯署名 * ''username'' - 可選的基本驗證使用者名稱 * ''password'' - 可選的基本驗證密碼 -* ''authenticated-user-header'' - 可選的標頭名稱，用於受信任身份驗證 +* ''authenticated-user-header'' - 可選的 HTTP 請求功能參數名稱，用於受信任身份驗證 * ''readers'' - 允許讀取此維基，以逗號分隔的使用者名稱的清單 * ''writers'' - 允許寫入此維基，以逗號分隔的使用者名稱的清單 * ''csrf-disable'' - 設定為 "yes" 以停用 CSRF 檢查 (預設為 "no") diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids index e850ebaf9..e38900415 100644 --- a/languages/zh-Hant/Misc.multids +++ b/languages/zh-Hant/Misc.multids @@ -25,6 +25,8 @@ Encryption/RepeatPassword: 重複輸入密碼 Encryption/PasswordNoMatch: 密碼不匹配 Encryption/SetPassword: 設定密碼 Error/Caption: 錯誤 +Error/DeserializeOperator/MissingOperand: 篩選器錯誤：'deserialize' 運算子缺少運算元 +Error/DeserializeOperator/UnknownDeserializer: 篩選器錯誤：未知的解串器被提供為 'deserialize' 運算子的運算元 Error/Filter: 篩選器錯誤 Error/FilterRunPrefix: 篩選器錯誤：篩選器 run 的未知首碼 Error/FilterSyntax: 篩選器運算式中的語法錯誤 diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index df194361e..55cc944d4 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -529,3 +529,7 @@ HuanC Fu, @hffqyd, 2023/03/03 Michelle Saad, @michsa, 2023-03-08 Yukai Chou, @muzimuzhi, 2023-04-07 + +Carmine Guida, @carmineguida, 2023-05-17 + +Tavin Cole, @tavin, 2023/05/25 diff --git a/plugins/tiddlywiki/blog/templates/html-page/page.tid b/plugins/tiddlywiki/blog/templates/html-page/page.tid index 4aab9653e..20b7eae77 100644 --- a/plugins/tiddlywiki/blog/templates/html-page/page.tid +++ b/plugins/tiddlywiki/blog/templates/html-page/page.tid @@ -22,7 +22,7 @@ title: $:/plugins/tiddlywiki/blog/templates/html-page/page <body class="tc-body"> `{{$:/StaticBanner||$:/core/templates/html-tiddler}}` <section class="tc-story-river"> -`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +`<$importvariables filter={{$:/core/config/GlobalImportFilter}}> <$view tiddler="$:/plugins/tiddlywiki/blog/templates/tiddler" format="htmlwikified"/> </$importvariables>` </section> diff --git a/plugins/tiddlywiki/blog/templates/html-page/post.tid b/plugins/tiddlywiki/blog/templates/html-page/post.tid index b4d631f82..6f3b4584c 100644 --- a/plugins/tiddlywiki/blog/templates/html-page/post.tid +++ b/plugins/tiddlywiki/blog/templates/html-page/post.tid @@ -22,7 +22,7 @@ title: $:/plugins/tiddlywiki/blog/templates/html-page/post <body class="tc-body"> `{{$:/StaticBanner||$:/core/templates/html-tiddler}}` <section class="tc-story-river"> -`<$importvariables filter="[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]"> +`<$importvariables filter={{$:/core/config/GlobalImportFilter}}> <$view tiddler="$:/plugins/tiddlywiki/blog/templates/tiddler" format="htmlwikified"/> <$view tiddler="$:/plugins/tiddlywiki/blog/templates/menu" format="htmlwikified"/> </$importvariables>` diff --git a/plugins/tiddlywiki/browser-storage/settings.tid b/plugins/tiddlywiki/browser-storage/settings.tid index 33d8ef0e1..7bf0e26e5 100644 --- a/plugins/tiddlywiki/browser-storage/settings.tid +++ b/plugins/tiddlywiki/browser-storage/settings.tid @@ -17,8 +17,8 @@ Click this button to clear browser storage and disable its use: This filter determines which tiddlers will be saved to local storage. * `[prefix[$:/state/]] -[prefix[$:/state/popup/]]` - the default value. Save state tiddlers except popup state tiddlers, thus preserving selected tabs and the open/closed status of table of contents entries. Any other tiddlers created or changed will be lost after reloading the page. -* `[all[]]` - attempt to save all changed tiddlers. This means even popup state tiddlers and temporary tiddlers will be saved. In addition, when a plugin is installed, all the shadow tiddlers are individually "exploded" into local storage. Deleting the plugin requires deleting all the tiddlers individually. Not recommended unless these issues are unimportant. -* `[all[]] -[is[shadow]!is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]]` - save all tiddlers except unmodified shadow tiddlers, popup state tiddlers, temp tiddlers and the history list. Solves the aforementioned issues with `[all[]]`. Recommended. +* `[all[]]` - attempt to save all changed tiddlers. This means even popup state tiddlers and temporary tiddlers will be saved. +* `[all[]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]]` - save all tiddlers except popup state tiddlers, temp tiddlers and the history list. <$link to="$:/config/BrowserStorage/SaveFilter">Browser Storage Save Filter</$link>: <$edit-text tiddler="$:/config/BrowserStorage/SaveFilter" default="" tag="input" size="50"/> diff --git a/plugins/tiddlywiki/browser-storage/util.js b/plugins/tiddlywiki/browser-storage/util.js index a88c358f6..7474a367c 100644 --- a/plugins/tiddlywiki/browser-storage/util.js +++ b/plugins/tiddlywiki/browser-storage/util.js @@ -53,24 +53,31 @@ BrowserStorageUtil.prototype.saveTiddlerToLocalStorage = function(title) { // Get the tiddler var tiddler = $tw.wiki.getTiddler(title); if(tiddler) { - console.log("browser-storage: Saving",title); - // Get the JSON of the tiddler - var json = JSON.stringify(tiddler.getFieldStrings()); - // Try to save it to local storage - try { - window.localStorage.setItem(this.options.prefix + title,json); - } catch(e) { - if(e.name === "QuotaExceededError") { - // Complain if we failed - var msg = $tw.wiki.getTiddlerText(this.QUOTA_EXCEEDED_ALERT_TITLE,this.DEFAULT_QUOTA_EXCEEDED_ALERT_PREFIX + title + this.DEFAULT_QUOTA_EXCEEDED_ALERT_SUFFIX); - if(this.options.logger) { - this.options.logger.alert(msg); + if (this.wiki.tiddlerExists(title)) { + // This is not a shadow tiddler + console.log("browser-storage: Saving",title); + // Get the JSON of the tiddler + var json = JSON.stringify(tiddler.getFieldStrings()); + // Try to save it to local storage + try { + window.localStorage.setItem(this.options.prefix + title,json); + } catch(e) { + if(e.name === "QuotaExceededError") { + // Complain if we failed + var msg = $tw.wiki.getTiddlerText(this.QUOTA_EXCEEDED_ALERT_TITLE,this.DEFAULT_QUOTA_EXCEEDED_ALERT_PREFIX + title + this.DEFAULT_QUOTA_EXCEEDED_ALERT_SUFFIX); + if(this.options.logger) { + this.options.logger.alert(msg); + } + // No point in keeping old values around for this tiddler + window.localStorage.removeItem(this.options.prefix + title); + } else { + console.log("Browser-storage error:",e); } - // No point in keeping old values around for this tiddler - window.localStorage.removeItem(this.options.prefix + title); - } else { - console.log("Browser-storage error:",e); } + } else { + // Shadow tiddler which is no longer overwritten (or never was) + // Ensure it is not in local storage + this.removeTiddlerFromLocalStorage(title); } } else { // In local storage, use the special value of empty string to mark the tiddler as deleted diff --git a/plugins/tiddlywiki/codemirror-trailingspace/config-language.multids b/plugins/tiddlywiki/codemirror-trailingspace/config-language.multids new file mode 100644 index 000000000..7f8ee0234 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/config-language.multids @@ -0,0 +1,4 @@ +title: $:/language/codemirror/ + +showTrailingSpace/hint: Show trailing space +showTrailingSpace/info: Trailing space on each line will be decorated as per theme CSS. diff --git a/plugins/tiddlywiki/codemirror-trailingspace/config/showTrailingSpace.tid b/plugins/tiddlywiki/codemirror-trailingspace/config/showTrailingSpace.tid new file mode 100644 index 000000000..c2ab9d10b --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/config/showTrailingSpace.tid @@ -0,0 +1,3 @@ +title: $:/config/codemirror/showTrailingSpace +type: bool +text: true diff --git a/plugins/tiddlywiki/codemirror-trailingspace/files/addon/edit/trailingspace.css b/plugins/tiddlywiki/codemirror-trailingspace/files/addon/edit/trailingspace.css new file mode 100644 index 000000000..652152d99 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/files/addon/edit/trailingspace.css @@ -0,0 +1,5 @@ +.cm-trailingspace { + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAACCAYAAAB/qH1jAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QUXCToH00Y1UgAAACFJREFUCNdjPMDBUc/AwNDAAAFMTAwMDA0OP34wQgX/AQBYgwYEx4f9lQAAAABJRU5ErkJggg==); + background-position: bottom left; + background-repeat: repeat-x; +} diff --git a/plugins/tiddlywiki/codemirror-trailingspace/files/addon/edit/trailingspace.js b/plugins/tiddlywiki/codemirror-trailingspace/files/addon/edit/trailingspace.js new file mode 100644 index 000000000..8d01c20ca --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/files/addon/edit/trailingspace.js @@ -0,0 +1,27 @@ +// CodeMirror, copyright (c) by Marijn Haverbeke and others +// Distributed under an MIT license: https://codemirror.net/5/LICENSE + +(function(mod) { + if (typeof exports == "object" && typeof module == "object") // CommonJS + mod(require("../../lib/codemirror")); + else if (typeof define == "function" && define.amd) // AMD + define(["../../lib/codemirror"], mod); + else // Plain browser env + mod(CodeMirror); +})(function(CodeMirror) { + CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) { + if (prev == CodeMirror.Init) prev = false; + if (prev && !val) + cm.removeOverlay("trailingspace"); + else if (!prev && val) + cm.addOverlay({ + token: function(stream) { + for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {} + if (i > stream.pos) { stream.pos = i; return null; } + stream.pos = l; + return "trailingspace"; + }, + name: "trailingspace" + }); + }); +}); diff --git a/plugins/tiddlywiki/codemirror-trailingspace/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror-trailingspace/files/tiddlywiki.files new file mode 100755 index 000000000..c981dfdaf --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/files/tiddlywiki.files @@ -0,0 +1,19 @@ +{ + "tiddlers": [ + { + "file": "addon/edit/trailingspace.css", + "fields": { + "type": "text/css", + "title": "$:/plugins/tiddlywiki/codemirror/addon/edit/trailingspace.css", + "tags": "[[$:/tags/Stylesheet]]" + } + },{ + "file": "addon/edit/trailingspace.js", + "fields": { + "type": "application/javascript", + "title": "$:/plugins/tiddlywiki/codemirror/addon/edit/trailingspace.js", + "module-type": "codemirror" + } + } + ] +} diff --git a/plugins/tiddlywiki/codemirror-trailingspace/plugin.info b/plugins/tiddlywiki/codemirror-trailingspace/plugin.info new file mode 100755 index 000000000..60e94e88e --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/plugin.info @@ -0,0 +1,7 @@ +{ + "title": "$:/plugins/tiddlywiki/codemirror-trailingspace", + "name": "CodeMirror Show Trailing Space", + "description": "Show trailing space in CodeMirror", + "parent-plugin": "$:/plugins/tiddlywiki/codemirror", + "list": "readme" +} diff --git a/plugins/tiddlywiki/codemirror-trailingspace/readme.tid b/plugins/tiddlywiki/codemirror-trailingspace/readme.tid new file mode 100755 index 000000000..bc95f5955 --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/readme.tid @@ -0,0 +1,7 @@ +title: $:/plugins/tiddlywiki/codemirror-trailingspace/readme + +This plugin contains the [[trailingspace|https://codemirror.net/5/doc/manual.html#addon_trailingspace]] +addon for CodeMirror, and provides a default style (red squiggles). + +First install the [[CodeMirror plugin|$:/plugins/tiddlywiki/codemirror]]. + diff --git a/plugins/tiddlywiki/codemirror-trailingspace/settings/showTrailingSpace.tid b/plugins/tiddlywiki/codemirror-trailingspace/settings/showTrailingSpace.tid new file mode 100644 index 000000000..7b58507df --- /dev/null +++ b/plugins/tiddlywiki/codemirror-trailingspace/settings/showTrailingSpace.tid @@ -0,0 +1,11 @@ +title: $:/core/ui/ControlPanel/Settings/codemirror/showTrailingSpace +tags: $:/tags/ControlPanel/Settings/CodeMirror +caption: {{$:/language/codemirror/showTrailingSpace/hint}} + +\define lingo-base() $:/language/codemirror/showTrailingSpace/ +<<lingo hint>> + +<$checkbox tiddler="$:/config/codemirror/showTrailingSpace" field="text" checked="true" unchecked="false" default="true"> + <$link to="$:/config/codemirror/showTrailingSpace"><<lingo info>></$link> +</$checkbox> + diff --git a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files index f3c1d1666..bb127bb9e 100755 --- a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files +++ b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files @@ -10,7 +10,7 @@ },{ "file": "codemirror.css", "fields": { - "type": "text/vnd.tiddlywiki", + "type": "text/css", "title": "$:/plugins/tiddlywiki/codemirror/lib/codemirror.css", "tags": "[[$:/tags/Stylesheet]]" } diff --git a/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid b/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid deleted file mode 100644 index 1efe8b867..000000000 --- a/plugins/tiddlywiki/codemirror/ui/controlpanel/settings.tid +++ /dev/null @@ -1,7 +0,0 @@ -title: $:/core/ui/ControlPanel/Settings -tags: $:/tags/ControlPanel -caption: {{$:/language/ControlPanel/Settings/Caption}} - -<div class="tc-control-panel"> -<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/SettingsTab]!has[draft.of]]" default="$:/core/ui/ControlPanel/Settings/TiddlyWiki" explicitState="$:/state/tab--697582678"/> -</div> diff --git a/plugins/tiddlywiki/dynannotate/config/LegacySelectionTracker.tid b/plugins/tiddlywiki/dynannotate/config/LegacySelectionTracker.tid new file mode 100644 index 000000000..83a547633 --- /dev/null +++ b/plugins/tiddlywiki/dynannotate/config/LegacySelectionTracker.tid @@ -0,0 +1,3 @@ +title: $:/config/Dynannotate/LegacySelectionTracker/Enable + +no diff --git a/plugins/tiddlywiki/dynannotate/config/SelectionTracker.tid b/plugins/tiddlywiki/dynannotate/config/SelectionTracker.tid new file mode 100644 index 000000000..6162c992c --- /dev/null +++ b/plugins/tiddlywiki/dynannotate/config/SelectionTracker.tid @@ -0,0 +1,3 @@ +title: $:/config/Dynannotate/SelectionTracker/Enable + +no diff --git a/plugins/tiddlywiki/dynannotate/docs/readme.tid b/plugins/tiddlywiki/dynannotate/docs/readme.tid index 487c25561..ff0483a79 100644 --- a/plugins/tiddlywiki/dynannotate/docs/readme.tid +++ b/plugins/tiddlywiki/dynannotate/docs/readme.tid @@ -25,7 +25,7 @@ The `<$dynannotate>` widget uses the selection tracker to support a popup that d |popup |Popup state tiddler to be used to trigger a popup when an annotation is clicked | |search |Search text to be highlighted within the widget | |searchDisplay |"overlay" or "snippet" (see below) | -|searchMode |"normal" (default), "regexp" or "whitespace" (see below) | +|searchMode |"literal" (default), "regexp", "whitespace", "words" or "some" (see below) | |searchMinLength |Optional minimum length of search string | |searchCaseSensitive |"yes" (the default) for a case sensitive search, or "no" for a case insensitive search| |searchClass |Optional CSS class to be added to search overlays | @@ -46,9 +46,10 @@ The values supported by the `searchDisplay` attribute are: The search modes supported by the `searchMode` attribute are: -* `normal` - a literal string of plain text to match +* `literal` or `normal` - a literal string of plain text to match (default). * `regexp` - a JavaScript-style regular expression (without the quoting backslashes and flags) -* `whitespace` - a literal string to match while normalising runs of whitespace. This allows `a. b` to match `a. b` +* `whitespace` - a literal string to match while normalising runs of whitespace. Thus `A B` matches `A B`. +* `words` or `some` - treats the search string as a list of tokens separated by whitespace, and matches all tokens (regardless of ordering and whether there is other text in between) When the selection popup is triggered, the currently selected text can be found in the tiddler named in the `selection` attribute, with the disambiguating prefix and suffix in the tiddlers named in the `selectionPrefix` and `selectionPopup` tiddlers. Note that the selection text will be an empty string if the selection popup was triggered in response to a click (ie zero width selection). @@ -95,7 +96,7 @@ Note that using the `annotate-tiddler` field to associate an annotation with the !! Selection Trackers -The following configuration tiddlers can be used to control whether the selection trackers are enabled when the following configuration tiddlers are set to ''yes'' (the default). +The selection trackers are enabled when the following configuration tiddlers are set to ''yes''. * $:/config/Dynannotate/SelectionTracker/Enable for the main selection tracker * $:/config/Dynannotate/LegacySelectionTracker/Enable for the legacy selection tracker diff --git a/plugins/tiddlywiki/dynannotate/examples/simple.tid b/plugins/tiddlywiki/dynannotate/examples/simple.tid index aa1837b78..59a8d7e1d 100644 --- a/plugins/tiddlywiki/dynannotate/examples/simple.tid +++ b/plugins/tiddlywiki/dynannotate/examples/simple.tid @@ -10,16 +10,33 @@ caption: Simple $example$ \end +\define search-example-code() +<!-- +The inline filters update the displayed codeblock to reflect the choices the user has made in the UI. +The rules pragma is used here to evaluate only these filters, but leave everything else untouched. +The tabs and linebreaks within the parameters to addprefix, though maybe confusing, help with the readability of the codeblock output. +--> +\rules only filteredtranscludeinline +<$dynannotate + search="{{{ [{$:/temp/dynannotate-example/search}!is[blank]else[The human mind]] }}}"{{{ [{$:/temp/dynannotate-example/searchMode}!search::some[literal normal]addprefix[ + searchMode="]addsuffix["]] }}} + searchCaseSensitive="{{{ [{$:/temp/dynannotate-example/searchCaseSensitive}!is[blank]else[yes]] }}}"{{{ [{$:/temp/dynannotate-example/searchClass}!is[blank]addprefix[ + searchClass="]addsuffix["]] }}} +> +<$transclude tiddler="$:/plugins/tiddlywiki/dynannotate/example-text-1" mode="block"/> +<$transclude tiddler="$:/plugins/tiddlywiki/dynannotate/example-text-2" mode="block"/> +</$dynannotate> +\end + <div class="tc-dynannotation-example-info"> -!! Simple annotation +!! Annotations with `target` -We use the `target*` attributes to specify a target string for the annotation and optionally a prefix and suffix for disambiguating multiple occurances. +We use the `target*` attributes to specify a target string for the annotation and optionally a prefix and suffix for disambiguating multiple occurences. </div> -<<show-example """ -<$dynannotate +<<show-example """<$dynannotate target="the" targetPrefix="Yet " targetSuffix=" speed" @@ -30,55 +47,35 @@ We use the `target*` attributes to specify a target string for the annotation an <div class="tc-dynannotation-example-info"> -!! Plain text searching +!! Highlights with `search` -We use the `search` attribute to specify a search string for highlighting: +We use the `search` attribute to specify a search string for highlighting. + +The search type can be set with the `searchMode` and `searchCaseSensitive` attributes. + +We can style the highlights with the `searchClass` attribute, which has some predefined values. </div> -<<show-example """ +|tc-table-no-border tc-dynannotate-search-parameters|k +|search term |<$edit-text tiddler="$:/temp/dynannotate-example/search" field="text" tag="input" default="The human mind" />| +|search mode |<$select tiddler="$:/temp/dynannotate-example/searchMode" field="text" default="literal"><option value="literal">literal</option><option value="normal">normal</option><option value="regexp">regexp</option><option value="whitespace">whitespace</option><option value="some">some</option><option value="words">words</option></$select> | +|case sensitive |<$checkbox tiddler="$:/temp/dynannotate-example/searchCaseSensitive" field="text" checked="yes" unchecked="no" default="yes"> <$text text={{{ [{$:/temp/dynannotate-example/searchCaseSensitive}!is[blank]else[yes]] }}} /></$checkbox> | +|search class |<$select tiddler="$:/temp/dynannotate-example/searchClass" field="text" default=""><option value="">(none)</option><option value="tc-dynannotation-search-overlay-animated">tc-dynannotation-search-overlay-animated</option><option value="tc-dynannotation-search-overlay-blurred">tc-dynannotation-search-overlay-blurred</option></$select> | + <$dynannotate - search="the" + search={{{ [{$:/temp/dynannotate-example/search}!is[blank]else[The human mind]] }}} + searchMode={{{ [{$:/temp/dynannotate-example/searchMode}] }}} + searchCaseSensitive={{{ [{$:/temp/dynannotate-example/searchCaseSensitive}!is[blank]else[yes]] }}} + searchClass={{{ [{$:/temp/dynannotate-example/searchClass}] }}} > <$transclude tiddler="$:/plugins/tiddlywiki/dynannotate/example-text-1" mode="block"/> +<$transclude tiddler="$:/plugins/tiddlywiki/dynannotate/example-text-2" mode="block"/> </$dynannotate> -""">> -<div class="tc-dynannotation-example-info"> - -!! Regular expression searching - -We use the `mode` attribute set to `regexp` to highlight matches of a regular expression: - -</div> - -<<show-example """ -<$dynannotate - search="the|an" - searchMode="regexp" - searchClass="tc-dynannotation-search-overlay-blurred" -> -<$transclude tiddler="$:/plugins/tiddlywiki/dynannotate/example-text-1" mode="block"/> -</$dynannotate> -""">> - -<div class="tc-dynannotation-example-info"> - -!! Normalised whitespace searching - -We use the `mode` attribute set to `whitespace` to search for a string with whitespace normalised (ie runs of whitespace are collapsed to a single space for matching purposes): - -</div> - -<<show-example """ -<$dynannotate - search="does not work that way. It operates" - searchMode="whitespace" - searchClass="tc-dynannotation-search-overlay-animated" -> -<$transclude tiddler="$:/plugins/tiddlywiki/dynannotate/example-text-1" mode="block"/> -</$dynannotate> -""">> +<$wikify name="wikifiedCode" text=<<search-example-code>> mode="block" output="text"> +<$codeblock code=<<wikifiedCode>>/> +</$wikify> <div class="tc-dynannotation-example-info"> @@ -90,8 +87,7 @@ Annotation tiddlers can be used to describe annotations. This example references <<list-links "[all[shadows+tiddlers]annotate-tiddler[$:/plugins/tiddlywiki/dynannotate/example-text-1]]">> -<<show-example """ -<$dynannotate +<<show-example """<$dynannotate filter="[all[shadows+tiddlers]annotate-tiddler[$:/plugins/tiddlywiki/dynannotate/example-text-1]]" > <$transclude tiddler="$:/plugins/tiddlywiki/dynannotate/example-text-1" mode="block"/> diff --git a/plugins/tiddlywiki/dynannotate/examples/viewtemplate-text.tid b/plugins/tiddlywiki/dynannotate/examples/viewtemplate-text.tid index 15588c420..81c3c2b25 100644 --- a/plugins/tiddlywiki/dynannotate/examples/viewtemplate-text.tid +++ b/plugins/tiddlywiki/dynannotate/examples/viewtemplate-text.tid @@ -34,6 +34,7 @@ title: $:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text selectionPopup={{{ [<currentTiddler>addprefix[$:/state/dynannotate/popup-selection/]] }}} search={{$:/temp/search}} searchClass="tc-dynannotation-search-overlay-blurred" + searchCaseSensitive="no" searchMinLength={{$:/config/Search/MinLength}} > <$transclude mode="block"> diff --git a/plugins/tiddlywiki/dynannotate/examples/viewtemplate.tid b/plugins/tiddlywiki/dynannotate/examples/viewtemplate.tid index a0b99eb79..150a6f88f 100644 --- a/plugins/tiddlywiki/dynannotate/examples/viewtemplate.tid +++ b/plugins/tiddlywiki/dynannotate/examples/viewtemplate.tid @@ -1,28 +1,69 @@ -title: $:/plugins/tiddlywiki/dynannotate/examples/viewtemplate -tags: $:/tags/dynannotateExamples caption: View Template +tags: $:/tags/dynannotateExamples +title: $:/plugins/tiddlywiki/dynannotate/examples/viewtemplate + +\define show-example(example) +<$codeblock code=<<__example__>>/> + +//''Displays as:''// + +$example$ +\end <div class="tc-dynannotation-example-info"> !! Using Dynannotate in the view template -This example shows how to override the core view template with a custom template that includes dynannotate. It is disabled by default but can be enabled by clicking the button below. (Clicking the button below copies the custom view template from $:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text to $:/core/ui/ViewTemplate/body). +This example shows how to override the core view template with a custom template that includes dynannotate. It is disabled by default but can be enabled by clicking the corresponding button below. The example transcludes the [[Searching in TiddlyWiki|$:/plugins/tiddlywiki/dynannotate/searching-in-tiddlywiki]] tiddler for illustration purposes, but the chosen view template is applied to all open tiddlers. -Once enabled, this example demonstrates several features: +Once enabled, this example demonstrates several features of Dynannotate: -* Highlighting of search results within tiddler bodies -* Creating annotations on any tiddler by selecting text and then clicking a colour in the resulting dropdown +* Highlight text within tiddler bodies -- any text entered in the sidebar search input will be highlighted (in all tiddlers) +* Create annotations (on any tiddler) by selecting text and then clicking //Create annotation// in the resulting dropdown + +(Clicking the buttons below either puts the custom body view template [[$:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text]] in front of the default in the [[View Template Body Cascade|https://tiddlywiki.com/#View%20Template%20Body%20Cascade]] or removes it from the cascade). </div> <$button> -<$action-setfield $tiddler="$:/config/ViewTemplateTitleFilters/dynannotate" tags="$:/tags/ViewTemplateTitleFilter" text="[[$:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text]]" list-before="$:/config/ViewTemplateBodyFilters/default"/> +<$action-setfield $tiddler="$:/config/ViewTemplateBodyFilters/dynannotate" tags="$:/tags/ViewTemplateBodyFilter" text="[[$:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text]]" list-before="$:/config/ViewTemplateBodyFilters/default"/> Click here to use the custom view template </$button> <$button> -<$action-deletetiddler $tiddler="$:/config/ViewTemplateTitleFilters/dynannotate"/> +<$action-deletetiddler $tiddler="$:/config/ViewTemplateBodyFilters/dynannotate"/> Click here to revert to the core view template </$button> -<$codeblock code={{$:/plugins/tiddlywiki/dynannotate/examples/viewtemplate/text}}/> \ No newline at end of file +<p/> + +<div class="tc-dynannotation-example-info"> + +!! Using Dynannotate to highlight text on a per-tiddler basis + +Using state tiddlers containing the text which is to be highlighted, Dynannotate highlights can be applied on a per-tiddler basis when used in the body view template. This can also be combined with the [[GenesisWidget]] to insert the Dynannotate widget into the DOM only when such a highlight is configured. + +This example uses a transcluded tiddler, but Dynannotate could be added to the view template (to show highlights in all parts of a tiddler) or to the body view template (to show highlights only in the tiddler body) in the same way. Note how in this example, Dynannotate only affects the transcluded content. + +</div> + +<<show-example """<$button set="$:/state/dynannotate/examples/viewtemplate" setTo="tiddler">Highlight "tiddler"</$button> +<$button set="$:/state/dynannotate/examples/viewtemplate" setTo="created">Highlight "created"</$button> +<$button set="$:/state/dynannotate/examples/viewtemplate" setTo="">Clear highlights</$button> +<p/> +<$let dynannotateText={{$:/state/dynannotate/examples/viewtemplate}}> + <$genesis $type={{{ [<dynannotateText>!is[blank]then[$dynannotate]] }}} + search=<<dynannotateText>> + searchDisplay="overlay" + searchClass="tc-dynannotation-search-overlay-animated" + searchCaseSensitive="no"> + <div class="tc-dynannotate-example-frame"> + + !! `$:/core/ui/ControlPanel/TiddlerFields`: + <$transclude tiddler="$:/core/ui/ControlPanel/TiddlerFields" mode="block" /> + </div> + </$genesis> +</$let> +""">> + +When used in the view template, the state tiddler title could be derived from the current tiddler, e.g. `<$let dynannotateText={{{ [<currentTiddler>addprefix[$:/state/dynannotate/]get[text]] }}}>`, to configure highlights for each tiddler separately. diff --git a/plugins/tiddlywiki/dynannotate/modules/textmap.js b/plugins/tiddlywiki/dynannotate/modules/textmap.js index 9f9dbbbe3..934ceb0ff 100644 --- a/plugins/tiddlywiki/dynannotate/modules/textmap.js +++ b/plugins/tiddlywiki/dynannotate/modules/textmap.js @@ -15,7 +15,7 @@ Structure for modelling mapping between a string and its representation in the D var PREFIX_SUFFIX_LENGTH = 50; /* -Build a map of the text content of a dom node and its descendents: +Build a map of the text content of a DOM node and its descendants: string: concatenation of the text content of child nodes metadata: array of {start,end,domNode} where start and end identify position in the string @@ -60,7 +60,7 @@ exports.TextMap.prototype.locateMetadata = function(position) { }; /* -Search for the first occurance of a target string within the textmap of a dom node +Search for the first occurrence of a target string within the textmap of a DOM node Returns an object with the following properties: startNode: node containing the start of the text @@ -92,10 +92,10 @@ exports.TextMap.prototype.findText = function(targetString,targetPrefix,targetSu }; /* -Search for all occurances of a string within the textmap of a dom node +Search for all occurrences of a string within the textmap of a DOM node Options include: - mode: "normal", "regexp" or "whitespace" + mode: "normal", "literal", "regexp", "whitespace", "some" or "words" caseSensitive: true if the search should be case sensitive Returns an array of objects with the following properties: @@ -121,6 +121,11 @@ exports.TextMap.prototype.search = function(searchString,options) { regExpString = "(" + searchString.split(/\s+/g).filter(function(word) { return !!word }).map($tw.utils.escapeRegExp).join("\\s+") + ")"; + } else if(options.mode === "words" || options.mode === "some") { + // Match any word separated by whitespace + regExpString = "(" + searchString.split(/\s+/g).filter(function(word) { + return !!word + }).map($tw.utils.escapeRegExp).join("|") + ")"; } else { // Normal search regExpString = "(" + $tw.utils.escapeRegExp(searchString) + ")"; diff --git a/plugins/tiddlywiki/dynannotate/styles.tid b/plugins/tiddlywiki/dynannotate/styles.tid index cd635eed5..8b13eba58 100644 --- a/plugins/tiddlywiki/dynannotate/styles.tid +++ b/plugins/tiddlywiki/dynannotate/styles.tid @@ -34,6 +34,16 @@ tags: [[$:/tags/Stylesheet]] animation: ta-dynannotation-search-overlay-animated 12s linear infinite; } +.tc-dynannotate-example-frame { + border: 1px solid black; + border-radius: 20px; + padding: 1em; +} + +.tc-control-panel table.tc-dynannotate-search-parameters, .tc-control-panel table.tc-dynannotate-search-parameters input { + width: initial; +} + .tc-dynannotate-snippet-highlight { background: #efef53; } diff --git a/plugins/tiddlywiki/jasmine/jasmine-plugin.js b/plugins/tiddlywiki/jasmine/jasmine-plugin.js index 3ec7998a2..7da00af75 100644 --- a/plugins/tiddlywiki/jasmine/jasmine-plugin.js +++ b/plugins/tiddlywiki/jasmine/jasmine-plugin.js @@ -76,7 +76,7 @@ exports.runTests = function(callback,specFilter) { } return $tw.modules.execute(moduleTitle,title); }; - var contextExports = $tw.utils.evalSandboxed(code,context,title); + var contextExports = $tw.utils.evalSandboxed(code,context,title,true); // jasmine/jasmine.js assigns directly to `module.exports`: check // for it first. return context.module.exports || contextExports; diff --git a/plugins/tiddlywiki/markdown-legacy/images/markdown-linkify.tid b/plugins/tiddlywiki/markdown-legacy/images/markdown-linkify.tid index 08730bfad..1e11af839 100644 --- a/plugins/tiddlywiki/markdown-legacy/images/markdown-linkify.tid +++ b/plugins/tiddlywiki/markdown-legacy/images/markdown-linkify.tid @@ -1,6 +1,7 @@ title: $:/plugins/tiddlywiki/markdown-legacy/images/markdown-linkify tags: $:/tags/Image -<svg width="22pt" height="22pt" class="tc-markdown-linkify-button tc-image-button" viewBox="0 0 128 128"> +\parameters (size:"22pt") +<svg width=<<size>> height=<<size>> class="tc-markdown-linkify-button tc-image-button" viewBox="0 0 128 128"> <path d="M17.031185,32.1989189 L9.04781705,32.1989189 L9.04781705,97.1303119 L17.031185,97.1303119 L17.031185,104.049231 L0,104.049231 L0,25.28 L17.031185,25.28 L17.031185,32.1989189 Z M93.6716009,24.75 C90.4007675,30.8326023 88.0193713,37.1590826 86.5274123,43.7294408 C85.0354532,50.299799 84.2894737,56.9705775 84.2894737,63.7417763 C84.2894737,70.6277412 85.0211075,77.3702485 86.484375,83.9692982 C87.9476425,90.568348 90.314693,96.9952485 93.5855263,103.25 L93.5855263,103.25 L83.4287281,103.25 C79.8135965,97.3395468 77.0161732,91.1134868 75.0364583,84.5718202 C73.0567434,78.0301535 72.066886,71.3737208 72.066886,64.6025219 C72.066886,61.3890716 72.3107639,58.017818 72.7985197,54.488761 C73.2862756,50.9597039 74.0035636,47.4449927 74.9503838,43.9446272 C75.8972039,40.4442617 77.0735563,37.0586623 78.4794408,33.7878289 C79.8853253,30.5169956 81.5350877,27.504386 83.4287281,24.75 L83.4287281,24.75 Z M116.638158,24.75 C120.253289,30.6604532 123.050713,36.9152047 125.030428,43.5142544 C127.010143,50.1133041 128,56.7984284 128,63.5696272 C128,66.7830775 127.770468,70.1543311 127.311404,73.6833882 C126.852339,77.2124452 126.149397,80.7128107 125.202577,84.1844846 C124.255757,87.6561586 123.065058,91.0274123 121.630482,94.2982456 C120.195906,97.5690789 118.531798,100.552997 116.638158,103.25 L116.638158,103.25 L106.48136,103.25 C109.637427,97.1673977 111.975786,90.8696089 113.496436,84.3566338 C115.017087,77.8436586 115.777412,71.2015716 115.777412,64.4303728 C115.777412,57.5444079 115.031433,50.7732091 113.539474,44.1167763 C112.047515,37.4603436 109.723501,31.0047515 106.567434,24.75 L106.567434,24.75 Z M37.1101871,44.1061384 L37.1101871,56.702119 L49.0852391,52.799139 L51.3915454,59.8954661 L39.3277893,63.798446 L46.956341,74.1768244 L40.8357588,78.6120289 L33.2072072,68.1449464 L25.7560638,78.3459166 L19.8128898,73.8220081 L27.4414414,63.798446 L15.2889813,59.6293539 L17.5952876,52.5330268 L29.6590437,56.702119 L29.6590437,44.1061384 L37.1101871,44.1061384 Z M49.6493416,97.1303119 L57.6327096,97.1303119 L57.6327096,32.1989189 L49.6493416,32.1989189 L49.6493416,25.28 L66.6805267,25.28 L66.6805267,104.049231 L49.6493416,104.049231 L49.6493416,97.1303119 Z"></path> </svg> diff --git a/plugins/tiddlywiki/markdown/images/markdown-linkify.tid b/plugins/tiddlywiki/markdown/images/markdown-linkify.tid index 395faf8d9..7973e063a 100644 --- a/plugins/tiddlywiki/markdown/images/markdown-linkify.tid +++ b/plugins/tiddlywiki/markdown/images/markdown-linkify.tid @@ -1,6 +1,7 @@ title: $:/plugins/tiddlywiki/markdown/images/markdown-linkify tags: $:/tags/Image -<svg width="22pt" height="22pt" class="tc-markdown-linkify-button tc-image-button" viewBox="0 0 128 128"> +\parameters (size:"22pt") +<svg width=<<size>> height=<<size>> class="tc-markdown-linkify-button tc-image-button" viewBox="0 0 128 128"> <path d="M17.031185,32.1989189 L9.04781705,32.1989189 L9.04781705,97.1303119 L17.031185,97.1303119 L17.031185,104.049231 L0,104.049231 L0,25.28 L17.031185,25.28 L17.031185,32.1989189 Z M93.6716009,24.75 C90.4007675,30.8326023 88.0193713,37.1590826 86.5274123,43.7294408 C85.0354532,50.299799 84.2894737,56.9705775 84.2894737,63.7417763 C84.2894737,70.6277412 85.0211075,77.3702485 86.484375,83.9692982 C87.9476425,90.568348 90.314693,96.9952485 93.5855263,103.25 L93.5855263,103.25 L83.4287281,103.25 C79.8135965,97.3395468 77.0161732,91.1134868 75.0364583,84.5718202 C73.0567434,78.0301535 72.066886,71.3737208 72.066886,64.6025219 C72.066886,61.3890716 72.3107639,58.017818 72.7985197,54.488761 C73.2862756,50.9597039 74.0035636,47.4449927 74.9503838,43.9446272 C75.8972039,40.4442617 77.0735563,37.0586623 78.4794408,33.7878289 C79.8853253,30.5169956 81.5350877,27.504386 83.4287281,24.75 L83.4287281,24.75 Z M116.638158,24.75 C120.253289,30.6604532 123.050713,36.9152047 125.030428,43.5142544 C127.010143,50.1133041 128,56.7984284 128,63.5696272 C128,66.7830775 127.770468,70.1543311 127.311404,73.6833882 C126.852339,77.2124452 126.149397,80.7128107 125.202577,84.1844846 C124.255757,87.6561586 123.065058,91.0274123 121.630482,94.2982456 C120.195906,97.5690789 118.531798,100.552997 116.638158,103.25 L116.638158,103.25 L106.48136,103.25 C109.637427,97.1673977 111.975786,90.8696089 113.496436,84.3566338 C115.017087,77.8436586 115.777412,71.2015716 115.777412,64.4303728 C115.777412,57.5444079 115.031433,50.7732091 113.539474,44.1167763 C112.047515,37.4603436 109.723501,31.0047515 106.567434,24.75 L106.567434,24.75 Z M37.1101871,44.1061384 L37.1101871,56.702119 L49.0852391,52.799139 L51.3915454,59.8954661 L39.3277893,63.798446 L46.956341,74.1768244 L40.8357588,78.6120289 L33.2072072,68.1449464 L25.7560638,78.3459166 L19.8128898,73.8220081 L27.4414414,63.798446 L15.2889813,59.6293539 L17.5952876,52.5330268 L29.6590437,56.702119 L29.6590437,44.1061384 L37.1101871,44.1061384 Z M49.6493416,97.1303119 L57.6327096,97.1303119 L57.6327096,32.1989189 L49.6493416,32.1989189 L49.6493416,25.28 L66.6805267,25.28 L66.6805267,104.049231 L49.6493416,104.049231 L49.6493416,97.1303119 Z"></path> </svg> diff --git a/plugins/tiddlywiki/tiddlyweb/save-offline.tid b/plugins/tiddlywiki/tiddlyweb/save-offline.tid index 798072833..591a1e438 100644 --- a/plugins/tiddlywiki/tiddlyweb/save-offline.tid +++ b/plugins/tiddlywiki/tiddlyweb/save-offline.tid @@ -1,6 +1,6 @@ title: $:/plugins/tiddlywiki/tiddlyweb/save/offline -\import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]] +\import [subfilter{$:/core/config/GlobalImportFilter}] \define saveTiddlerFilter() [is[tiddler]] -[[$:/boot/boot.css]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[prefix[$:/temp/]] +[sort[title]] $(publishFilter)$ \end diff --git a/plugins/tiddlywiki/upgrade/Import.multids b/plugins/tiddlywiki/upgrade/Import.multids new file mode 100644 index 000000000..9d141a6b4 --- /dev/null +++ b/plugins/tiddlywiki/upgrade/Import.multids @@ -0,0 +1,3 @@ +title: $:/language/Import/ + +Upgrader/Plugins/Suppressed/Version: Your plugin will be upgraded from <<incoming>> to <<existing>>. diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index 1ba6a89b2..a8df11bb3 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -1388,6 +1388,11 @@ html body.tc-body.tc-single-tiddler-window { height: 1.2em; } +.tc-editor-toolbar .tc-drop-down a, +.tc-editor-toolbar .tc-drop-down button { + padding: 0; +} + .tc-editor-toolbar button:hover { background-color: <<colour tiddler-controls-foreground-selected>>; fill: <<colour background>>; @@ -3118,6 +3123,30 @@ select { background: <<colour select-tag-background>>; } +/* +** Translink macro +*/ + +.tc-translink { + background-color: <<colour pre-background>>; + border: 1px solid <<colour pre-border>>; + padding: 0 3px; + border-radius: 3px; +} + +div.tc-translink > div { + margin: 1em; +} + +div.tc-translink > div > a:first-child > h1 { + font-size: 1.2em; + font-weight: bold; +} + +span.tc-translink > a:first-child { + font-weight: bold; +} + /* ** Classes for displaying globals */ @@ -3238,4 +3267,4 @@ select { .tc-tiny-v-gap-bottom { margin-bottom: 3px; -} \ No newline at end of file +}