1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2026-02-23 10:29:51 +00:00

Compare commits

...

16 Commits

Author SHA1 Message Date
saqimtiaz
d5e7dfeaff fix: missing attributes must be undefined 2026-02-22 22:10:38 +01:00
Saq Imtiaz
36b20e02a3 ci: update to v7 cerebrus 2026-02-22 17:43:47 +01:00
Saq Imtiaz
ab6172981c Update cerebrus action to version 7 2026-02-22 17:40:41 +01:00
lin onetwo
431b7fa3bf Update ImportListing.tid (#9674) 2026-02-21 17:37:37 +00:00
Jeremy Ruston
1c1f157079 More release note tweaks 2026-02-20 21:26:44 +00:00
Jeremy Ruston
ac19f300a9 Fix changenote 2026-02-20 12:05:51 +00:00
Jeremy Ruston
9012b00806 Search changenotes and impact notes (#9670)
* Tweak some changenotes

* Tweak release note tabs

* Simplify summary tab

* Remove #8702 changes/impacts

* Search change notes and impacts

* Fix release note category search

* Tweak headline changenotes
2026-02-20 12:02:14 +00:00
Jeremy Ruston
07634d6595 Merge branch 'tiddlywiki-com' 2026-02-20 09:28:07 +00:00
Saq Imtiaz
785086e0a5 Fixes ESLint errors (#9668)
* fix: apply automatic eslint fixes

* lint: allow hashbang comment for tiddlywiki.js

* lint: first back of manual lint fixes for unused vars

* lint: added more fixes for unused vars

* lint: missed files

* lint: updated eslint config with selected rules from #9669
2026-02-20 08:38:42 +00:00
Saq Imtiaz
08f2b8bdf4 Fixes variable enumeration in widgets (#9648)
* fix: variable enumeration in widgets

* fix: fakeWidget should have a variables property

* fix: don't use spread properties

* fix: resolve more embarassing bugs

* chore: tests and whitespace

* fix: simplify opts check
2026-02-19 11:14:19 +00:00
Jeremy Ruston
c305eb01eb Fix passing a filtered attribute as a MVV (#9663) 2026-02-19 12:11:39 +01:00
Jeremy Ruston
71462143bf Fix BackgroundActions example 2026-02-16 18:16:45 +00:00
IchijikuIchigo
8cd6bbc075 [ja_JP] Japanese translation update - 'Community' section of tiddlywiki.com (#9662)
* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 381388f, 4dc89f6, 5fa1098

* [ja_JP] Japanese translation update from commit: 3c1d658

* [ja_JP] Japanese translation update from commit: 3c1d658

* [ja_JP] Japanese translation update from commit: 29a567f, 6aee5eb

* [ja_JP] Japanese translation update from commit: 0ac2b6c

* [ja_JP] Japanese translation update from commit: 1994574

* [ja_JP] Japanese translation update from commit: 5dfdbc8

* [ja_JP] Japanese translation update from commit: 1994574

* [ja_JP] Japanese translation update from commit: 81d8d67

* [ja_JP] Japanese translation update from commit: 81d8d67

* [ja_JP] Japanese translation update from commit: 4196d96

* [ja_JP] Japanese translation update from commit: 1994574

* [ja_JP] Japanese translation update from commit: 1994574

* [ja-JP] Japanese translation of 'community\project\TiddlyWiki Project.tid'

* [ja-JP] Japanese translation of 'community\docs\Community Cards Caveats.tid'

* [ja-JP] Japanese translation of 'community\project\TiddlyWiki People.tid'

* [ja-JP] Japanese translation of 'community\project\Vacant Positions.tid'

* [ja-JP] Japanese translation of 'community\docs\Community Cards.tid'

* [ja-JP] Japanese translation of 'community\docs\Displaying Community Cards.tid'

* [ja-JP] Japanese translation of 'community\docs\Submitting a Community Card.tid'

* [ja-JP] Japanese translation of 'community\tools\cards\Procedures.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Resources.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Resources.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Community Links Aggregator.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\TiddlyWiki Newsletter.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\marketplace\TiddlyWiki Marketplace.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\hellothere\HelloThumbnail.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Improving TiddlyWiki Documentation.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\Translate TiddlyWiki into your language.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\TiddlyWiki_European_Meetup_2016.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\TiddlyWiki_European_Meetup_2017.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\Tidme by oflg.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\_Cardo-A Task and Project Management Wiki_ by David_Szego.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\Drift by Tony K.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\editions\Stroll by David Gifford.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\plugins\GSD5.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\plugins\TiddlyWiki for Scholars.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\_TiddlyStudy_ by Kebi.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\resources\Wikilabs by PMario.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\resources\Projectify by Nicolas Petton.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\plugins\TW5-Graph by Flibbles.tid'

* [ja-JP] Japanese translation has been modified to display the ja-title.

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_A free, open source wiki revisited_ by Mark Gibbs, NetworkWorld.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_Notizen mit TiddlyWiki systemubergreifend nutzen_ by Michael Sonntag.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_Setting Up a Personal TiddlyWiki Server on OS X_ by Kris Johnson.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_TiddlyWiki 5 im Betatest_ by besim.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\articles\_TiddlyWiki_ by Sander de Boer.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\community\resources\TiddlyWiki Posts.tid'

* [ja-JP] A little correction to the Japanese translation
2026-02-15 11:56:40 +01:00
Mario Pietsch
6fc65c1560 [DOCS] Slightly Improve "How to create keyboard shortcuts" Readability (#9478) 2026-02-05 17:01:40 +01:00
Mario Pietsch
ab29f17d35 [DOCS] Add Repo-link to "Installing official plugins on Node.js" (#9483)
* [DOCS] Add Repo-link to "Installing official plugins on Node.js"

* Update Installing official plugins on Node.js.tid
2026-02-04 21:26:48 +01:00
IchijikuIchigo
5ae4770317 [ja_JP] Update of Japanese translations (#9581)
* [ja_JP] Japanese translation update from commit: 5ff4e02

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\hire-jeremy\Hire Jeremy Sidebar Segment.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\hire-jeremy\Hire Jeremy Sidebar Segment.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\hire-jeremy\HireJeremy.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\hellothere\thumbnails\HelloThumbnail - Community Survey.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\hellothere\thumbnails\HelloThumbnail - TW5-Graph.tid'

* [ja_JP] Japanese translation update from commit: e3af967

* [ja_JP] Japanese translation update from commit: bdc0fe1

* [ja_JP] Japanese translation update from commit: e3af967

* [ja_JP] Japanese translation update from commit: bdc0fe1, e3af967

* [ja_JP] Japanese translation update from commit: fdafdba, e3af967, ecba671, 935e89b

* [ja_JP] Japanese translation update from commit: bdc0fe1, e3af967

* [ja_JP] Japanese translation update from commit: 0763ee5

* [ja_JP] Japanese translation update from commit: bdc0fe1

* [ja_JP] Japanese translation update from commit: b0d950f, 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: b0d950f, 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: 4dc89f6

* [ja_JP] Japanese translation update from commit: b0d950f

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\Commands.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\BuildCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\ClearPasswordCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\CommandsCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\DeleteTiddlersCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\EditionsCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\FetchCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\HelpCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\ImportCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\InitCommand.tid'

* [ja-JP] Japanese translation of 'editions\ja-JP\tiddlers\commands\ListenCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\LoadCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\MakeLibraryCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\OutputCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\PasswordCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\RenderCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\SaveCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\SaveWikiFolderCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\SetFieldCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\UnpackPluginCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\VerboseCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\VersionCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\RenderTiddlerCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\RenderTiddlersCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\SaveTiddlerCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\SaveTiddlersCommand.tid'

* [ja-JP] Japanese translation of 'editions\tw5.com\tiddlers\commands\ServerCommand.tid'
2026-02-04 21:24:55 +01:00
397 changed files with 5396 additions and 4306 deletions

View File

@@ -20,7 +20,7 @@ jobs:
steps: steps:
- name: build-size-check - name: build-size-check
id: get_sizes id: get_sizes
uses: TiddlyWiki/cerebrus@v6 uses: TiddlyWiki/cerebrus@v7
with: with:
pr_number: ${{ github.event.pull_request.number }} pr_number: ${{ github.event.pull_request.number }}
repo: ${{ github.repository }} repo: ${{ github.repository }}

View File

@@ -25,7 +25,7 @@ jobs:
steps: steps:
- name: Build and check size - name: Build and check size
uses: TiddlyWiki/cerebrus@v6 uses: TiddlyWiki/cerebrus@v7
with: with:
pr_number: ${{ inputs.pr_number }} pr_number: ${{ inputs.pr_number }}
repo: ${{ github.repository }} repo: ${{ github.repository }}

View File

@@ -26,7 +26,7 @@ jobs:
# Step 2: Validate change notes # Step 2: Validate change notes
- name: Validate Change Notes - name: Validate Change Notes
uses: TiddlyWiki/cerebrus@v6 uses: TiddlyWiki/cerebrus@v7
with: with:
pr_number: ${{ github.event.pull_request.number }} pr_number: ${{ github.event.pull_request.number }}
repo: ${{ github.repository }} repo: ${{ github.repository }}

View File

@@ -15,40 +15,40 @@ var fs = require("fs"),
{ optimize } = require("svgo"), { optimize } = require("svgo"),
config = { config = {
plugins: [ plugins: [
'cleanupAttrs', "cleanupAttrs",
'removeDoctype', "removeDoctype",
'removeXMLProcInst', "removeXMLProcInst",
'removeComments', "removeComments",
'removeMetadata', "removeMetadata",
'removeTitle', "removeTitle",
'removeDesc', "removeDesc",
'removeUselessDefs', "removeUselessDefs",
'removeEditorsNSData', "removeEditorsNSData",
'removeEmptyAttrs', "removeEmptyAttrs",
'removeHiddenElems', "removeHiddenElems",
'removeEmptyText', "removeEmptyText",
'removeEmptyContainers', "removeEmptyContainers",
// 'removeViewBox', // 'removeViewBox',
'cleanupEnableBackground', "cleanupEnableBackground",
'convertStyleToAttrs', "convertStyleToAttrs",
'convertColors', "convertColors",
'convertPathData', "convertPathData",
'convertTransform', "convertTransform",
'removeUnknownsAndDefaults', "removeUnknownsAndDefaults",
'removeNonInheritableGroupAttrs', "removeNonInheritableGroupAttrs",
'removeUselessStrokeAndFill', "removeUselessStrokeAndFill",
'removeUnusedNS', "removeUnusedNS",
'cleanupIDs', "cleanupIDs",
'cleanupNumericValues', "cleanupNumericValues",
'moveElemsAttrsToGroup', "moveElemsAttrsToGroup",
'moveGroupAttrsToElems', "moveGroupAttrsToElems",
'collapseGroups', "collapseGroups",
// 'removeRasterImages', // 'removeRasterImages',
'mergePaths', "mergePaths",
'convertShapeToPath', "convertShapeToPath",
'sortAttrs', "sortAttrs",
//'removeDimensions', //'removeDimensions',
{name: 'removeAttrs', params: { attrs: '(stroke|fill)' } } {name: "removeAttrs", params: { attrs: "(stroke|fill)" } }
] ]
}; };
@@ -72,7 +72,7 @@ files.forEach(function(filename) {
var newSVG = header.join("\n") + "\n\n" + result.data.replace("&lt;&lt;now &quot;DD&quot;&gt;&gt;","<<now \"DD\">>"); var newSVG = header.join("\n") + "\n\n" + result.data.replace("&lt;&lt;now &quot;DD&quot;&gt;&gt;","<<now \"DD\">>");
fs.writeFileSync(filepath,newSVG); fs.writeFileSync(filepath,newSVG);
} else { } else {
console.log("Error " + err + " with " + filename) console.log("Error " + err + " with " + filename);
process.exit(); process.exit();
}; };
} }

View File

@@ -12,8 +12,6 @@ On the server this file is executed directly to boot TiddlyWiki. In the browser,
var _boot = (function($tw) { var _boot = (function($tw) {
/*jslint node: true, browser: true */
/*global modules: false, $tw: false */
"use strict"; "use strict";
// Include bootprefix if we're not given module data // Include bootprefix if we're not given module data
@@ -37,7 +35,7 @@ if($tw.node) {
$tw.boot.log = function(str) { $tw.boot.log = function(str) {
$tw.boot.logMessages = $tw.boot.logMessages || []; $tw.boot.logMessages = $tw.boot.logMessages || [];
$tw.boot.logMessages.push(str); $tw.boot.logMessages.push(str);
} };
/* /*
Check if an object has a property Check if an object has a property
@@ -47,7 +45,7 @@ $tw.utils.hop = function(object,property) {
}; };
/** @deprecated Use Array.isArray instead */ /** @deprecated Use Array.isArray instead */
$tw.utils.isArray = value => Array.isArray(value); $tw.utils.isArray = (value) => Array.isArray(value);
/* /*
Check if an array is equal by value and by reference. Check if an array is equal by value and by reference.
@@ -127,7 +125,7 @@ $tw.utils.pushTop = function(array,value) {
}; };
/** @deprecated Use instanceof Date instead */ /** @deprecated Use instanceof Date instead */
$tw.utils.isDate = value => value instanceof Date; $tw.utils.isDate = (value) => value instanceof Date;
/** @deprecated Use array iterative methods instead */ /** @deprecated Use array iterative methods instead */
$tw.utils.each = function(object,callback) { $tw.utils.each = function(object,callback) {
@@ -138,7 +136,7 @@ $tw.utils.each = function(object,callback) {
return next !== false; return next !== false;
}); });
} else { } else {
Object.entries(object).every(entry => { Object.entries(object).every((entry) => {
const next = callback(entry[1], entry[0], object); const next = callback(entry[1], entry[0], object);
return next !== false; return next !== false;
}); });
@@ -565,7 +563,7 @@ using a lowercase extension only.
*/ */
$tw.utils.getFileExtensionInfo = function(ext) { $tw.utils.getFileExtensionInfo = function(ext) {
return ext ? $tw.config.fileExtensionInfo[ext.toLowerCase()] : null; return ext ? $tw.config.fileExtensionInfo[ext.toLowerCase()] : null;
} };
/* /*
Given an extension, get the correct encoding for that file. Given an extension, get the correct encoding for that file.
@@ -588,7 +586,7 @@ var globalCheck =[
" delete Object.prototype.__temp__;", " delete Object.prototype.__temp__;",
" }", " }",
" delete Object.prototype.__temp__;", " delete Object.prototype.__temp__;",
].join('\n'); ].join("\n");
/* /*
Run code globally with specified context variables in scope Run code globally with specified context variables in scope
@@ -616,7 +614,7 @@ $tw.utils.evalGlobal = function(code,context,filename,sandbox,allowGlobals) {
fn = Function("return " + code + "\n\n//# sourceURL=" + filename)(); // See https://github.com/TiddlyWiki/TiddlyWiki5/issues/6839 fn = Function("return " + code + "\n\n//# sourceURL=" + filename)(); // See https://github.com/TiddlyWiki/TiddlyWiki5/issues/6839
} else { } else {
if(sandbox){ if(sandbox){
fn = vm.runInContext(code,sandbox,filename) fn = vm.runInContext(code,sandbox,filename);
} else { } else {
fn = vm.runInThisContext(code,filename); fn = vm.runInThisContext(code,filename);
} }
@@ -727,7 +725,7 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
var self = this; var self = this;
form.addEventListener("submit",function(event) { form.addEventListener("submit",function(event) {
// Collect the form data // Collect the form data
var data = {},t; var data = {};
$tw.utils.each(form.elements,function(element) { $tw.utils.each(form.elements,function(element) {
if(element.name && element.value) { if(element.name && element.value) {
data[element.name] = element.value; data[element.name] = element.value;
@@ -773,7 +771,7 @@ $tw.utils.PasswordPrompt.prototype.removePrompt = function(promptInfo) {
promptInfo.form.parentNode.removeChild(promptInfo.form); promptInfo.form.parentNode.removeChild(promptInfo.form);
this.setWrapperDisplay(); this.setWrapperDisplay();
} }
} };
/* /*
Crypto helper object for encrypted content. It maintains the password text in a closure, and provides methods to change Crypto helper object for encrypted content. It maintains the password text in a closure, and provides methods to change
@@ -812,7 +810,7 @@ $tw.utils.Crypto = function() {
}; };
this.hasPassword = function() { this.hasPassword = function() {
return !!currentPassword; return !!currentPassword;
} };
this.encrypt = function(text,password) { this.encrypt = function(text,password) {
// set default ks:256 -- see: http://bitwiseshiftleft.github.io/sjcl/doc/convenience.js.html // set default ks:256 -- see: http://bitwiseshiftleft.github.io/sjcl/doc/convenience.js.html
return callSjcl("encrypt",text,password,{v:1,iter:10000,ks:256,ts:64,mode:"ccm",adata:"",cipher:"aes"}); return callSjcl("encrypt",text,password,{v:1,iter:10000,ks:256,ts:64,mode:"ccm",adata:"",cipher:"aes"});
@@ -830,7 +828,7 @@ Execute the module named 'moduleName'. The name can optionally be relative to th
$tw.modules.execute = function(moduleName,moduleRoot) { $tw.modules.execute = function(moduleName,moduleRoot) {
var name = moduleName; var name = moduleName;
if(moduleName.charAt(0) === ".") { if(moduleName.charAt(0) === ".") {
name = $tw.utils.resolvePath(moduleName,moduleRoot) name = $tw.utils.resolvePath(moduleName,moduleRoot);
} }
if(!$tw.modules.titles[name]) { if(!$tw.modules.titles[name]) {
if($tw.modules.titles[name + ".js"]) { if($tw.modules.titles[name + ".js"]) {
@@ -891,7 +889,6 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
if(!moduleInfo) { if(!moduleInfo) {
// We could not find the module on this path // We could not find the module on this path
// Try to defer to browserify etc, or node // Try to defer to browserify etc, or node
var deferredModule;
if($tw.browser) { if($tw.browser) {
if(window.require) { if(window.require) {
try { try {
@@ -1146,8 +1143,7 @@ enableIndexers - Array of indexer names to enable, or null to use all available
*/ */
$tw.Wiki = function(options) { $tw.Wiki = function(options) {
options = options || {}; options = options || {};
var self = this, var tiddlers = Object.create(null), // Hashmap of tiddlers
tiddlers = Object.create(null), // Hashmap of tiddlers
tiddlerTitles = null, // Array of tiddler titles tiddlerTitles = null, // Array of tiddler titles
getTiddlerTitles = function() { getTiddlerTitles = function() {
if(!tiddlerTitles) { if(!tiddlerTitles) {
@@ -1201,7 +1197,7 @@ $tw.Wiki = function(options) {
shadow: this.isShadowTiddler(title), shadow: this.isShadowTiddler(title),
exists: this.tiddlerExists(title) exists: this.tiddlerExists(title)
} }
} };
// Save the new tiddler // Save the new tiddler
tiddlers[title] = tiddler; tiddlers[title] = tiddler;
// Check we've got the title // Check we've got the title
@@ -1211,7 +1207,7 @@ $tw.Wiki = function(options) {
tiddler: tiddler, tiddler: tiddler,
shadow: this.isShadowTiddler(title), shadow: this.isShadowTiddler(title),
exists: this.tiddlerExists(title) exists: this.tiddlerExists(title)
} };
// Update indexes // Update indexes
this.clearCache(title); this.clearCache(title);
this.clearGlobalCache(); this.clearGlobalCache();
@@ -1236,7 +1232,7 @@ $tw.Wiki = function(options) {
shadow: this.isShadowTiddler(title), shadow: this.isShadowTiddler(title),
exists: this.tiddlerExists(title) exists: this.tiddlerExists(title)
} }
} };
// Delete the tiddler // Delete the tiddler
delete tiddlers[title]; delete tiddlers[title];
// Delete it from the list of titles // Delete it from the list of titles
@@ -1251,7 +1247,7 @@ $tw.Wiki = function(options) {
tiddler: this.getTiddler(title), tiddler: this.getTiddler(title),
shadow: this.isShadowTiddler(title), shadow: this.isShadowTiddler(title),
exists: this.tiddlerExists(title) exists: this.tiddlerExists(title)
} };
// Update indexes // Update indexes
this.clearCache(title); this.clearCache(title);
this.clearGlobalCache(); this.clearGlobalCache();
@@ -1439,8 +1435,7 @@ $tw.Wiki = function(options) {
// Unregister the plugin tiddlers of a particular type, or null/undefined for any type, optionally restricting unregistering to an array of tiddler titles. Returns an array of the titles affected // Unregister the plugin tiddlers of a particular type, or null/undefined for any type, optionally restricting unregistering to an array of tiddler titles. Returns an array of the titles affected
this.unregisterPluginTiddlers = function(pluginType,titles) { this.unregisterPluginTiddlers = function(pluginType,titles) {
var self = this, var unregisteredTitles = [];
unregisteredTitles = [];
// Remove any previous registered plugins of this type // Remove any previous registered plugins of this type
for(var t=pluginTiddlers.length-1; t>=0; t--) { for(var t=pluginTiddlers.length-1; t>=0; t--) {
var tiddler = pluginTiddlers[t]; var tiddler = pluginTiddlers[t];
@@ -1454,16 +1449,15 @@ $tw.Wiki = function(options) {
// Unpack the currently registered plugins, creating shadow tiddlers for their constituent tiddlers // Unpack the currently registered plugins, creating shadow tiddlers for their constituent tiddlers
this.unpackPluginTiddlers = function() { this.unpackPluginTiddlers = function() {
var self = this;
// Sort the plugin titles by the `plugin-priority` field, if this field is missing, default to 1 // Sort the plugin titles by the `plugin-priority` field, if this field is missing, default to 1
pluginTiddlers.sort(function(a, b) { pluginTiddlers.sort(function(a, b) {
var priorityA = "plugin-priority" in a.fields ? a.fields["plugin-priority"] : 1; var priorityA = "plugin-priority" in a.fields ? a.fields["plugin-priority"] : 1;
var priorityB = "plugin-priority" in b.fields ? b.fields["plugin-priority"] : 1; var priorityB = "plugin-priority" in b.fields ? b.fields["plugin-priority"] : 1;
if (priorityA !== priorityB) { if(priorityA !== priorityB) {
return priorityA - priorityB; return priorityA - priorityB;
} else if (a.fields.title < b.fields.title) { } else if(a.fields.title < b.fields.title) {
return -1; return -1;
} else if (a.fields.title === b.fields.title) { } else if(a.fields.title === b.fields.title) {
return 0; return 0;
} else { } else {
return +1; return +1;
@@ -1570,7 +1564,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
// Assemble a report tiddler // Assemble a report tiddler
var titleReportTiddler = "TiddlyWiki Safe Mode", var titleReportTiddler = "TiddlyWiki Safe Mode",
report = []; report = [];
report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:") report.push("TiddlyWiki has been started in [[safe mode|https://tiddlywiki.com/static/SafeMode.html]]. All plugins are temporarily disabled. Most customisations have been disabled by renaming the following tiddlers:");
// Delete the overrides // Delete the overrides
overrides.forEach(function(title) { overrides.forEach(function(title) {
var tiddler = self.getTiddler(title), var tiddler = self.getTiddler(title),
@@ -1579,7 +1573,7 @@ $tw.Wiki.prototype.processSafeMode = function() {
self.addTiddler(new $tw.Tiddler(tiddler, {title: newTitle})); self.addTiddler(new $tw.Tiddler(tiddler, {title: newTitle}));
report.push("* [[" + title + "|" + newTitle + "]]"); report.push("* [[" + title + "|" + newTitle + "]]");
}); });
report.push() report.push();
this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")})); this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")}));
// Set $:/DefaultTiddlers to point to our report // Set $:/DefaultTiddlers to point to our report
this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"})); this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"}));
@@ -2013,7 +2007,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1)); value = $tw.utils.stringifyList(path.relative(rootPath, filename).split(path.sep).slice(0, -1));
break; break;
case "filepath": case "filepath":
value = path.relative(rootPath, filename).split(path.sep).join('/'); value = path.relative(rootPath, filename).split(path.sep).join("/");
break; break;
case "filename": case "filename":
value = path.basename(filename); value = path.basename(filename);
@@ -2066,7 +2060,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
} }
}); });
return arrayOfFiles; return arrayOfFiles;
} };
// Process the listed tiddlers // Process the listed tiddlers
$tw.utils.each(filesInfo.tiddlers,function(tidInfo) { $tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
if(tidInfo.prefix && tidInfo.suffix) { if(tidInfo.prefix && tidInfo.suffix) {
@@ -2175,7 +2169,7 @@ Returns the path of the plugin folder
$tw.findLibraryItem = function(name,paths) { $tw.findLibraryItem = function(name,paths) {
var pathIndex = 0; var pathIndex = 0;
do { do {
var pluginPath = path.resolve(paths[pathIndex],"./" + name) var pluginPath = path.resolve(paths[pathIndex],"./" + name);
if(fs.existsSync(pluginPath) && fs.statSync(pluginPath).isDirectory()) { if(fs.existsSync(pluginPath) && fs.statSync(pluginPath).isDirectory()) {
return pluginPath; return pluginPath;
} }
@@ -2534,7 +2528,7 @@ $tw.boot.initStartup = function(options) {
} }
}); });
return result; return result;
} };
} }
}; };
$tw.boot.loadStartup = function(options){ $tw.boot.loadStartup = function(options){
@@ -2551,7 +2545,7 @@ $tw.boot.loadStartup = function(options){
} }
// Give hooks a chance to modify the store // Give hooks a chance to modify the store
$tw.hooks.invokeHook("th-boot-tiddlers-loaded"); $tw.hooks.invokeHook("th-boot-tiddlers-loaded");
} };
$tw.boot.execStartup = function(options){ $tw.boot.execStartup = function(options){
// Unpack plugin tiddlers // Unpack plugin tiddlers
$tw.wiki.readPluginInfo(); $tw.wiki.readPluginInfo();
@@ -2581,7 +2575,7 @@ $tw.boot.execStartup = function(options){
$tw.boot.disabledStartupModules = $tw.boot.disabledStartupModules || []; $tw.boot.disabledStartupModules = $tw.boot.disabledStartupModules || [];
// Repeatedly execute the next eligible task // Repeatedly execute the next eligible task
$tw.boot.executeNextStartupTask(options.callback); $tw.boot.executeNextStartupTask(options.callback);
} };
/* /*
Startup TiddlyWiki Startup TiddlyWiki
*/ */
@@ -2600,7 +2594,7 @@ $tw.addUnloadTask = function(task) {
if($tw.unloadTasks.indexOf(task) === -1) { if($tw.unloadTasks.indexOf(task) === -1) {
$tw.unloadTasks.push(task); $tw.unloadTasks.push(task);
} }
} };
/* /*
Execute the remaining eligible startup tasks Execute the remaining eligible startup tasks
@@ -2647,7 +2641,7 @@ $tw.boot.executeNextStartupTask = function(callback) {
} }
taskIndex++; taskIndex++;
} }
if(typeof callback === 'function') { if(typeof callback === "function") {
callback(); callback();
} }
return false; return false;

View File

@@ -103,7 +103,7 @@ Commander.prototype.executeNextCommand = function() {
c = new command.Command(params,this); c = new command.Command(params,this);
err = c.execute(); err = c.execute();
if(err && typeof err.then === "function") { if(err && typeof err.then === "function") {
err.then(e => { e ? this.callback(e) : this.executeNextCommand(); }); err.then((e) => { e ? this.callback(e) : this.executeNextCommand(); });
} else if(err) { } else if(err) {
this.callback(err); this.callback(err);
} else { } else {
@@ -120,7 +120,7 @@ Commander.prototype.executeNextCommand = function() {
}); });
err = c.execute(); err = c.execute();
if(err && typeof err.then === "function") { if(err && typeof err.then === "function") {
err.then(e => { if(e) this.callback(e); }); err.then((e) => { if(e) this.callback(e); });
} else if(err) { } else if(err) {
this.callback(err); this.callback(err);
} }

View File

@@ -25,7 +25,7 @@ Command.prototype.execute = function() {
if(!filter) { if(!filter) {
return "No filter specified"; return "No filter specified";
} }
var commands = this.commander.wiki.filterTiddlers(filter) var commands = this.commander.wiki.filterTiddlers(filter);
if(commands.length === 0) { if(commands.length === 0) {
return "No tiddlers found for filter '" + filter + "'"; return "No tiddlers found for filter '" + filter + "'";
} }

View File

@@ -24,8 +24,7 @@ Command.prototype.execute = function() {
if(this.params.length < 1) { if(this.params.length < 1) {
return "Missing filter"; return "Missing filter";
} }
var self = this, var wiki = this.commander.wiki,
wiki = this.commander.wiki,
filter = this.params[0], filter = this.params[0],
tiddlers = wiki.filterTiddlers(filter); tiddlers = wiki.filterTiddlers(filter);
$tw.utils.each(tiddlers,function(title) { $tw.utils.each(tiddlers,function(title) {

View File

@@ -66,7 +66,7 @@ Command.prototype.fetchFiles = function(options) {
// Get the list of URLs // Get the list of URLs
var urls; var urls;
if(options.url) { if(options.url) {
urls = [options.url] urls = [options.url];
} else if(options.urlFilter) { } else if(options.urlFilter) {
urls = this.commander.wiki.filterTiddlers(options.urlFilter); urls = this.commander.wiki.filterTiddlers(options.urlFilter);
} else { } else {
@@ -96,30 +96,30 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
var self = this, var self = this,
lib = url.substr(0,8) === "https://" ? require("https") : require("http"); lib = url.substr(0,8) === "https://" ? require("https") : require("http");
lib.get(url).on("response",function(response) { lib.get(url).on("response",function(response) {
var type = (response.headers["content-type"] || "").split(";")[0], var type = (response.headers["content-type"] || "").split(";")[0],
data = []; data = [];
self.commander.write("Reading " + url + ": "); self.commander.write("Reading " + url + ": ");
response.on("data",function(chunk) { response.on("data",function(chunk) {
data.push(chunk); data.push(chunk);
self.commander.write("."); self.commander.write(".");
}); });
response.on("end",function() { response.on("end",function() {
self.commander.write("\n"); self.commander.write("\n");
if(response.statusCode === 200) { if(response.statusCode === 200) {
self.processBody(Buffer.concat(data),type,options,url); self.processBody(Buffer.concat(data),type,options,url);
callback(null); callback(null);
} else { } else {
if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) { if(response.statusCode === 302 || response.statusCode === 303 || response.statusCode === 307) {
return self.fetchFile(response.headers.location,options,callback,redirectCount + 1); return self.fetchFile(response.headers.location,options,callback,redirectCount + 1);
} else { } else {
return callback("Error " + response.statusCode + " retrieving " + url) return callback("Error " + response.statusCode + " retrieving " + url);
} }
} }
}); });
response.on("error",function(e) { response.on("error",function(e) {
console.log("Error on GET request: " + e); console.log("Error on GET request: " + e);
callback(e); callback(e);
}); });
}); });
return null; return null;
}; };
@@ -153,18 +153,18 @@ Command.prototype.processBody = function(body,type,options,url) {
if(options.transformFilter) { if(options.transformFilter) {
var transformedTitle = (incomingWiki.filterTiddlers(options.transformFilter,null,self.commander.wiki.makeTiddlerIterator([title])) || [""])[0]; var transformedTitle = (incomingWiki.filterTiddlers(options.transformFilter,null,self.commander.wiki.makeTiddlerIterator([title])) || [""])[0];
if(transformedTitle) { if(transformedTitle) {
self.commander.log("Importing " + title + " as " + transformedTitle) self.commander.log("Importing " + title + " as " + transformedTitle);
newTiddler = new $tw.Tiddler(tiddler,{title: transformedTitle}); newTiddler = new $tw.Tiddler(tiddler,{title: transformedTitle});
} }
} else { } else {
self.commander.log("Importing " + title) self.commander.log("Importing " + title);
newTiddler = tiddler; newTiddler = tiddler;
} }
self.commander.wiki.importTiddler(newTiddler); self.commander.wiki.importTiddler(newTiddler);
count++; count++;
} }
}); });
self.commander.log("Imported " + count + " tiddlers") self.commander.log("Imported " + count + " tiddlers");
}; };
exports.Command = Command; exports.Command = Command;

View File

@@ -22,8 +22,7 @@ var Command = function(params,commander,callback) {
Command.prototype.execute = function() { Command.prototype.execute = function() {
var self = this, var self = this,
fs = require("fs"), fs = require("fs");
path = require("path");
if(this.params.length < 2) { if(this.params.length < 2) {
return "Missing parameters"; return "Missing parameters";
} }

View File

@@ -20,8 +20,7 @@ var Command = function(params,commander) {
}; };
Command.prototype.execute = function() { Command.prototype.execute = function() {
var fs = require("fs"), var fs = require("fs");
path = require("path");
// Check that we don't already have a valid wiki folder // Check that we don't already have a valid wiki folder
if($tw.boot.wikiTiddlersPath || ($tw.utils.isDirectory($tw.boot.wikiPath) && !$tw.utils.isDirectoryEmpty($tw.boot.wikiPath))) { if($tw.boot.wikiTiddlersPath || ($tw.utils.isDirectory($tw.boot.wikiPath) && !$tw.utils.isDirectoryEmpty($tw.boot.wikiPath))) {
return "Wiki folder is not empty"; return "Wiki folder is not empty";

View File

@@ -19,7 +19,6 @@ exports.info = {
}; };
var Command = function(params,commander,callback) { var Command = function(params,commander,callback) {
var self = this;
this.params = params; this.params = params;
this.commander = commander; this.commander = commander;
this.callback = callback; this.callback = callback;

View File

@@ -21,9 +21,7 @@ var Command = function(params,commander,callback) {
}; };
Command.prototype.execute = function() { Command.prototype.execute = function() {
var self = this, var self = this;
fs = require("fs"),
path = require("path");
if(this.params.length < 1) { if(this.params.length < 1) {
return "Missing filename"; return "Missing filename";
} }

View File

@@ -21,8 +21,7 @@ var Command = function(params,commander,callback) {
}; };
Command.prototype.execute = function() { Command.prototype.execute = function() {
var fs = require("fs"), var path = require("path");
path = require("path");
if(this.params.length < 1) { if(this.params.length < 1) {
return "Missing output path"; return "Missing output path";
} }

View File

@@ -7,59 +7,57 @@ Render individual tiddlers and save the results to the specified files
\*/ \*/
"use strict"; "use strict";
var widget = require("$:/core/modules/widgets/widget.js"); exports.info = {
name: "render",
synchronous: true
};
exports.info = { var Command = function(params,commander,callback) {
name: "render", this.params = params;
synchronous: true this.commander = commander;
}; this.callback = callback;
};
var Command = function(params,commander,callback) { Command.prototype.execute = function() {
this.params = params; if(this.params.length < 1) {
this.commander = commander; return "Missing tiddler filter";
this.callback = callback; }
}; var self = this,
fs = require("fs"),
Command.prototype.execute = function() { path = require("path"),
if(this.params.length < 1) { wiki = this.commander.wiki,
return "Missing tiddler filter"; tiddlerFilter = this.params[0],
filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
type = this.params[2] || "text/html",
template = this.params[3],
variableList = this.params.slice(4),
tiddlers = wiki.filterTiddlers(tiddlerFilter),
variables = Object.create(null);
while(variableList.length >= 2) {
variables[variableList[0]] = variableList[1];
variableList = variableList.slice(2);
}
$tw.utils.each(tiddlers,function(title) {
var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
if(filenameResults.length > 0) {
var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
if(self.commander.verbose) {
console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
}
var parser = wiki.parseTiddler(template || title),
widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
container = $tw.fakeDocument.createElement("div");
widgetNode.render(container,null);
var text = type === "text/html" ? container.innerHTML : container.textContent;
$tw.utils.createFileDirectories(filepath);
fs.writeFileSync(filepath,text,"utf8");
} else {
console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
} }
var self = this, });
fs = require("fs"), return null;
path = require("path"), };
wiki = this.commander.wiki,
tiddlerFilter = this.params[0],
filenameFilter = this.params[1] || "[is[tiddler]addsuffix[.html]]",
type = this.params[2] || "text/html",
template = this.params[3],
variableList = this.params.slice(4),
tiddlers = wiki.filterTiddlers(tiddlerFilter),
variables = Object.create(null);
while(variableList.length >= 2) {
variables[variableList[0]] = variableList[1];
variableList = variableList.slice(2);
}
$tw.utils.each(tiddlers,function(title) {
var filenameResults = wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]));
if(filenameResults.length > 0) {
var filepath = path.resolve(self.commander.outputPath,filenameResults[0]);
if(self.commander.verbose) {
console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
}
var parser = wiki.parseTiddler(template || title),
widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
container = $tw.fakeDocument.createElement("div");
widgetNode.render(container,null);
var text = type === "text/html" ? container.innerHTML : container.textContent;
$tw.utils.createFileDirectories(filepath);
fs.writeFileSync(filepath,text,"utf8");
} else {
console.log("Not rendering \"" + title + "\" because the filename filter returned an empty result");
}
});
return null;
};
exports.Command = Command; exports.Command = Command;

View File

@@ -9,8 +9,6 @@ Command to render several tiddlers to a folder of files
"use strict"; "use strict";
var widget = require("$:/core/modules/widgets/widget.js");
exports.info = { exports.info = {
name: "rendertiddlers", name: "rendertiddlers",
synchronous: true synchronous: true

View File

@@ -7,57 +7,56 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
\*/ \*/
"use strict"; "use strict";
exports.info = { exports.info = {
name: "save", name: "save",
synchronous: true synchronous: true
}; };
var Command = function(params,commander,callback) { var Command = function(params,commander,callback) {
this.params = params; this.params = params;
this.commander = commander; this.commander = commander;
this.callback = callback; this.callback = callback;
}; };
Command.prototype.execute = function() { Command.prototype.execute = function() {
if(this.params.length < 1) { if(this.params.length < 1) {
return "Missing filename filter"; return "Missing filename filter";
} }
var self = this, var self = this,
fs = require("fs"), path = require("path"),
path = require("path"), result = null,
result = null, wiki = this.commander.wiki,
wiki = this.commander.wiki, tiddlerFilter = this.params[0],
tiddlerFilter = this.params[0], filenameFilter = this.params[1] || "[is[tiddler]]",
filenameFilter = this.params[1] || "[is[tiddler]]", tiddlers = wiki.filterTiddlers(tiddlerFilter);
tiddlers = wiki.filterTiddlers(tiddlerFilter); $tw.utils.each(tiddlers,function(title) {
$tw.utils.each(tiddlers,function(title) { if(!result) {
if(!result) { var tiddler = self.commander.wiki.getTiddler(title);
var tiddler = self.commander.wiki.getTiddler(title); if(tiddler) {
if(tiddler) { var fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{
var fileInfo = $tw.utils.generateTiddlerFileInfo(tiddler,{ directory: path.resolve(self.commander.outputPath),
directory: path.resolve(self.commander.outputPath), pathFilters: [filenameFilter],
pathFilters: [filenameFilter], wiki: wiki,
wiki: wiki, fileInfo: {
fileInfo: { overwrite: true
overwrite: true
}
});
if(self.commander.verbose) {
console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
} }
try { });
$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo); if(self.commander.verbose) {
} catch (err) { console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
result = "Error saving tiddler \"" + title + "\", to file: \"" + fileInfo.filepath + "\"";
}
} else {
result = "Tiddler '" + title + "' not found";
} }
try {
$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
} catch (err) {
result = "Error saving tiddler \"" + title + "\", to file: \"" + fileInfo.filepath + "\"";
}
} else {
result = "Tiddler '" + title + "' not found";
} }
}); }
return result; });
}; return result;
};
exports.Command = Command; exports.Command = Command;

View File

@@ -9,8 +9,6 @@ Command to save several tiddlers to a folder of files
"use strict"; "use strict";
var widget = require("$:/core/modules/widgets/widget.js");
exports.info = { exports.info = {
name: "savetiddlers", name: "savetiddlers",
synchronous: true synchronous: true

View File

@@ -43,7 +43,7 @@ Command.prototype.execute = function() {
namedParames, namedParames,
tiddlerFilter, tiddlerFilter,
options = {}; options = {};
if (regFilter.test(this.params[1])) { if(regFilter.test(this.params[1])) {
namedParames = this.commander.extractNamedParameters(this.params.slice(1)); namedParames = this.commander.extractNamedParameters(this.params.slice(1));
tiddlerFilter = namedParames.filter || "[all[tiddlers]]"; tiddlerFilter = namedParames.filter || "[all[tiddlers]]";
} else { } else {
@@ -177,13 +177,13 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
$tw.utils.each(pluginTiddlers,function(tiddler,title) { $tw.utils.each(pluginTiddlers,function(tiddler,title) {
if(!tiddler.title) { if(!tiddler.title) {
tiddler.title = title; tiddler.title = title;
} }
self.saveTiddler(directory,new $tw.Tiddler(tiddler)); self.saveTiddler(directory,new $tw.Tiddler(tiddler));
}); });
}; };
WikiFolderMaker.prototype.saveTiddler = function(directory,tiddler) { WikiFolderMaker.prototype.saveTiddler = function(directory,tiddler) {
var title = tiddler.fields.title, fileInfo, pathFilters, extFilters; var fileInfo, pathFilters, extFilters;
if(this.wiki.tiddlerExists("$:/config/FileSystemPaths")) { if(this.wiki.tiddlerExists("$:/config/FileSystemPaths")) {
pathFilters = this.wiki.getTiddlerText("$:/config/FileSystemPaths","").split("\n"); pathFilters = this.wiki.getTiddlerText("$:/config/FileSystemPaths","").split("\n");
} }

View File

@@ -17,7 +17,6 @@ exports.info = {
}; };
var Command = function(params,commander,callback) { var Command = function(params,commander,callback) {
var self = this;
this.params = params; this.params = params;
this.commander = commander; this.commander = commander;
this.callback = callback; this.callback = callback;

View File

@@ -9,8 +9,6 @@ Command to modify selected tiddlers to set a field to the text of a template tid
"use strict"; "use strict";
var widget = require("$:/core/modules/widgets/widget.js");
exports.info = { exports.info = {
name: "setfield", name: "setfield",
synchronous: true synchronous: true
@@ -26,8 +24,7 @@ Command.prototype.execute = function() {
if(this.params.length < 4) { if(this.params.length < 4) {
return "Missing parameters"; return "Missing parameters";
} }
var self = this, var wiki = this.commander.wiki,
wiki = this.commander.wiki,
filter = this.params[0], filter = this.params[0],
fieldname = this.params[1] || "text", fieldname = this.params[1] || "text",
templatetitle = this.params[2], templatetitle = this.params[2],

View File

@@ -26,7 +26,7 @@ exports.getSubdirectories = function(dirPath) {
} }
}); });
return subdirs; return subdirs;
} };
/* /*
Recursively (and synchronously) copy a directory and all its content Recursively (and synchronously) copy a directory and all its content
@@ -46,8 +46,7 @@ exports.copyDirectory = function(srcPath,dstPath) {
} }
// Function to copy a folder full of files // Function to copy a folder full of files
var copy = function(srcPath,dstPath) { var copy = function(srcPath,dstPath) {
var srcStats = fs.lstatSync(srcPath), var srcStats = fs.lstatSync(srcPath);
dstExists = fs.existsSync(dstPath);
if(srcStats.isFile()) { if(srcStats.isFile()) {
$tw.utils.copyFile(srcPath,dstPath); $tw.utils.copyFile(srcPath,dstPath);
} else if(srcStats.isDirectory()) { } else if(srcStats.isDirectory()) {
@@ -83,7 +82,7 @@ exports.copyFile = function(srcPath,dstPath) {
dstFile = fs.openSync(dstPath,"w"), dstFile = fs.openSync(dstPath,"w"),
bytesRead = 1, bytesRead = 1,
pos = 0; pos = 0;
while (bytesRead > 0) { while(bytesRead > 0) {
bytesRead = fs.readSync(srcFile,fileBuffer,0,FILE_BUFFER_LENGTH,pos); bytesRead = fs.readSync(srcFile,fileBuffer,0,FILE_BUFFER_LENGTH,pos);
fs.writeSync(dstFile,fileBuffer,0,bytesRead); fs.writeSync(dstFile,fileBuffer,0,bytesRead);
pos += bytesRead; pos += bytesRead;
@@ -148,7 +147,7 @@ exports.deleteDirectory = function(dirPath) {
fs.unlinkSync(currPath); fs.unlinkSync(currPath);
} }
} }
fs.rmdirSync(dirPath); fs.rmdirSync(dirPath);
} }
return null; return null;
}; };
@@ -255,7 +254,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
// Overriding to the .tid extension needs special handling // Overriding to the .tid extension needs special handling
fileInfo.type = "application/x-tiddler"; fileInfo.type = "application/x-tiddler";
fileInfo.hasMetaFile = false; fileInfo.hasMetaFile = false;
} else if (metaExt === ".json") { } else if(metaExt === ".json") {
// Overriding to the .json extension needs special handling // Overriding to the .json extension needs special handling
fileInfo.type = "application/json"; fileInfo.type = "application/json";
fileInfo.hasMetaFile = false; fileInfo.hasMetaFile = false;
@@ -345,18 +344,18 @@ exports.generateTiddlerFilepath = function(title,options) {
// Replace any Windows control codes // Replace any Windows control codes
filepath = filepath.replace(/^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i,"_$1_"); filepath = filepath.replace(/^(con|prn|aux|nul|com[0-9]|lpt[0-9])$/i,"_$1_");
// Replace any leading spaces with the same number of underscores // Replace any leading spaces with the same number of underscores
filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_")}); filepath = filepath.replace(/^ +/,function (u) { return u.replace(/ /g, "_");});
//If the path does not start with "." or ".." && a path seperator, then //If the path does not start with "." or ".." && a path seperator, then
if(!/^\.{1,2}[/\\]/g.test(filepath)) { if(!/^\.{1,2}[/\\]/g.test(filepath)) {
// Don't let the filename start with any dots because such files are invisible on *nix // Don't let the filename start with any dots because such files are invisible on *nix
filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_")}); filepath = filepath.replace(/^\.+/g,function (u) { return u.replace(/\./g, "_");});
} }
// Replace any Unicode control codes // Replace any Unicode control codes
filepath = filepath.replace(/[\x00-\x1f\x80-\x9f]/g,"_"); filepath = filepath.replace(/[\x00-\x1f\x80-\x9f]/g,"_");
// Replace any characters that can't be used in cross-platform filenames // Replace any characters that can't be used in cross-platform filenames
filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_")); filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
// Replace any dots or spaces at the end of the extension with the same number of underscores // Replace any dots or spaces at the end of the extension with the same number of underscores
extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_")}); extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_");});
// Truncate the extension if it is too long // Truncate the extension if it is too long
if(extension.length > 32) { if(extension.length > 32) {
extension = extension.substr(0,32); extension = extension.substr(0,32);
@@ -382,9 +381,9 @@ exports.generateTiddlerFilepath = function(title,options) {
} }
// Add a uniquifier if the file already exists (default) // Add a uniquifier if the file already exists (default)
var fullPath = path.resolve(directory, filepath + extension); var fullPath = path.resolve(directory, filepath + extension);
if (!overwrite) { if(!overwrite) {
var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined, var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
count = 0; count = 0;
do { do {
fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension); fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
if(oldPath && oldPath == fullPath) break; if(oldPath && oldPath == fullPath) break;
@@ -401,7 +400,7 @@ exports.generateTiddlerFilepath = function(title,options) {
writePath.indexOf(path.resolve(directory)) == 0 || writePath.indexOf(path.resolve(directory)) == 0 ||
writePath.indexOf(path.resolve($tw.boot.wikiPath)) == 0 || writePath.indexOf(path.resolve($tw.boot.wikiPath)) == 0 ||
writePath.indexOf(path.resolve($tw.boot.wikiTiddlersPath,originalpath)) == 0 ); writePath.indexOf(path.resolve($tw.boot.wikiTiddlersPath,originalpath)) == 0 );
} }
if(encode) { if(encode) {
writePath = path.resolve(directory,$tw.utils.encodeURIComponentExtended(fullPath)); writePath = path.resolve(directory,$tw.utils.encodeURIComponentExtended(fullPath));
} }
@@ -521,12 +520,12 @@ Cleanup old files on disk, by comparing the options values:
*/ */
exports.cleanupTiddlerFiles = function(options,callback) { exports.cleanupTiddlerFiles = function(options,callback) {
var adaptorInfo = options.adaptorInfo || {}, var adaptorInfo = options.adaptorInfo || {},
bootInfo = options.bootInfo || {}, bootInfo = options.bootInfo || {},
title = options.title || "undefined"; title = options.title || "undefined";
if(adaptorInfo.filepath && bootInfo.filepath && adaptorInfo.filepath !== bootInfo.filepath) { if(adaptorInfo.filepath && bootInfo.filepath && adaptorInfo.filepath !== bootInfo.filepath) {
$tw.utils.deleteTiddlerFile(adaptorInfo,function(err) { $tw.utils.deleteTiddlerFile(adaptorInfo,function(err) {
if(err) { if(err) {
if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") { if((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
// Error deleting the previous file on disk, should fail gracefully // Error deleting the previous file on disk, should fail gracefully
$tw.syncer.displayError("Server desynchronized. Error cleaning up previous file for tiddler: \""+title+"\"",err); $tw.syncer.displayError("Server desynchronized. Error cleaning up previous file for tiddler: \""+title+"\"",err);
return callback(null,bootInfo); return callback(null,bootInfo);

View File

@@ -10,9 +10,7 @@ Authenticator for WWW basic authentication
"use strict"; "use strict";
if($tw.node) { if($tw.node) {
var util = require("util"), var fs = require("fs"),
fs = require("fs"),
url = require("url"),
path = require("path"); path = require("path");
} }

View File

@@ -19,7 +19,7 @@ exports.info = {
exports.handler = function(request,response,state) { exports.handler = function(request,response,state) {
var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")), var text = state.wiki.renderTiddler(state.server.get("root-render-type"),state.server.get("root-tiddler")),
responseHeaders = { responseHeaders = {
"Content-Type": state.server.get("root-serve-type") "Content-Type": state.server.get("root-serve-type")
}; };
state.sendResponse(200,responseHeaders,text); state.sendResponse(200,responseHeaders,text);
}; };

View File

@@ -18,7 +18,7 @@ exports.info = {
exports.handler = function(request,response,state) { exports.handler = function(request,response,state) {
var title = $tw.utils.decodeURIComponentSafe(state.params[0]), var title = $tw.utils.decodeURIComponentSafe(state.params[0]),
fields = $tw.utils.parseJSONSafe(state.data); fields = $tw.utils.parseJSONSafe(state.data);
// Pull up any subfields in the `fields` object // Pull up any subfields in the `fields` object
if(fields.fields) { if(fields.fields) {
$tw.utils.each(fields.fields,function(field,name) { $tw.utils.each(fields.fields,function(field,name) {

View File

@@ -9,14 +9,15 @@ Serve tiddlers over http
"use strict"; "use strict";
let fs, url, path, querystring, crypto, zlib;
if($tw.node) { if($tw.node) {
var util = require("util"), fs = require("fs"),
fs = require("fs"), url = require("url"),
url = require("url"), path = require("path"),
path = require("path"), querystring = require("querystring"),
querystring = require("querystring"), crypto = require("crypto"),
crypto = require("crypto"), zlib = require("zlib");
zlib = require("zlib");
} }
/* /*
@@ -41,7 +42,7 @@ function Server(options) {
} }
} }
// Setup the default required plugins // Setup the default required plugins
this.requiredPlugins = this.get("required-plugins").split(','); this.requiredPlugins = this.get("required-plugins").split(",");
// Initialise CORS // Initialise CORS
this.corsEnable = this.get("cors-enable") === "yes"; this.corsEnable = this.get("cors-enable") === "yes";
// Initialise CSRF // Initialise CSRF
@@ -62,9 +63,9 @@ function Server(options) {
this.authorizationPrincipals = { this.authorizationPrincipals = {
readers: (this.get("readers") || authorizedUserName).split(",").map($tw.utils.trim), readers: (this.get("readers") || authorizedUserName).split(",").map($tw.utils.trim),
writers: (this.get("writers") || authorizedUserName).split(",").map($tw.utils.trim) writers: (this.get("writers") || authorizedUserName).split(",").map($tw.utils.trim)
} };
if(this.get("admin") || authorizedUserName !== "(anon)") { if(this.get("admin") || authorizedUserName !== "(anon)") {
this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(',').map($tw.utils.trim) this.authorizationPrincipals["admin"] = (this.get("admin") || authorizedUserName).split(",").map($tw.utils.trim);
} }
// Load and initialise authenticators // Load and initialise authenticators
$tw.modules.forEachModuleOfType("authenticator", function(title,authenticatorDefinition) { $tw.modules.forEachModuleOfType("authenticator", function(title,authenticatorDefinition) {
@@ -91,7 +92,7 @@ function Server(options) {
this.listenOptions = { this.listenOptions = {
key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"), key: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsKeyFilepath),"utf8"),
cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8"), cert: fs.readFileSync(path.resolve(this.boot.wikiPath,tlsCertFilepath),"utf8"),
passphrase: tlsPassphrase || '' passphrase: tlsPassphrase || ""
}; };
this.protocol = "https"; this.protocol = "https";
} }
@@ -116,7 +117,7 @@ encoding: the encoding of the data to send (passed to the end method of the resp
*/ */
function sendResponse(request,response,statusCode,headers,data,encoding) { function sendResponse(request,response,statusCode,headers,data,encoding) {
if(this.enableBrowserCache && (statusCode == 200)) { if(this.enableBrowserCache && (statusCode == 200)) {
var hash = crypto.createHash('md5'); var hash = crypto.createHash("md5");
// Put everything into the hash that could change and invalidate the data that // Put everything into the hash that could change and invalidate the data that
// the browser already stored. The headers the data and the encoding. // the browser already stored. The headers the data and the encoding.
hash.update(data); hash.update(data);
@@ -211,7 +212,6 @@ Server.prototype.addAuthenticator = function(AuthenticatorClass) {
Server.prototype.findMatchingRoute = function(request,state) { Server.prototype.findMatchingRoute = function(request,state) {
for(var t=0; t<this.routes.length; t++) { for(var t=0; t<this.routes.length; t++) {
var potentialRoute = this.routes[t], var potentialRoute = this.routes[t],
pathRegExp = potentialRoute.path,
pathname = state.urlInfo.pathname, pathname = state.urlInfo.pathname,
match; match;
if(state.pathPrefix) { if(state.pathPrefix) {
@@ -250,7 +250,7 @@ Check whether a given user is authorized for the specified authorizationType ("r
Server.prototype.isAuthorized = function(authorizationType,username) { Server.prototype.isAuthorized = function(authorizationType,username) {
var principals = this.authorizationPrincipals[authorizationType] || []; var principals = this.authorizationPrincipals[authorizationType] || [];
return principals.indexOf("(anon)") !== -1 || (username && (principals.indexOf("(authenticated)") !== -1 || principals.indexOf(username) !== -1)); return principals.indexOf("(anon)") !== -1 || (username && (principals.indexOf("(authenticated)") !== -1 || principals.indexOf(username) !== -1));
} };
Server.prototype.requestHandler = function(request,response,options) { Server.prototype.requestHandler = function(request,response,options) {
options = options || {}; options = options || {};
@@ -337,7 +337,7 @@ Server.prototype.requestHandler = function(request,response,options) {
request.on("end",function() { request.on("end",function() {
state.data = Buffer.concat(data); state.data = Buffer.concat(data);
route.handler(request,response,state); route.handler(request,response,state);
}) });
} else { } else {
response.writeHead(400,"Invalid bodyFormat " + route.bodyFormat + " in route " + route.method + " " + route.path.source); response.writeHead(400,"Invalid bodyFormat " + route.bodyFormat + " in route " + route.method + " " + route.path.source);
response.end(); response.end();
@@ -362,8 +362,8 @@ Server.prototype.listen = function(port,host,prefix) {
} }
// Warn if required plugins are missing // Warn if required plugins are missing
var missing = []; var missing = [];
for (var index=0; index<this.requiredPlugins.length; index++) { for(var index=0; index<this.requiredPlugins.length; index++) {
if (!this.wiki.getTiddler(this.requiredPlugins[index])) { if(!this.wiki.getTiddler(this.requiredPlugins[index])) {
missing.push(this.requiredPlugins[index]); missing.push(this.requiredPlugins[index]);
} }
} }

View File

@@ -9,22 +9,22 @@ Base64 UTF-8 utlity functions.
"use strict"; "use strict";
const{ TextEncoder, TextDecoder } = require("node:util"); const { TextEncoder, TextDecoder } = require("node:util");
exports.btoa = binstr => Buffer.from(binstr, "binary").toString("base64"); exports.btoa = (binstr) => Buffer.from(binstr, "binary").toString("base64");
exports.atob = b64 => Buffer.from(b64, "base64").toString("binary"); exports.atob = (b64) => Buffer.from(b64, "base64").toString("binary");
function base64ToBytes(base64) { function base64ToBytes(base64) {
const binString = exports.atob(base64); const binString = exports.atob(base64);
return Uint8Array.from(binString, m => m.codePointAt(0)); return Uint8Array.from(binString, (m) => m.codePointAt(0));
}; };
function bytesToBase64(bytes) { function bytesToBase64(bytes) {
const binString = Array.from(bytes, byte => String.fromCodePoint(byte)).join(""); const binString = Array.from(bytes, (byte) => String.fromCodePoint(byte)).join("");
return exports.btoa(binString); return exports.btoa(binString);
}; };
exports.base64EncodeUtf8 = str => bytesToBase64(new TextEncoder().encode(str)); exports.base64EncodeUtf8 = (str) => bytesToBase64(new TextEncoder().encode(str));
exports.base64DecodeUtf8 = str => new TextDecoder().decode(base64ToBytes(str)); exports.base64DecodeUtf8 = (str) => new TextDecoder().decode(base64ToBytes(str));

View File

@@ -16,8 +16,7 @@ ignoreEnvironmentVariables: defaults to false
*/ */
exports.getAllPlugins = function(options) { exports.getAllPlugins = function(options) {
options = options || {}; options = options || {};
var fs = require("fs"), var path = require("path"),
path = require("path"),
tiddlers = {}; tiddlers = {};
// Collect up the library plugins // Collect up the library plugins
var collectPlugins = function(folder) { var collectPlugins = function(folder) {

View File

@@ -18,13 +18,13 @@ class BackgroundActionDispatcher {
// Track the filter for the background actions // Track the filter for the background actions
this.filterTracker.track({ this.filterTracker.track({
filterString: "[all[tiddlers+shadows]tag[$:/tags/BackgroundAction]!is[draft]]", filterString: "[all[tiddlers+shadows]tag[$:/tags/BackgroundAction]!is[draft]]",
fnEnter: title => this.trackFilter(title), fnEnter: (title) => this.trackFilter(title),
fnLeave: (title, enterValue) => this.untrackFilter(enterValue), fnLeave: (title, enterValue) => this.untrackFilter(enterValue),
fnChange: (title, enterValue) => { fnChange: (title, enterValue) => {
this.untrackFilter(enterValue); this.untrackFilter(enterValue);
return this.trackFilter(title); return this.trackFilter(title);
}, },
fnProcess: changes => this.process(changes) fnProcess: (changes) => this.process(changes)
}); });
} }
@@ -75,7 +75,7 @@ class BackgroundActionTracker {
filterString: this.trackFilter, filterString: this.trackFilter,
fnEnter: () => { this.hasChanged = true; }, fnEnter: () => { this.hasChanged = true; },
fnLeave: () => { this.hasChanged = true; }, fnLeave: () => { this.hasChanged = true; },
fnProcess: changes => { fnProcess: (changes) => {
if(this.hasChanged) { if(this.hasChanged) {
this.hasChanged = false; this.hasChanged = false;
console.log("Processing background action", this.title); console.log("Processing background action", this.title);

View File

@@ -197,7 +197,7 @@ FramedEngine.prototype.handleFocusEvent = function(event) {
Handle a keydown event Handle a keydown event
*/ */
FramedEngine.prototype.handleKeydownEvent = function(event) { FramedEngine.prototype.handleKeydownEvent = function(event) {
if ($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) { if($tw.keyboardManager.handleKeydownEvent(event, {onlyPriority: true})) {
return true; return true;
} }

View File

@@ -55,12 +55,12 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
var editInfo = this.getEditInfo(), var editInfo = this.getEditInfo(),
Engine = this.editShowToolbar ? toolbarEngine : nonToolbarEngine; Engine = this.editShowToolbar ? toolbarEngine : nonToolbarEngine;
this.engine = new Engine({ this.engine = new Engine({
widget: this, widget: this,
value: editInfo.value, value: editInfo.value,
type: editInfo.type, type: editInfo.type,
parentNode: parent, parentNode: parent,
nextSibling: nextSibling nextSibling: nextSibling
}); });
// Call the postRender hook // Call the postRender hook
if(this.postRender) { if(this.postRender) {
this.postRender(); this.postRender();
@@ -220,7 +220,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup || changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) { if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup || changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
this.refreshSelf(); this.refreshSelf();
return true; return true;
} else if (changedTiddlers[this.editRefreshTitle]) { } else if(changedTiddlers[this.editRefreshTitle]) {
this.engine.updateDomNodeText(this.getEditInfo().value); this.engine.updateDomNodeText(this.getEditInfo().value);
} else if(changedTiddlers[this.editTitle]) { } else if(changedTiddlers[this.editTitle]) {
var editInfo = this.getEditInfo(); var editInfo = this.getEditInfo();
@@ -274,8 +274,8 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
}); });
if($tw.keyboardManager.checkKeyDescriptors(event,keyInfoArray)) { if($tw.keyboardManager.checkKeyDescriptors(event,keyInfoArray)) {
var clickEvent = this.document.createEvent("Events"); var clickEvent = this.document.createEvent("Events");
clickEvent.initEvent("click",true,false); clickEvent.initEvent("click",true,false);
el.dispatchEvent(clickEvent); el.dispatchEvent(clickEvent);
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
return true; return true;

View File

@@ -10,7 +10,7 @@ Text editor operation to excise the selection to a new tiddler
"use strict"; "use strict";
function isMarkdown(mediaType) { function isMarkdown(mediaType) {
return mediaType === 'text/markdown' || mediaType === 'text/x-markdown'; return mediaType === "text/markdown" || mediaType === "text/x-markdown";
} }
exports["excise"] = function(event,operation) { exports["excise"] = function(event,operation) {

View File

@@ -19,7 +19,7 @@ exports["wrap-lines"] = function(event,operation) {
operation.cutStart = operation.selStart - (prefix.length + 1); operation.cutStart = operation.selStart - (prefix.length + 1);
operation.cutEnd = operation.selEnd + suffix.length + 1; operation.cutEnd = operation.selEnd + suffix.length + 1;
// Also cut the following newline (if there is any) // Also cut the following newline (if there is any)
if (operation.text[operation.cutEnd] === "\n") { if(operation.text[operation.cutEnd] === "\n") {
operation.cutEnd++; operation.cutEnd++;
} }
// Replace with selection // Replace with selection

View File

@@ -44,7 +44,7 @@ exports["wrap-selection"] = function(event,operation) {
break; break;
} }
return result; return result;
} };
function togglePrefixSuffix() { function togglePrefixSuffix() {
if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) { if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {

View File

@@ -69,17 +69,17 @@ class FilterTracker {
if(!tracker) return; if(!tracker) return;
const results = []; const results = [];
// Evaluate the filter and remove duplicate results // Evaluate the filter and remove duplicate results
$tw.utils.each(this.wiki.filterTiddlers(tracker.filterString), title => { $tw.utils.each(this.wiki.filterTiddlers(tracker.filterString), (title) => {
$tw.utils.pushTop(results, title); $tw.utils.pushTop(results, title);
}); });
// Process the newly entered results // Process the newly entered results
results.forEach(title => { results.forEach((title) => {
if(!tracker.previousResults.includes(title) && !tracker.resultValues[title] && tracker.fnEnter) { if(!tracker.previousResults.includes(title) && !tracker.resultValues[title] && tracker.fnEnter) {
tracker.resultValues[title] = tracker.fnEnter(title) || true; tracker.resultValues[title] = tracker.fnEnter(title) || true;
} }
}); });
// Process the results that have just left // Process the results that have just left
tracker.previousResults.forEach(title => { tracker.previousResults.forEach((title) => {
if(!results.includes(title) && tracker.resultValues[title] && tracker.fnLeave) { if(!results.includes(title) && tracker.resultValues[title] && tracker.fnLeave) {
tracker.fnLeave(title, tracker.resultValues[title]); tracker.fnLeave(title, tracker.resultValues[title]);
delete tracker.resultValues[title]; delete tracker.resultValues[title];
@@ -91,7 +91,7 @@ class FilterTracker {
processChanges(changes) { processChanges(changes) {
for(const tracker of this.trackers.values()) { for(const tracker of this.trackers.values()) {
Object.keys(changes).forEach(title => { Object.keys(changes).forEach((title) => {
if(title && tracker.previousResults.includes(title) && tracker.fnChange) { if(title && tracker.previousResults.includes(title) && tracker.fnChange) {
tracker.resultValues[title] = tracker.fnChange(title, tracker.resultValues[title]) || tracker.resultValues[title]; tracker.resultValues[title] = tracker.fnChange(title, tracker.resultValues[title]) || tracker.resultValues[title];
} }

View File

@@ -24,7 +24,7 @@ exports.cascade = function(operationSubFunction,options) {
} }
var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({ var output = filterFnList[index](options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
"currentTiddler": "" + title, "currentTiddler": "" + title,
"..currentTiddler": widget.getVariable("currentTiddler","") "..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
})); }));
if(output.length !== 0) { if(output.length !== 0) {
result = output[0]; result = output[0];
@@ -34,5 +34,5 @@ exports.cascade = function(operationSubFunction,options) {
results.push(result); results.push(result);
}); });
} }
} };
}; };

View File

@@ -18,7 +18,7 @@ exports.filter = function(operationSubFunction,options) {
results.each(function(title) { results.each(function(title) {
var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({ var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
"currentTiddler": "" + title, "currentTiddler": "" + title,
"..currentTiddler": widget.getVariable("currentTiddler",""), "..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
"index": "" + index, "index": "" + index,
"revIndex": "" + (results.length - 1 - index), "revIndex": "" + (results.length - 1 - index),
"length": "" + results.length "length": "" + results.length
@@ -30,5 +30,5 @@ exports.filter = function(operationSubFunction,options) {
}); });
results.remove(resultsToRemove); results.remove(resultsToRemove);
} }
} };
}; };

View File

@@ -7,8 +7,6 @@ Assign a value to a variable
\*/ \*/
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict"; "use strict";
/* /*

View File

@@ -20,7 +20,7 @@ exports.map = function(operationSubFunction,options) {
$tw.utils.each(inputTitles,function(title) { $tw.utils.each(inputTitles,function(title) {
var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({ var filtered = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
"currentTiddler": "" + title, "currentTiddler": "" + title,
"..currentTiddler": widget.getVariable("currentTiddler",""), "..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
"index": "" + index, "index": "" + index,
"revIndex": "" + (inputTitles.length - 1 - index), "revIndex": "" + (inputTitles.length - 1 - index),
"length": "" + inputTitles.length "length": "" + inputTitles.length
@@ -28,12 +28,12 @@ exports.map = function(operationSubFunction,options) {
if(filtered.length && flatten) { if(filtered.length && flatten) {
$tw.utils.each(filtered,function(value) { $tw.utils.each(filtered,function(value) {
results.push(value); results.push(value);
}) });
} else { } else {
results.push(filtered[0]||""); results.push(filtered[0]||"");
} }
++index; ++index;
}); });
} }
} };
}; };

View File

@@ -17,7 +17,7 @@ exports.reduce = function(operationSubFunction,options) {
results.each(function(title) { results.each(function(title) {
var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({ var list = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
"currentTiddler": "" + title, "currentTiddler": "" + title,
"..currentTiddler": widget.getVariable("currentTiddler"), "..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""}),
"index": "" + index, "index": "" + index,
"revIndex": "" + (results.length - 1 - index), "revIndex": "" + (results.length - 1 - index),
"length": "" + results.length, "length": "" + results.length,
@@ -31,5 +31,5 @@ exports.reduce = function(operationSubFunction,options) {
results.clear(); results.clear();
results.push(accumulator); results.push(accumulator);
} }
} };
}; };

View File

@@ -24,7 +24,7 @@ exports.sort = function(operationSubFunction,options) {
results.each(function(title) { results.each(function(title) {
var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({ var key = operationSubFunction(options.wiki.makeTiddlerIterator([title]),widget.makeFakeWidgetWithVariables({
"currentTiddler": "" + title, "currentTiddler": "" + title,
"..currentTiddler": widget.getVariable("currentTiddler") "..currentTiddler": widget.getVariable("currentTiddler",{defaultValue:""})
})); }));
sortKeys.push(key[0] || ""); sortKeys.push(key[0] || "");
}); });
@@ -36,12 +36,12 @@ exports.sort = function(operationSubFunction,options) {
// Sort the indexes // Sort the indexes
compareFn = $tw.utils.makeCompareFunction(sortType,{defaultType: "string", invert:invert, isCaseSensitive:isCaseSensitive}); compareFn = $tw.utils.makeCompareFunction(sortType,{defaultType: "string", invert:invert, isCaseSensitive:isCaseSensitive});
indexes = indexes.sort(function(a,b) { indexes = indexes.sort(function(a,b) {
return compareFn(sortKeys[a],sortKeys[b]); return compareFn(sortKeys[a],sortKeys[b]);
}); });
// Add to results in correct order // Add to results in correct order
$tw.utils.each(indexes,function(index) { $tw.utils.each(indexes,function(index) {
results.push(inputTitles[index]); results.push(inputTitles[index]);
}); });
} }
} };
}; };

View File

@@ -43,7 +43,7 @@ function parseFilterOperation(operators,filterString,p) {
var bracket = filterString.charAt(nextBracketPos); var bracket = filterString.charAt(nextBracketPos);
operator.operator = filterString.substring(p,nextBracketPos); operator.operator = filterString.substring(p,nextBracketPos);
// Any suffix? // Any suffix?
var colon = operator.operator.indexOf(':'); var colon = operator.operator.indexOf(":");
if(colon > -1) { if(colon > -1) {
// The raw suffix for older filters // The raw suffix for older filters
operator.suffix = operator.operator.substring(colon + 1); operator.suffix = operator.operator.substring(colon + 1);
@@ -67,7 +67,7 @@ function parseFilterOperation(operators,filterString,p) {
operator.operands = []; operator.operands = [];
var parseOperand = function(bracketType) { var parseOperand = function(bracketType) {
var operand = {}; var operand = {};
switch (bracketType) { switch(bracketType) {
case "{": // Curly brackets case "{": // Curly brackets
operand.indirect = true; operand.indirect = true;
nextBracketPos = filterString.indexOf("}",p); nextBracketPos = filterString.indexOf("}",p);
@@ -88,8 +88,8 @@ function parseFilterOperation(operators,filterString,p) {
rexMatch = rex.exec(filterString.substring(p)); rexMatch = rex.exec(filterString.substring(p));
if(rexMatch) { if(rexMatch) {
operator.regexp = new RegExp(rexMatch[1], rexMatch[2]); operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
// DEPRECATION WARNING // DEPRECATION WARNING
console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp); console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
nextBracketPos = p + rex.lastIndex - 1; nextBracketPos = p + rex.lastIndex - 1;
} }
else { else {
@@ -108,7 +108,7 @@ function parseFilterOperation(operators,filterString,p) {
} }
operator.operands.push(operand); operator.operands.push(operand);
p = nextBracketPos + 1; p = nextBracketPos + 1;
} };
p = nextBracketPos + 1; p = nextBracketPos + 1;
parseOperand(bracket); parseOperand(bracket);
@@ -228,7 +228,7 @@ exports.getFilterRunPrefixes = function() {
$tw.modules.applyMethods("filterrunprefix",this.filterRunPrefixes); $tw.modules.applyMethods("filterrunprefix",this.filterRunPrefixes);
} }
return this.filterRunPrefixes; return this.filterRunPrefixes;
} };
exports.filterTiddlers = function(filterString,widget,source) { exports.filterTiddlers = function(filterString,widget,source) {
var fn = this.compileFilter(filterString); var fn = this.compileFilter(filterString);
@@ -314,19 +314,19 @@ exports.compileFilter = function(filterString) {
// Invoke the appropriate filteroperator module // Invoke the appropriate filteroperator module
results = operatorFunction(accumulator,{ results = operatorFunction(accumulator,{
operator: operator.operator, operator: operator.operator,
operand: operands.length > 0 ? operands[0] : undefined, operand: operands.length > 0 ? operands[0] : undefined,
operands: operands, operands: operands,
multiValueOperands: multiValueOperands, multiValueOperands: multiValueOperands,
isMultiValueOperand: isMultiValueOperand, isMultiValueOperand: isMultiValueOperand,
prefix: operator.prefix, prefix: operator.prefix,
suffix: operator.suffix, suffix: operator.suffix,
suffixes: operator.suffixes, suffixes: operator.suffixes,
regexp: operator.regexp regexp: operator.regexp
},{ },{
wiki: self, wiki: self,
widget: widget widget: widget
}); });
if($tw.utils.isArray(results)) { if($tw.utils.isArray(results)) {
accumulator = self.makeTiddlerIterator(results); accumulator = self.makeTiddlerIterator(results);
} else { } else {

View File

@@ -32,4 +32,4 @@ var modes = {
"gt": function(value) {return value > 0;}, "gt": function(value) {return value > 0;},
"lteq": function(value) {return value <= 0;}, "lteq": function(value) {return value <= 0;},
"lt": function(value) {return value < 0;} "lt": function(value) {return value < 0;}
} };

View File

@@ -31,4 +31,4 @@ exports["deserialize"] = function(source,operator,options) {
return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")]; return [$tw.language.getString("Error/DeserializeOperator/MissingOperand")];
} }
return results; return results;
} };

View File

@@ -15,8 +15,8 @@ Export our filter function
*/ */
exports.each = function(source,operator,options) { exports.each = function(source,operator,options) {
var results =[] , var results =[] ,
value,values = {}, value,values = {},
field = operator.operand || "title"; field = operator.operand || "title";
if(operator.suffix === "value" && field === "title") { if(operator.suffix === "value" && field === "title") {
source(function(tiddler,title) { source(function(tiddler,title) {
if(!$tw.utils.hop(values,title)) { if(!$tw.utils.hop(values,title)) {

View File

@@ -53,7 +53,7 @@ exports.field = function(source,operator,options) {
if(source.byField && operator.operand) { if(source.byField && operator.operand) {
indexedResults = source.byField(fieldname,operator.operand); indexedResults = source.byField(fieldname,operator.operand);
if(indexedResults) { if(indexedResults) {
return indexedResults return indexedResults;
} }
} }
source(function(tiddler,title) { source(function(tiddler,title) {

View File

@@ -24,7 +24,7 @@ exports.fields = function(source,operator,options) {
for(fieldName in tiddler.fields) { for(fieldName in tiddler.fields) {
(operand.indexOf(fieldName) !== -1) ? $tw.utils.pushTop(results,fieldName) : ""; (operand.indexOf(fieldName) !== -1) ? $tw.utils.pushTop(results,fieldName) : "";
} }
} else if (suffixes.indexOf("exclude") !== -1) { } else if(suffixes.indexOf("exclude") !== -1) {
for(fieldName in tiddler.fields) { for(fieldName in tiddler.fields) {
(operand.indexOf(fieldName) !== -1) ? "" : $tw.utils.pushTop(results,fieldName); (operand.indexOf(fieldName) !== -1) ? "" : $tw.utils.pushTop(results,fieldName);
} }

View File

@@ -19,7 +19,7 @@ exports.filter = function(source,operator,options) {
source(function(tiddler,title) { source(function(tiddler,title) {
var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),options.widget.makeFakeWidgetWithVariables({ var list = filterFn.call(options.wiki,options.wiki.makeTiddlerIterator([title]),options.widget.makeFakeWidgetWithVariables({
"currentTiddler": "" + title, "currentTiddler": "" + title,
"..currentTiddler": options.widget.getVariable("currentTiddler","") "..currentTiddler": options.widget.getVariable("currentTiddler",{defaultValue:""})
})); }));
if((list.length > 0) === target) { if((list.length > 0) === target) {
results.push(title); results.push(title);

View File

@@ -12,7 +12,7 @@ Export our filter function
exports.timestamp = function(source,operand,options) { exports.timestamp = function(source,operand,options) {
var results = []; var results = [];
source(function(tiddler,title) { source(function(tiddler,title) {
if (title.match(/^-?\d+$/)) { if(title.match(/^-?\d+$/)) {
var value = new Date(Number(title)); var value = new Date(Number(title));
results.push($tw.utils.formatDateString(value,operand || "[UTC]YYYY0MM0DD0hh0mm0ss0XXX")); results.push($tw.utils.formatDateString(value,operand || "[UTC]YYYY0MM0DD0hh0mm0ss0XXX"));
} }

View File

@@ -13,7 +13,7 @@ returns the value at a given index of datatiddlers
Export our filter function Export our filter function
*/ */
exports.getindex = function(source,operator,options) { exports.getindex = function(source,operator,options) {
var data,title,results = []; var data,results = [];
if(operator.operand){ if(operator.operand){
source(function(tiddler,title) { source(function(tiddler,title) {
title = tiddler ? tiddler.fields.title : title; title = tiddler ? tiddler.fields.title : title;

View File

@@ -157,13 +157,13 @@ function convertDataItemValueToStrings(item) {
if(item === undefined) { if(item === undefined) {
return undefined; return undefined;
} else if(item === null) { } else if(item === null) {
return ["null"] return ["null"];
} else if(typeof item === "object") { } else if(typeof item === "object") {
var results = [],i,t; var results = [],i,t;
if(Array.isArray(item)) { if(Array.isArray(item)) {
// Return all the items in arrays recursively // Return all the items in arrays recursively
for(i=0; i<item.length; i++) { for(i=0; i<item.length; i++) {
t = convertDataItemValueToStrings(item[i]) t = convertDataItemValueToStrings(item[i]);
if(t !== undefined) { if(t !== undefined) {
results.push.apply(results,t); results.push.apply(results,t);
} }
@@ -231,7 +231,7 @@ function getItemAtIndex(item,index) {
return item[index]; return item[index];
} else if(Array.isArray(item)) { } else if(Array.isArray(item)) {
index = $tw.utils.parseInt(index); index = $tw.utils.parseInt(index);
if(index < 0) { index = index + item.length }; if(index < 0) { index = index + item.length; };
return item[index]; // Will be undefined if index was out-of-bounds return item[index]; // Will be undefined if index was out-of-bounds
} else { } else {
return undefined; return undefined;
@@ -289,7 +289,7 @@ function setDataItem(data,indexes,value) {
var lastIndex = indexes[indexes.length - 1]; var lastIndex = indexes[indexes.length - 1];
if(Array.isArray(current)) { if(Array.isArray(current)) {
lastIndex = $tw.utils.parseInt(lastIndex); lastIndex = $tw.utils.parseInt(lastIndex);
if(lastIndex < 0) { lastIndex = lastIndex + current.length }; if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
} }
// Only set indexes on objects and arrays // Only set indexes on objects and arrays
if(typeof current === "object") { if(typeof current === "object") {
@@ -316,7 +316,7 @@ function deleteDataItem(data,indexes) {
var lastIndex = indexes[indexes.length - 1]; var lastIndex = indexes[indexes.length - 1];
if(Array.isArray(current) && current !== null) { if(Array.isArray(current) && current !== null) {
lastIndex = $tw.utils.parseInt(lastIndex); lastIndex = $tw.utils.parseInt(lastIndex);
if(lastIndex < 0) { lastIndex = lastIndex + current.length }; if(lastIndex < 0) { lastIndex = lastIndex + current.length; };
// Check if index is valid before splicing // Check if index is valid before splicing
if(lastIndex >= 0 && lastIndex < current.length) { if(lastIndex >= 0 && lastIndex < current.length) {
current.splice(lastIndex,1); current.splice(lastIndex,1);

View File

@@ -25,7 +25,7 @@ exports.lookup = function(source,operator,options) {
indexSuffix = (suffixes[1] && suffixes[1][0] === "index") ? true : false, indexSuffix = (suffixes[1] && suffixes[1][0] === "index") ? true : false,
target; target;
if(operator.operands.length == 2) { if(operator.operands.length == 2) {
target = operator.operands[1] target = operator.operands[1];
} else { } else {
target = indexSuffix ? "0": "text"; target = indexSuffix ? "0": "text";
} }

View File

@@ -17,35 +17,35 @@ Note that strings are converted to numbers automatically. Trailing non-digits ar
"use strict"; "use strict";
exports.negate = makeNumericBinaryOperator( exports.negate = makeNumericBinaryOperator(
function(a) {return -a} function(a) {return -a;}
); );
exports.abs = makeNumericBinaryOperator( exports.abs = makeNumericBinaryOperator(
function(a) {return Math.abs(a)} function(a) {return Math.abs(a);}
); );
exports.ceil = makeNumericBinaryOperator( exports.ceil = makeNumericBinaryOperator(
function(a) {return Math.ceil(a)} function(a) {return Math.ceil(a);}
); );
exports.floor = makeNumericBinaryOperator( exports.floor = makeNumericBinaryOperator(
function(a) {return Math.floor(a)} function(a) {return Math.floor(a);}
); );
exports.round = makeNumericBinaryOperator( exports.round = makeNumericBinaryOperator(
function(a) {return Math.round(a)} function(a) {return Math.round(a);}
); );
exports.trunc = makeNumericBinaryOperator( exports.trunc = makeNumericBinaryOperator(
function(a) {return Math.trunc(a)} function(a) {return Math.trunc(a);}
); );
exports.untrunc = makeNumericBinaryOperator( exports.untrunc = makeNumericBinaryOperator(
function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a)} function(a) {return Math.ceil(Math.abs(a)) * Math.sign(a);}
); );
exports.sign = makeNumericBinaryOperator( exports.sign = makeNumericBinaryOperator(
function(a) {return Math.sign(a)} function(a) {return Math.sign(a);}
); );
exports.add = makeNumericBinaryOperator( exports.add = makeNumericBinaryOperator(
@@ -103,29 +103,29 @@ exports.log = makeNumericBinaryOperator(
); );
exports.sum = makeNumericReducingOperator( exports.sum = makeNumericReducingOperator(
function(accumulator,value) {return accumulator + value}, function(accumulator,value) {return accumulator + value;},
0 // Initial value 0 // Initial value
); );
exports.product = makeNumericReducingOperator( exports.product = makeNumericReducingOperator(
function(accumulator,value) {return accumulator * value}, function(accumulator,value) {return accumulator * value;},
1 // Initial value 1 // Initial value
); );
exports.maxall = makeNumericReducingOperator( exports.maxall = makeNumericReducingOperator(
function(accumulator,value) {return Math.max(accumulator,value)}, function(accumulator,value) {return Math.max(accumulator,value);},
-Infinity // Initial value -Infinity // Initial value
); );
exports.minall = makeNumericReducingOperator( exports.minall = makeNumericReducingOperator(
function(accumulator,value) {return Math.min(accumulator,value)}, function(accumulator,value) {return Math.min(accumulator,value);},
Infinity // Initial value Infinity // Initial value
); );
exports.median = makeNumericArrayOperator( exports.median = makeNumericArrayOperator(
function(values) { function(values) {
var len = values.length, median; var len = values.length, median;
values.sort(function(a,b) {return a-b}); values.sort(function(a,b) {return a-b;});
if(len % 2) { if(len % 2) {
// Odd, return the middle number // Odd, return the middle number
median = values[(len - 1) / 2]; median = values[(len - 1) / 2];
@@ -138,7 +138,7 @@ exports.median = makeNumericArrayOperator(
); );
exports.average = makeNumericReducingOperator( exports.average = makeNumericReducingOperator(
function(accumulator,value) {return accumulator + value}, function(accumulator,value) {return accumulator + value;},
0, // Initial value 0, // Initial value
function(finalValue,numberOfValues) { function(finalValue,numberOfValues) {
return finalValue/numberOfValues; return finalValue/numberOfValues;
@@ -146,7 +146,7 @@ exports.average = makeNumericReducingOperator(
); );
exports.variance = makeNumericReducingOperator( exports.variance = makeNumericReducingOperator(
function(accumulator,value) {return accumulator + value}, function(accumulator,value) {return accumulator + value;},
0, 0,
function(finalValue,numberOfValues,originalValues) { function(finalValue,numberOfValues,originalValues) {
return getVarianceFromArray(originalValues,finalValue/numberOfValues); return getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -154,7 +154,7 @@ exports.variance = makeNumericReducingOperator(
); );
exports["standard-deviation"] = makeNumericReducingOperator( exports["standard-deviation"] = makeNumericReducingOperator(
function(accumulator,value) {return accumulator + value}, function(accumulator,value) {return accumulator + value;},
0, 0,
function(finalValue,numberOfValues,originalValues) { function(finalValue,numberOfValues,originalValues) {
var variance = getVarianceFromArray(originalValues,finalValue/numberOfValues); var variance = getVarianceFromArray(originalValues,finalValue/numberOfValues);
@@ -164,31 +164,31 @@ exports["standard-deviation"] = makeNumericReducingOperator(
//trigonometry //trigonometry
exports.cos = makeNumericBinaryOperator( exports.cos = makeNumericBinaryOperator(
function(a) {return Math.cos(a)} function(a) {return Math.cos(a);}
); );
exports.sin = makeNumericBinaryOperator( exports.sin = makeNumericBinaryOperator(
function(a) {return Math.sin(a)} function(a) {return Math.sin(a);}
); );
exports.tan = makeNumericBinaryOperator( exports.tan = makeNumericBinaryOperator(
function(a) {return Math.tan(a)} function(a) {return Math.tan(a);}
); );
exports.acos = makeNumericBinaryOperator( exports.acos = makeNumericBinaryOperator(
function(a) {return Math.acos(a)} function(a) {return Math.acos(a);}
); );
exports.asin = makeNumericBinaryOperator( exports.asin = makeNumericBinaryOperator(
function(a) {return Math.asin(a)} function(a) {return Math.asin(a);}
); );
exports.atan = makeNumericBinaryOperator( exports.atan = makeNumericBinaryOperator(
function(a) {return Math.atan(a)} function(a) {return Math.atan(a);}
); );
exports.atan2 = makeNumericBinaryOperator( exports.atan2 = makeNumericBinaryOperator(
function(a,b) {return Math.atan2(a,b)} function(a,b) {return Math.atan2(a,b);}
); );
//Calculate the variance of a population of numbers in an array given its mean //Calculate the variance of a population of numbers in an array given its mean
@@ -222,8 +222,8 @@ function makeNumericReducingOperator(fnCalc,initialValue,fnFinal) {
return []; return [];
} }
var value = result.reduce(function(accumulator,currentValue) { var value = result.reduce(function(accumulator,currentValue) {
return fnCalc(accumulator,currentValue); return fnCalc(accumulator,currentValue);
},initialValue); },initialValue);
if(fnFinal) { if(fnFinal) {
value = fnFinal(value,result.length,result); value = fnFinal(value,result.length,result);
} }

View File

@@ -21,7 +21,7 @@ exports.range = function(source,operator,options) {
} }
// Process the parts // Process the parts
var beg, end, inc, i, fixed = 0; var beg, end, inc, i, fixed = 0;
for (i=0; i<parts.length; i++) { for(i=0; i<parts.length; i++) {
// Validate real number // Validate real number
if(!/^\s*[+-]?((\d+(\.\d*)?)|(\.\d+))\s*$/.test(parts[i])) { if(!/^\s*[+-]?((\d+(\.\d*)?)|(\.\d+))\s*$/.test(parts[i])) {
return ["range: bad number \"" + parts[i] + "\""]; return ["range: bad number \"" + parts[i] + "\""];
@@ -36,10 +36,10 @@ exports.range = function(source,operator,options) {
switch(parts.length) { switch(parts.length) {
case 1: case 1:
end = parts[0]; end = parts[0];
if (end >= 1) { if(end >= 1) {
beg = 1; beg = 1;
} }
else if (end <= -1) { else if(end <= -1) {
beg = -1; beg = -1;
} }
else { else {
@@ -72,7 +72,7 @@ exports.range = function(source,operator,options) {
end += direction * 0.5 * Math.pow(0.1,fixed); end += direction * 0.5 * Math.pow(0.1,fixed);
var safety = 10010; var safety = 10010;
// Enumerate the range // Enumerate the range
if (end<beg) { if(end<beg) {
for(i=beg; i>end; i+=inc) { for(i=beg; i>end; i+=inc) {
results.push(i.toFixed(fixed)); results.push(i.toFixed(fixed));
if(--safety<0) { if(--safety<0) {

View File

@@ -15,7 +15,7 @@ Export our filter function
exports.removesuffix = function(source,operator,options) { exports.removesuffix = function(source,operator,options) {
var results = [], var results = [],
suffixes = (operator.suffixes || [])[0] || []; suffixes = (operator.suffixes || [])[0] || [];
if (!operator.operand) { if(!operator.operand) {
source(function(tiddler,title) { source(function(tiddler,title) {
results.push(title); results.push(title);
}); });

View File

@@ -15,7 +15,7 @@ Export our filter function
exports.suffix = function(source,operator,options) { exports.suffix = function(source,operator,options) {
var results = [], var results = [],
suffixes = (operator.suffixes || [])[0] || []; suffixes = (operator.suffixes || [])[0] || [];
if (!operator.operand) { if(!operator.operand) {
source(function(tiddler,title) { source(function(tiddler,title) {
results.push(title); results.push(title);
}); });

View File

@@ -24,4 +24,4 @@ exports.variables = function(source,operator,options) {
} }
} }
return names.sort(); return names.sort();
}; };

View File

@@ -7,224 +7,224 @@ Extended filter operators to manipulate the current list.
\*/ \*/
"use strict"; "use strict";
/* /*
Fetch titles from the current list Fetch titles from the current list
*/ */
var prepare_results = function (source) { var prepare_results = function (source) {
var results = []; var results = [];
source(function (tiddler, title) { source(function (tiddler, title) {
results.push(title); results.push(title);
}); });
return results; return results;
}; };
/* /*
Moves a number of items from the tail of the current list before the item named in the operand Moves a number of items from the tail of the current list before the item named in the operand
*/ */
exports.putbefore = function (source, operator) { exports.putbefore = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return (index === -1) ? return (index === -1) ?
results.slice(0, -1) : results.slice(0, -1) :
results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count)); results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
}; };
/* /*
Moves a number of items from the tail of the current list after the item named in the operand Moves a number of items from the tail of the current list after the item named in the operand
*/ */
exports.putafter = function (source, operator) { exports.putafter = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return (index === -1) ? return (index === -1) ?
results.slice(0, -1) : results.slice(0, -1) :
results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count)); results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
}; };
/* /*
Replaces the item named in the operand with a number of items from the tail of the current list Replaces the item named in the operand with a number of items from the tail of the current list
*/ */
exports.replace = function (source, operator) { exports.replace = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return (index === -1) ? return (index === -1) ?
results.slice(0, -count) : results.slice(0, -count) :
results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count)); results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
}; };
/* /*
Moves a number of items from the tail of the current list to the head of the list Moves a number of items from the tail of the current list to the head of the list
*/ */
exports.putfirst = function (source, operator) { exports.putfirst = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return results.slice(-count).concat(results.slice(0, -count)); return results.slice(-count).concat(results.slice(0, -count));
}; };
/* /*
Moves a number of items from the head of the current list to the tail of the list Moves a number of items from the head of the current list to the tail of the list
*/ */
exports.putlast = function (source, operator) { exports.putlast = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return results.slice(count).concat(results.slice(0, count)); return results.slice(count).concat(results.slice(0, count));
}; };
/* /*
Moves the item named in the operand a number of places forward or backward in the list Moves the item named in the operand a number of places forward or backward in the list
*/ */
exports.move = function (source, operator) { exports.move = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1), count = $tw.utils.getInt(operator.suffix,1),
marker = results.splice(index, 1), marker = results.splice(index, 1),
offset = (index + count) > 0 ? index + count : 0; offset = (index + count) > 0 ? index + count : 0;
return results.slice(0, offset).concat(marker).concat(results.slice(offset)); return results.slice(0, offset).concat(marker).concat(results.slice(offset));
}; };
/* /*
Returns the items from the current list that are after the item named in the operand Returns the items from the current list that are after the item named in the operand
*/ */
exports.allafter = function (source, operator) { exports.allafter = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand); index = results.indexOf(operator.operand);
return (index === -1) ? [] : return (index === -1) ? [] :
(operator.suffix) ? results.slice(index) : (operator.suffix) ? results.slice(index) :
results.slice(index + 1); results.slice(index + 1);
}; };
/* /*
Returns the items from the current list that are before the item named in the operand Returns the items from the current list that are before the item named in the operand
*/ */
exports.allbefore = function (source, operator) { exports.allbefore = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand); index = results.indexOf(operator.operand);
return (index === -1) ? [] : return (index === -1) ? [] :
(operator.suffix) ? results.slice(0, index + 1) : (operator.suffix) ? results.slice(0, index + 1) :
results.slice(0, index); results.slice(0, index);
}; };
/* /*
Appends the items listed in the operand array to the tail of the current list Appends the items listed in the operand array to the tail of the current list
*/ */
exports.append = function (source, operator) { exports.append = function (source, operator) {
var append = $tw.utils.parseStringArray(operator.operand, "true"), var append = $tw.utils.parseStringArray(operator.operand, "true"),
results = prepare_results(source), results = prepare_results(source),
count = parseInt(operator.suffix) || append.length; count = parseInt(operator.suffix) || append.length;
return (append.length === 0) ? results : return (append.length === 0) ? results :
(operator.prefix) ? results.concat(append.slice(-count)) : (operator.prefix) ? results.concat(append.slice(-count)) :
results.concat(append.slice(0, count)); results.concat(append.slice(0, count));
}; };
/* /*
Prepends the items listed in the operand array to the head of the current list Prepends the items listed in the operand array to the head of the current list
*/ */
exports.prepend = function (source, operator) { exports.prepend = function (source, operator) {
var prepend = $tw.utils.parseStringArray(operator.operand, "true"), var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
results = prepare_results(source), results = prepare_results(source),
count = $tw.utils.getInt(operator.suffix,prepend.length); count = $tw.utils.getInt(operator.suffix,prepend.length);
return (prepend.length === 0) ? results : return (prepend.length === 0) ? results :
(operator.prefix) ? prepend.slice(-count).concat(results) : (operator.prefix) ? prepend.slice(-count).concat(results) :
prepend.slice(0, count).concat(results); prepend.slice(0, count).concat(results);
}; };
/* /*
Returns all items from the current list except the items listed in the operand array Returns all items from the current list except the items listed in the operand array
*/ */
exports.remove = function (source, operator) { exports.remove = function (source, operator) {
var array = $tw.utils.parseStringArray(operator.operand, "true"), var array = $tw.utils.parseStringArray(operator.operand, "true"),
results = prepare_results(source), results = prepare_results(source),
count = parseInt(operator.suffix) || array.length, count = parseInt(operator.suffix) || array.length,
p, p,
len, len,
index; index;
len = array.length - 1; len = array.length - 1;
for (p = 0; p < count; ++p) { for(p = 0; p < count; ++p) {
if (operator.prefix) { if(operator.prefix) {
index = results.indexOf(array[len - p]); index = results.indexOf(array[len - p]);
} else { } else {
index = results.indexOf(array[p]); index = results.indexOf(array[p]);
}
if (index !== -1) {
results.splice(index, 1);
}
} }
return results; if(index !== -1) {
}; results.splice(index, 1);
}
}
return results;
};
/* /*
Returns all items from the current list sorted in the order of the items in the operand array Returns all items from the current list sorted in the order of the items in the operand array
*/ */
exports.sortby = function (source, operator) { exports.sortby = function (source, operator) {
var results = prepare_results(source); var results = prepare_results(source);
if (!results || results.length < 2) { if(!results || results.length < 2) {
return results;
}
var lookup = $tw.utils.parseStringArray(operator.operand, "true");
results.sort(function (a, b) {
return lookup.indexOf(a) - lookup.indexOf(b);
});
return results; return results;
}; }
var lookup = $tw.utils.parseStringArray(operator.operand, "true");
results.sort(function (a, b) {
return lookup.indexOf(a) - lookup.indexOf(b);
});
return results;
};
/* /*
Removes all duplicate items from the current list Removes all duplicate items from the current list
*/ */
exports.unique = function (source, operator) { exports.unique = function (source, operator) {
var results = prepare_results(source); var results = prepare_results(source);
var set = results.reduce(function (a, b) { var set = results.reduce(function (a, b) {
if (a.indexOf(b) < 0) { if(a.indexOf(b) < 0) {
a.push(b); a.push(b);
}
return a;
}, []);
return set;
};
var cycleValueInArray = function(results,operands,stepSize) {
var resultsIndex,
step = stepSize || 1,
i = 0,
opLength = operands.length,
nextOperandIndex;
for(i; i < opLength; i++) {
resultsIndex = results.indexOf(operands[i]);
if(resultsIndex !== -1) {
break;
}
} }
return a;
}, []);
return set;
};
var cycleValueInArray = function(results,operands,stepSize) {
var resultsIndex,
step = stepSize || 1,
i = 0,
opLength = operands.length,
nextOperandIndex;
for(i; i < opLength; i++) {
resultsIndex = results.indexOf(operands[i]);
if(resultsIndex !== -1) { if(resultsIndex !== -1) {
i = i + step; break;
nextOperandIndex = (i < opLength ? i : i % opLength);
if(operands.length > 1) {
results.splice(resultsIndex,1,operands[nextOperandIndex]);
} else {
results.splice(resultsIndex,1);
}
} else {
results.push(operands[0]);
} }
return results;
} }
if(resultsIndex !== -1) {
i = i + step;
nextOperandIndex = (i < opLength ? i : i % opLength);
if(operands.length > 1) {
results.splice(resultsIndex,1,operands[nextOperandIndex]);
} else {
results.splice(resultsIndex,1);
}
} else {
results.push(operands[0]);
}
return results;
};
/* /*
Toggles an item in the current list. Toggles an item in the current list.
*/ */
exports.toggle = function(source,operator) { exports.toggle = function(source,operator) {
return cycleValueInArray(prepare_results(source),operator.operands); return cycleValueInArray(prepare_results(source),operator.operands);
} };
exports.cycle = function(source,operator) { exports.cycle = function(source,operator) {
var results = prepare_results(source), var results = prepare_results(source),
operands = (operator.operand.length ? $tw.utils.parseStringArray(operator.operand, "true") : [""]), operands = (operator.operand.length ? $tw.utils.parseStringArray(operator.operand, "true") : [""]),
step = $tw.utils.getInt(operator.operands[1]||"",1); step = $tw.utils.getInt(operator.operands[1]||"",1);
if(step < 0) { if(step < 0) {
operands.reverse(); operands.reverse();
step = Math.abs(step); step = Math.abs(step);
}
return cycleValueInArray(results,operands,step);
} }
return cycleValueInArray(results,operands,step);
};

View File

@@ -46,7 +46,7 @@ function BackSubIndexer(indexer,extractor) {
BackSubIndexer.prototype.init = function() { BackSubIndexer.prototype.init = function() {
// lazy init until first lookup // lazy init until first lookup
this.index = null; this.index = null;
} };
BackSubIndexer.prototype._init = function() { BackSubIndexer.prototype._init = function() {
this.index = Object.create(null); this.index = Object.create(null);
@@ -60,11 +60,11 @@ BackSubIndexer.prototype._init = function() {
self.index[target][sourceTitle] = true; self.index[target][sourceTitle] = true;
}); });
}); });
} };
BackSubIndexer.prototype.rebuild = function() { BackSubIndexer.prototype.rebuild = function() {
this.index = null; this.index = null;
} };
/* /*
* Get things that is being referenced in the text, e.g. tiddler names in the link syntax. * Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
@@ -78,7 +78,7 @@ BackSubIndexer.prototype._getTarget = function(tiddler) {
return this.wiki[this.extractor](parser.tree, tiddler.fields.title); return this.wiki[this.extractor](parser.tree, tiddler.fields.title);
} }
return []; return [];
} };
BackSubIndexer.prototype.update = function(updateDescriptor) { BackSubIndexer.prototype.update = function(updateDescriptor) {
// lazy init/update until first lookup // lazy init/update until first lookup
@@ -86,8 +86,8 @@ BackSubIndexer.prototype.update = function(updateDescriptor) {
return; return;
} }
var newTargets = [], var newTargets = [],
oldTargets = [], oldTargets = [],
self = this; self = this;
if(updateDescriptor.old.exists) { if(updateDescriptor.old.exists) {
oldTargets = this._getTarget(updateDescriptor.old.tiddler); oldTargets = this._getTarget(updateDescriptor.old.tiddler);
} }
@@ -106,7 +106,7 @@ BackSubIndexer.prototype.update = function(updateDescriptor) {
} }
self.index[target][updateDescriptor.new.tiddler.fields.title] = true; self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
}); });
} };
BackSubIndexer.prototype.lookup = function(title) { BackSubIndexer.prototype.lookup = function(title) {
if(!this.index) { if(!this.index) {
@@ -117,6 +117,6 @@ BackSubIndexer.prototype.lookup = function(title) {
} else { } else {
return []; return [];
} }
} };
exports.BackIndexer = BackIndexer; exports.BackIndexer = BackIndexer;

View File

@@ -19,7 +19,7 @@ FieldIndexer.prototype.init = function() {
this.index = null; this.index = null;
this.maxIndexedValueLength = DEFAULT_MAXIMUM_INDEXED_VALUE_LENGTH; this.maxIndexedValueLength = DEFAULT_MAXIMUM_INDEXED_VALUE_LENGTH;
this.addIndexMethods(); this.addIndexMethods();
} };
// Provided for testing // Provided for testing
FieldIndexer.prototype.setMaxIndexedValueLength = function(length) { FieldIndexer.prototype.setMaxIndexedValueLength = function(length) {
@@ -33,14 +33,14 @@ FieldIndexer.prototype.addIndexMethods = function() {
this.wiki.each.byField = function(name,value) { this.wiki.each.byField = function(name,value) {
var lookup = self.lookup(name,value); var lookup = self.lookup(name,value);
return lookup && lookup.filter(function(title) { return lookup && lookup.filter(function(title) {
return self.wiki.tiddlerExists(title) return self.wiki.tiddlerExists(title);
}); });
}; };
// get shadow tiddlers, including shadow tiddlers that is overwritten // get shadow tiddlers, including shadow tiddlers that is overwritten
this.wiki.eachShadow.byField = function(name,value) { this.wiki.eachShadow.byField = function(name,value) {
var lookup = self.lookup(name,value); var lookup = self.lookup(name,value);
return lookup && lookup.filter(function(title) { return lookup && lookup.filter(function(title) {
return self.wiki.isShadowTiddler(title) return self.wiki.isShadowTiddler(title);
}); });
}; };
this.wiki.eachTiddlerPlusShadows.byField = function(name,value) { this.wiki.eachTiddlerPlusShadows.byField = function(name,value) {

View File

@@ -14,12 +14,12 @@ exports.getInfoTiddlerFields = function(updateInfoTiddlersCallback) {
this.updateCallback = updateCallback; this.updateCallback = updateCallback;
this.resizeHandlers = new Map(); this.resizeHandlers = new Map();
this.dimensionsInfo = [ this.dimensionsInfo = [
["outer/width", win => win.outerWidth], ["outer/width", (win) => win.outerWidth],
["outer/height", win => win.outerHeight], ["outer/height", (win) => win.outerHeight],
["inner/width", win => win.innerWidth], ["inner/width", (win) => win.innerWidth],
["inner/height", win => win.innerHeight], ["inner/height", (win) => win.innerHeight],
["client/width", win => win.document.documentElement.clientWidth], ["client/width", (win) => win.document.documentElement.clientWidth],
["client/height", win => win.document.documentElement.clientHeight] ["client/height", (win) => win.document.documentElement.clientHeight]
]; ];
} }

View File

@@ -140,7 +140,7 @@ function KeyboardManager(options) {
this.shortcutParsedList = []; // Stores the parsed key descriptors this.shortcutParsedList = []; // Stores the parsed key descriptors
this.shortcutPriorityList = []; // Stores the parsed shortcut priority this.shortcutPriorityList = []; // Stores the parsed shortcut priority
this.lookupNames = ["shortcuts"]; this.lookupNames = ["shortcuts"];
this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac") this.lookupNames.push($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac");
this.lookupNames.push($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows"); this.lookupNames.push($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows");
this.lookupNames.push($tw.platform.isLinux ? "shortcuts-linux" : "shortcuts-not-linux"); this.lookupNames.push($tw.platform.isLinux ? "shortcuts-linux" : "shortcuts-not-linux");
this.updateShortcutLists(this.getShortcutTiddlerList()); this.updateShortcutLists(this.getShortcutTiddlerList());
@@ -161,7 +161,7 @@ KeyboardManager.prototype.getModifierKeys = function() {
91, // Meta (left) 91, // Meta (left)
93, // Meta (right) 93, // Meta (right)
224 // Meta (Firefox) 224 // Meta (Firefox)
] ];
}; };
/* /*
@@ -187,8 +187,7 @@ KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor,options) {
metaKey: false metaKey: false
}; };
for(var t=0; t<components.length; t++) { for(var t=0; t<components.length; t++) {
var s = components[t].toLowerCase(), var s = components[t].toLowerCase();
c = s.charCodeAt(0);
// Look for modifier keys // Look for modifier keys
if(s === "ctrl") { if(s === "ctrl") {
info.ctrlKey = true; info.ctrlKey = true;
@@ -266,7 +265,7 @@ KeyboardManager.prototype.getPrintableShortcuts = function(keyInfoArray) {
} }
}); });
return result; return result;
} };
KeyboardManager.prototype.checkKeyDescriptor = function(event,keyInfo) { KeyboardManager.prototype.checkKeyDescriptor = function(event,keyInfo) {
return keyInfo && return keyInfo &&
@@ -293,15 +292,15 @@ KeyboardManager.prototype.getMatchingKeyDescriptor = function(event,keyInfoArray
KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) { KeyboardManager.prototype.getEventModifierKeyDescriptor = function(event) {
return event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey ? "ctrl" : return event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey ? "ctrl" :
event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey ? "shift" : event.shiftKey && !event.ctrlKey && !event.altKey && !event.metaKey ? "shift" :
event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" : event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey ? "ctrl-shift" :
event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" : event.altKey && !event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt" :
event.altKey && event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt-shift" : event.altKey && event.shiftKey && !event.ctrlKey && !event.metaKey ? "alt-shift" :
event.altKey && event.ctrlKey && !event.shiftKey && !event.metaKey ? "ctrl-alt" : event.altKey && event.ctrlKey && !event.shiftKey && !event.metaKey ? "ctrl-alt" :
event.altKey && event.shiftKey && event.ctrlKey && !event.metaKey ? "ctrl-alt-shift" : event.altKey && event.shiftKey && event.ctrlKey && !event.metaKey ? "ctrl-alt-shift" :
event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" : event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey ? "meta" :
event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" : event.metaKey && event.ctrlKey && !event.shiftKey && !event.altKey ? "meta-ctrl" :
event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" : event.metaKey && event.ctrlKey && event.shiftKey && !event.altKey ? "meta-ctrl-shift" :
event.metaKey && event.ctrlKey && event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal"; event.metaKey && event.ctrlKey && event.shiftKey && event.altKey ? "meta-ctrl-alt-shift" : "normal";
}; };
KeyboardManager.prototype.getShortcutTiddlerList = function() { KeyboardManager.prototype.getShortcutTiddlerList = function() {
@@ -371,8 +370,8 @@ KeyboardManager.prototype.handleShortcutChanges = function(changedTiddlers) {
var newList = this.getShortcutTiddlerList(); var newList = this.getShortcutTiddlerList();
var hasChanged = $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) ? true : var hasChanged = $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) ? true :
($tw.utils.hopArray(changedTiddlers,newList) ? true : ($tw.utils.hopArray(changedTiddlers,newList) ? true :
(this.detectNewShortcuts(changedTiddlers)) (this.detectNewShortcuts(changedTiddlers))
); );
// Re-cache shortcuts if something changed // Re-cache shortcuts if something changed
if(hasChanged) { if(hasChanged) {
this.updateShortcutLists(newList); this.updateShortcutLists(newList);

View File

@@ -24,8 +24,7 @@ exports.params = [
Run the macro Run the macro
*/ */
exports.run = function(filter,format) { exports.run = function(filter,format) {
var self = this, var tiddlers = this.wiki.filterTiddlers(filter),
tiddlers = this.wiki.filterTiddlers(filter),
tiddler, tiddler,
fields = [], fields = [],
t,f; t,f;
@@ -46,24 +45,24 @@ exports.run = function(filter,format) {
var p = fields.indexOf(value); var p = fields.indexOf(value);
if(p !== -1) { if(p !== -1) {
fields.splice(p,1); fields.splice(p,1);
fields.unshift(value) fields.unshift(value);
} }
}); });
// Output the column headings // Output the column headings
var output = [], row = []; var output = [], row = [];
fields.forEach(function(value) { fields.forEach(function(value) {
row.push(quoteAndEscape(value)) row.push(quoteAndEscape(value));
}); });
output.push(row.join(",")); output.push(row.join(","));
// Output each tiddler // Output each tiddler
for(var t=0;t<tiddlers.length; t++) { for(var t=0;t<tiddlers.length; t++) {
row = []; row = [];
tiddler = this.wiki.getTiddler(tiddlers[t]); tiddler = this.wiki.getTiddler(tiddlers[t]);
if(tiddler) { if(tiddler) {
for(f=0; f<fields.length; f++) { for(f=0; f<fields.length; f++) {
row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : "")); row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
} }
} }
output.push(row.join(",")); output.push(row.join(","));
} }
return output.join("\n"); return output.join("\n");

View File

@@ -31,8 +31,8 @@ exports.run = function(shortcuts,prefix,separator,suffix) {
})); }));
if(shortcutArray.length > 0) { if(shortcutArray.length > 0) {
shortcutArray.sort(function(a,b) { shortcutArray.sort(function(a,b) {
return a.toLowerCase().localeCompare(b.toLowerCase()); return a.toLowerCase().localeCompare(b.toLowerCase());
}) });
return prefix + shortcutArray.join(separator) + suffix; return prefix + shortcutArray.join(separator) + suffix;
} else { } else {
return ""; return "";

View File

@@ -7,19 +7,17 @@ The audio parser parses an audio tiddler into an embeddable HTML element
\*/ \*/
/*jslint node: true, browser: true */
/*global $tw: false */
"use strict"; "use strict";
var AudioParser = function(type,text,options) { var AudioParser = function(type,text,options) {
var element = { var element = {
type: "element", type: "element",
tag: "$audio", // Using $audio to enable widget interception tag: "$audio", // Using $audio to enable widget interception
attributes: { attributes: {
controls: {type: "string", value: "controls"}, controls: {type: "string", value: "controls"},
style: {type: "string", value: "width: 100%; object-fit: contain"} style: {type: "string", value: "width: 100%; object-fit: contain"}
} }
}; };
// Pass through source information // Pass through source information
if(options._canonical_uri) { if(options._canonical_uri) {

View File

@@ -59,7 +59,7 @@ var BinaryParser = function(type,text,options) {
class: {type: "string", value: "tc-binary-warning"} class: {type: "string", value: "tc-binary-warning"}
}, },
children: [warn, link] children: [warn, link]
} };
this.tree = [element]; this.tree = [element];
this.source = text; this.source = text;
this.type = type; this.type = type;

View File

@@ -45,7 +45,7 @@ var CsvParser = function(type,text,options) {
row.children.push({ row.children.push({
"type": "element", "tag": tag, "children": [{ "type": "element", "tag": tag, "children": [{
"type": "text", "type": "text",
"text": columns[column] || '' "text": columns[column] || ""
}] }]
}); });
} }

View File

@@ -45,7 +45,7 @@ exports.parseWhiteSpace = function(source,pos) {
type: "whitespace", type: "whitespace",
start: pos, start: pos,
end: p end: p
} };
} }
}; };
@@ -170,7 +170,7 @@ exports.parseMacroParameters = function(node,source,pos) {
} }
node.end = pos; node.end = pos;
return node; return node;
} };
/* /*
Look for a macro invocation parameter. Returns null if not found, or {type: "macro-parameter", name:, value:, start:, end:} Look for a macro invocation parameter. Returns null if not found, or {type: "macro-parameter", name:, value:, start:, end:}
@@ -192,16 +192,16 @@ exports.parseMacroParameter = function(source,pos) {
pos = token.end; pos = token.end;
// Get the parameter details // Get the parameter details
node.value = token.match[2] !== undefined ? token.match[2] : ( node.value = token.match[2] !== undefined ? token.match[2] : (
token.match[3] !== undefined ? token.match[3] : ( token.match[3] !== undefined ? token.match[3] : (
token.match[4] !== undefined ? token.match[4] : ( token.match[4] !== undefined ? token.match[4] : (
token.match[5] !== undefined ? token.match[5] : ( token.match[5] !== undefined ? token.match[5] : (
token.match[6] !== undefined ? token.match[6] : ( token.match[6] !== undefined ? token.match[6] : (
"" ""
)
)
)
) )
); )
)
)
);
if(token.match[1]) { if(token.match[1]) {
node.name = token.match[1]; node.name = token.match[1];
} }

View File

@@ -11,11 +11,10 @@ The PDF parser embeds a PDF viewer
var ImageParser = function(type,text,options) { var ImageParser = function(type,text,options) {
var element = { var element = {
type: "element", type: "element",
tag: "iframe", tag: "iframe",
attributes: {} attributes: {}
}, };
src;
if(options._canonical_uri) { if(options._canonical_uri) {
element.attributes.src = {type: "string", value: options._canonical_uri}; element.attributes.src = {type: "string", value: options._canonical_uri};
} else if(text) { } else if(text) {

View File

@@ -11,14 +11,13 @@ The video parser parses a video tiddler into an embeddable HTML element
var VideoParser = function(type,text,options) { var VideoParser = function(type,text,options) {
var element = { var element = {
type: "element", type: "element",
tag: "video", tag: "video",
attributes: { attributes: {
controls: {type: "string", value: "controls"}, controls: {type: "string", value: "controls"},
style: {type: "string", value: "width: 100%; object-fit: contain"} style: {type: "string", value: "width: 100%; object-fit: contain"}
} }
}, };
src;
if(options._canonical_uri) { if(options._canonical_uri) {
element.attributes.src = {type: "string", value: options._canonical_uri}; element.attributes.src = {type: "string", value: options._canonical_uri};
} else if(text) { } else if(text) {

View File

@@ -46,10 +46,10 @@ exports.parse = function() {
} }
// Return the $codeblock widget // Return the $codeblock widget
return [{ return [{
type: "codeblock", type: "codeblock",
attributes: { attributes: {
code: {type: "string", value: text, start: codeStart, end: this.parser.pos}, code: {type: "string", value: text, start: codeStart, end: this.parser.pos},
language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd} language: {type: "string", value: this.match[1], start: languageStart, end: languageEnd}
} }
}]; }];
}; };

View File

@@ -51,10 +51,10 @@ exports.parse = function() {
var commentStart = this.match.index; var commentStart = this.match.index;
var commentEnd = this.endMatch.index + this.endMatch[0].length; var commentEnd = this.endMatch.index + this.endMatch[0].length;
return [{ return [{
type: "void", type: "void",
children: [], children: [],
text: this.parser.source.slice(commentStart, commentEnd), text: this.parser.source.slice(commentStart, commentEnd),
start: commentStart, start: commentStart,
end: commentEnd end: commentEnd
}]; }];
}; };

View File

@@ -44,9 +44,9 @@ exports.parse = function() {
var commentStart = this.match.index; var commentStart = this.match.index;
var commentEnd = this.endMatch.index + this.endMatch[0].length; var commentEnd = this.endMatch.index + this.endMatch[0].length;
return [{ return [{
type: "void", type: "void",
text: this.parser.source.slice(commentStart, commentEnd), text: this.parser.source.slice(commentStart, commentEnd),
start: commentStart, start: commentStart,
end: commentEnd end: commentEnd
}]; }];
}; };

View File

@@ -95,7 +95,7 @@ exports.parseIfClause = function(filterCondition) {
hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g); hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
// If we found an else then we need to parse the body looking for the endif // If we found an else then we need to parse the body looking for the endif
var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>", var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>",
ex; ex;
if(hasLineBreak) { if(hasLineBreak) {
ex = this.parser.parseBlocksTerminatedExtended(reEndString); ex = this.parser.parseBlocksTerminatedExtended(reEndString);
} else { } else {

View File

@@ -26,8 +26,6 @@ exports.init = function(parser) {
Parse the most recent match Parse the most recent match
*/ */
exports.parse = function() { exports.parse = function() {
// Get all the details of the match
var entityString = this.match[1];
// Move past the macro call // Move past the macro call
this.parser.pos = this.matchRegExp.lastIndex; this.parser.pos = this.matchRegExp.lastIndex;
// Return the entity // Return the entity

View File

@@ -29,7 +29,6 @@ exports.init = function(parser) {
Parse the most recent match Parse the most recent match
*/ */
exports.parse = function() { exports.parse = function() {
var self = this;
// Move past the pragma invocation // Move past the pragma invocation
this.parser.pos = this.matchRegExp.lastIndex; this.parser.pos = this.matchRegExp.lastIndex;
// Parse the filter terminated by a line break // Parse the filter terminated by a line break

View File

@@ -93,7 +93,7 @@ exports.parseLink = function(source,pos) {
splitPos = null; splitPos = null;
} }
// Pull out the tooltip and URL // Pull out the tooltip and URL
var tooltip, URL, urlStart; var URL, urlStart;
textNode.start = pos; textNode.start = pos;
if(splitPos) { if(splitPos) {
urlStart = splitPos + 1; urlStart = splitPos + 1;

View File

@@ -67,5 +67,5 @@ exports.parse = function() {
return [{ return [{
type: "void", type: "void",
children: tree children: tree
}] }];
}; };

View File

@@ -60,7 +60,7 @@ var processRow = function(prevColumns) {
// End of row // End of row
if(prevCell && colSpanCount > 1) { if(prevCell && colSpanCount > 1) {
if(prevCell.attributes && prevCell.attributes && prevCell.attributes.colspan) { if(prevCell.attributes && prevCell.attributes && prevCell.attributes.colspan) {
colSpanCount += prevCell.attributes.colspan.value; colSpanCount += prevCell.attributes.colspan.value;
} else { } else {
colSpanCount -= 1; colSpanCount -= 1;
} }
@@ -163,7 +163,7 @@ exports.parse = function() {
table.children.splice(0,0,rowContainer); // Insert it at the bottom table.children.splice(0,0,rowContainer); // Insert it at the bottom
} }
// Set the alignment - TODO: figure out why TW did this // Set the alignment - TODO: figure out why TW did this
// rowContainer.attributes.align = rowCount === 0 ? "top" : "bottom"; // rowContainer.attributes.align = rowCount === 0 ? "top" : "bottom";
// Parse the caption // Parse the caption
rowContainer.children = this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true}); rowContainer.children = this.parser.parseInlineRun(rowTermRegExp,{eatTerminator: true});
} else { } else {

View File

@@ -32,17 +32,17 @@ exports.parse = function() {
params = this.match[3] ? this.match[3].split("|") : []; params = this.match[3] ? this.match[3].split("|") : [];
// Prepare the transclude widget // Prepare the transclude widget
var transcludeNode = { var transcludeNode = {
type: "transclude", type: "transclude",
attributes: {}, attributes: {},
isBlock: true isBlock: true
}; };
$tw.utils.each(params,function(paramValue,index) { $tw.utils.each(params,function(paramValue,index) {
var name = "" + index; var name = "" + index;
transcludeNode.attributes[name] = { transcludeNode.attributes[name] = {
name: name, name: name,
type: "string", type: "string",
value: paramValue value: paramValue
} };
}); });
// Prepare the tiddler widget // Prepare the tiddler widget
var tr, targetTitle, targetField, targetIndex, tiddlerNode; var tr, targetTitle, targetField, targetIndex, tiddlerNode;

View File

@@ -32,16 +32,16 @@ exports.parse = function() {
params = this.match[3] ? this.match[3].split("|") : []; params = this.match[3] ? this.match[3].split("|") : [];
// Prepare the transclude widget // Prepare the transclude widget
var transcludeNode = { var transcludeNode = {
type: "transclude", type: "transclude",
attributes: {} attributes: {}
}; };
$tw.utils.each(params,function(paramValue,index) { $tw.utils.each(params,function(paramValue,index) {
var name = "" + index; var name = "" + index;
transcludeNode.attributes[name] = { transcludeNode.attributes[name] = {
name: name, name: name,
type: "string", type: "string",
value: paramValue value: paramValue
} };
}); });
// Prepare the tiddler widget // Prepare the tiddler widget
var tr, targetTitle, targetField, targetIndex, tiddlerNode; var tr, targetTitle, targetField, targetIndex, tiddlerNode;

View File

@@ -25,8 +25,6 @@ $$$
"use strict"; "use strict";
var widget = require("$:/core/modules/widgets/widget.js");
exports.name = "typedblock"; exports.name = "typedblock";
exports.types = {block: true}; exports.types = {block: true};

View File

@@ -49,8 +49,7 @@ PluginSwitcher.prototype.switchPlugins = function() {
var tiddler = self.wiki.getTiddler(title); var tiddler = self.wiki.getTiddler(title);
if(tiddler && tiddler.isPlugin() && plugins.indexOf(title) === -1) { if(tiddler && tiddler.isPlugin() && plugins.indexOf(title) === -1) {
plugins.push(title); plugins.push(title);
var pluginInfo = $tw.utils.parseJSONSafe(self.wiki.getTiddlerText(title)), var dependents = $tw.utils.parseStringArray(tiddler.fields.dependents || "");
dependents = $tw.utils.parseStringArray(tiddler.fields.dependents || "");
$tw.utils.each(dependents,function(title) { $tw.utils.each(dependents,function(title) {
accumulatePlugin(title); accumulatePlugin(title);
}); });
@@ -58,11 +57,11 @@ PluginSwitcher.prototype.switchPlugins = function() {
}; };
accumulatePlugin(selectedPluginTitle); accumulatePlugin(selectedPluginTitle);
// Read the plugin info for the incoming plugins // Read the plugin info for the incoming plugins
var changes = $tw.wiki.readPluginInfo(plugins); $tw.wiki.readPluginInfo(plugins);
// Unregister any existing theme tiddlers // Unregister any existing theme tiddlers
var unregisteredTiddlers = $tw.wiki.unregisterPluginTiddlers(this.pluginType); $tw.wiki.unregisterPluginTiddlers(this.pluginType);
// Register any new theme tiddlers // Register any new theme tiddlers
var registeredTiddlers = $tw.wiki.registerPluginTiddlers(this.pluginType,plugins); $tw.wiki.registerPluginTiddlers(this.pluginType,plugins);
// Unpack the current theme tiddlers // Unpack the current theme tiddlers
$tw.wiki.unpackPluginTiddlers(); $tw.wiki.unpackPluginTiddlers();
// Call the switch handler // Call the switch handler

View File

@@ -32,10 +32,10 @@ function SaverHandler(options) {
this.filterFn = this.wiki.compileFilter(this.wiki.getTiddlerText(this.titleSyncFilter)); this.filterFn = this.wiki.compileFilter(this.wiki.getTiddlerText(this.titleSyncFilter));
// Count of changes that have not yet been saved // Count of changes that have not yet been saved
var filteredChanges = self.filterFn.call(self.wiki,function(iterator) { var filteredChanges = self.filterFn.call(self.wiki,function(iterator) {
$tw.utils.each(self.preloadDirty,function(title) { $tw.utils.each(self.preloadDirty,function(title) {
var tiddler = self.wiki.getTiddler(title); var tiddler = self.wiki.getTiddler(title);
iterator(tiddler,title); iterator(tiddler,title);
}); });
}); });
this.numChanges = filteredChanges.length; this.numChanges = filteredChanges.length;
// Listen out for changes to tiddlers // Listen out for changes to tiddlers

View File

@@ -15,27 +15,27 @@ var AndTidWiki = function(wiki) {
AndTidWiki.prototype.save = function(text,method,callback,options) { AndTidWiki.prototype.save = function(text,method,callback,options) {
var filename = options && options.variables ? options.variables.filename : null; var filename = options && options.variables ? options.variables.filename : null;
if (method === "download") { if(method === "download") {
// Support download // Support download
if (window.twi.saveDownload) { if(window.twi.saveDownload) {
try { try {
window.twi.saveDownload(text,filename); window.twi.saveDownload(text,filename);
} catch(err) { } catch(err) {
if (err.message === "Method not found") { if(err.message === "Method not found") {
window.twi.saveDownload(text); window.twi.saveDownload(text);
} }
} }
} else { } else {
var link = document.createElement("a"); var link = document.createElement("a");
link.setAttribute("href","data:text/plain," + encodeURIComponent(text)); link.setAttribute("href","data:text/plain," + encodeURIComponent(text));
if (filename) { if(filename) {
link.setAttribute("download",filename); link.setAttribute("download",filename);
} }
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
document.body.removeChild(link); document.body.removeChild(link);
} }
} else if (window.twi.saveWiki) { } else if(window.twi.saveWiki) {
// Direct save in Tiddloid // Direct save in Tiddloid
window.twi.saveWiki(text); window.twi.saveWiki(text);
} else { } else {

View File

@@ -22,7 +22,7 @@ var findSaver = function(window) {
console.log({ msg: "custom saver is disabled", reason: err }); console.log({ msg: "custom saver is disabled", reason: err });
return null; return null;
} }
} };
var saver = findSaver(window) || findSaver(window.parent) || {}; var saver = findSaver(window) || findSaver(window.parent) || {};
var CustomSaver = function(wiki) { var CustomSaver = function(wiki) {

View File

@@ -80,7 +80,7 @@ GiteaSaver.prototype.save = function(text,method,callback) {
callback: function(err,getResponseDataJson,xhr) { callback: function(err,getResponseDataJson,xhr) {
if(xhr.status === 404) { if(xhr.status === 404) {
callback("Please ensure the branch in the Gitea repo exists"); callback("Please ensure the branch in the Gitea repo exists");
}else{ } else {
data["branch"] = branch; data["branch"] = branch;
self.upload(uri + filename, use_put?"PUT":"POST", headers, data, callback); self.upload(uri + filename, use_put?"PUT":"POST", headers, data, callback);
} }
@@ -101,7 +101,6 @@ GiteaSaver.prototype.upload = function(uri,method,headers,data,callback) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
callback(null); callback(null);
} }
}); });

View File

@@ -17,8 +17,7 @@ var GitHubSaver = function(wiki) {
}; };
GitHubSaver.prototype.save = function(text,method,callback) { GitHubSaver.prototype.save = function(text,method,callback) {
var self = this, var username = this.wiki.getTiddlerText("$:/GitHub/Username"),
username = this.wiki.getTiddlerText("$:/GitHub/Username"),
password = $tw.utils.getPassword("github"), password = $tw.utils.getPassword("github"),
repo = this.wiki.getTiddlerText("$:/GitHub/Repo"), repo = this.wiki.getTiddlerText("$:/GitHub/Repo"),
path = this.wiki.getTiddlerText("$:/GitHub/Path",""), path = this.wiki.getTiddlerText("$:/GitHub/Path",""),
@@ -81,7 +80,6 @@ GitHubSaver.prototype.save = function(text,method,callback) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
callback(null); callback(null);
} }
}); });

View File

@@ -18,8 +18,7 @@ var GitLabSaver = function(wiki) {
GitLabSaver.prototype.save = function(text,method,callback) { GitLabSaver.prototype.save = function(text,method,callback) {
/* See https://docs.gitlab.com/ee/api/repository_files.html */ /* See https://docs.gitlab.com/ee/api/repository_files.html */
var self = this, var username = this.wiki.getTiddlerText("$:/GitLab/Username"),
username = this.wiki.getTiddlerText("$:/GitLab/Username"),
password = $tw.utils.getPassword("gitlab"), password = $tw.utils.getPassword("gitlab"),
repo = this.wiki.getTiddlerText("$:/GitLab/Repo"), repo = this.wiki.getTiddlerText("$:/GitLab/Repo"),
path = this.wiki.getTiddlerText("$:/GitLab/Path",""), path = this.wiki.getTiddlerText("$:/GitLab/Path",""),
@@ -45,7 +44,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
var uri = endpoint + "/projects/" + encodeURIComponent(repo) + "/repository/"; var uri = endpoint + "/projects/" + encodeURIComponent(repo) + "/repository/";
// Perform a get request to get the details (inc shas) of files in the same path as our file // Perform a get request to get the details (inc shas) of files in the same path as our file
$tw.utils.httpRequest({ $tw.utils.httpRequest({
url: uri + "tree/?path=" + encodeURIComponent(path.replace(/^\/+|\/$/g, '')) + "&branch=" + encodeURIComponent(branch.replace(/^\/+|\/$/g, '')), url: uri + "tree/?path=" + encodeURIComponent(path.replace(/^\/+|\/$/g, "")) + "&branch=" + encodeURIComponent(branch.replace(/^\/+|\/$/g, "")),
type: "GET", type: "GET",
headers: headers, headers: headers,
callback: function(err,getResponseDataJson,xhr) { callback: function(err,getResponseDataJson,xhr) {
@@ -71,7 +70,7 @@ GitLabSaver.prototype.save = function(text,method,callback) {
}; };
// Perform a request to save the file // Perform a request to save the file
$tw.utils.httpRequest({ $tw.utils.httpRequest({
url: uri + "files/" + encodeURIComponent(path.replace(/^\/+/, '') + filename), url: uri + "files/" + encodeURIComponent(path.replace(/^\/+/, "") + filename),
type: requestType, type: requestType,
headers: headers, headers: headers,
data: JSON.stringify(data), data: JSON.stringify(data),
@@ -79,7 +78,6 @@ GitLabSaver.prototype.save = function(text,method,callback) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
var putResponseData = $tw.utils.parseJSONSafe(putResponseDataJson);
callback(null); callback(null);
} }
}); });

View File

@@ -94,7 +94,7 @@ PutSaver.prototype.save = function(text,method,callback) {
} else if(status === 403) { // permission denied } else if(status === 403) { // permission denied
errorMsg = $tw.language.getString("Error/PutForbidden"); errorMsg = $tw.language.getString("Error/PutForbidden");
} }
if (xhr.responseText) { if(xhr.responseText) {
// treat any server response like a plain text error explanation // treat any server response like a plain text error explanation
errorMsg = errorMsg + "\n\n" + xhr.responseText; errorMsg = errorMsg + "\n\n" + xhr.responseText;
} }

View File

@@ -28,7 +28,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
uploadWithUrlOnly = this.wiki.getTextReference("$:/UploadWithUrlOnly") || "no", uploadWithUrlOnly = this.wiki.getTextReference("$:/UploadWithUrlOnly") || "no",
url = this.wiki.getTextReference("$:/UploadURL"); url = this.wiki.getTextReference("$:/UploadURL");
// Bail out if we don't have the bits we need // Bail out if we don't have the bits we need
if (uploadWithUrlOnly === "yes") { if(uploadWithUrlOnly === "yes") {
// The url is good enough. No need for a username and password. // The url is good enough. No need for a username and password.
// Assume the server uses some other kind of auth mechanism. // Assume the server uses some other kind of auth mechanism.
if(!url || url.toString().trim() === "") { if(!url || url.toString().trim() === "") {
@@ -48,7 +48,6 @@ UploadSaver.prototype.save = function(text,method,callback) {
} }
// Assemble the header // Assemble the header
var boundary = "---------------------------" + "AaB03x"; var boundary = "---------------------------" + "AaB03x";
var uploadFormName = "UploadPlugin";
var head = []; var head = [];
head.push("--" + boundary + "\r\nContent-disposition: form-data; name=\"UploadPlugin\"\r\n"); head.push("--" + boundary + "\r\nContent-disposition: form-data; name=\"UploadPlugin\"\r\n");
head.push("backupDir=" + backupDir + ";user=" + username + ";password=" + password + ";uploaddir=" + uploadDir + ";;"); head.push("backupDir=" + backupDir + ";user=" + username + ";password=" + password + ";uploaddir=" + uploadDir + ";;");

View File

@@ -59,7 +59,7 @@ function loadIFrame(url,callback) {
Unload library iframe for given url Unload library iframe for given url
*/ */
function unloadIFrame(url){ function unloadIFrame(url){
var iframes = document.getElementsByTagName('iframe'); var iframes = document.getElementsByTagName("iframe");
for(var t=iframes.length-1; t--; t>=0) { for(var t=iframes.length-1; t--; t>=0) {
var iframe = iframes[t]; var iframe = iframes[t];
if(iframe.getAttribute("library") === "true" && if(iframe.getAttribute("library") === "true" &&

View File

@@ -40,7 +40,7 @@ $tw.eventBus = {
emit(event,data) { emit(event,data) {
const listeners = this.listenersMap.get(event); const listeners = this.listenersMap.get(event);
if(listeners) { if(listeners) {
listeners.forEach(fn => fn(data)); listeners.forEach((fn) => fn(data));
} }
} }
}; };

View File

@@ -27,7 +27,7 @@ exports.startup = function() {
faviconLink.setAttribute("href",dataURI); faviconLink.setAttribute("href",dataURI);
$tw.faviconPublisher.send({verb: "FAVICON",body: dataURI}); $tw.faviconPublisher.send({verb: "FAVICON",body: dataURI});
} }
} };
$tw.faviconPublisher = new $tw.utils.BrowserMessagingPublisher({type: "FAVICON", onsubscribe: setFavicon}); $tw.faviconPublisher = new $tw.utils.BrowserMessagingPublisher({type: "FAVICON", onsubscribe: setFavicon});
// Set up the favicon // Set up the favicon
setFavicon(); setFavicon();

View File

@@ -31,7 +31,6 @@ exports.startup = function() {
if(requiresReload) { if(requiresReload) {
requireReloadDueToPluginChange = true; requireReloadDueToPluginChange = true;
} else if(tiddler) { } else if(tiddler) {
var pluginType = tiddler.fields["plugin-type"];
if($tw.wiki.getTiddlerText(PREFIX_CONFIG_REGISTER_PLUGIN_TYPE + (tiddler.fields["plugin-type"] || ""),"no") === "yes") { if($tw.wiki.getTiddlerText(PREFIX_CONFIG_REGISTER_PLUGIN_TYPE + (tiddler.fields["plugin-type"] || ""),"no") === "yes") {
changesToProcess.push(title); changesToProcess.push(title);
} }

View File

@@ -68,7 +68,7 @@ exports.startup = function() {
$tw.utils.addClass($tw.pageContainer,"tc-page-container-wrapper"); $tw.utils.addClass($tw.pageContainer,"tc-page-container-wrapper");
document.body.insertBefore($tw.pageContainer,document.body.firstChild); document.body.insertBefore($tw.pageContainer,document.body.firstChild);
$tw.pageWidgetNode.render($tw.pageContainer,null); $tw.pageWidgetNode.render($tw.pageContainer,null);
$tw.hooks.invokeHook("th-page-refreshed"); $tw.hooks.invokeHook("th-page-refreshed");
})(); })();
// Remove any splash screen elements // Remove any splash screen elements
var removeList = document.querySelectorAll(".tc-remove-when-wiki-loaded"); var removeList = document.querySelectorAll(".tc-remove-when-wiki-loaded");

View File

@@ -81,7 +81,7 @@ exports.startup = function() {
$tw.rootWidget.addEventListener("tm-focus-selector",function(event) { $tw.rootWidget.addEventListener("tm-focus-selector",function(event) {
var selector = event.param || "", var selector = event.param || "",
element, element,
baseElement = event.event && event.event.target ? event.event.target.ownerDocument : document; baseElement = event.event && event.event.target ? event.event.target.ownerDocument : document;
element = $tw.utils.querySelectorSafe(selector,baseElement); element = $tw.utils.querySelectorSafe(selector,baseElement);
if(element && element.focus) { if(element && element.focus) {
element.focus(event.paramObject); element.focus(event.paramObject);

View File

@@ -113,7 +113,7 @@ exports.startup = function() {
$tw.syncer = new $tw.Syncer({ $tw.syncer = new $tw.Syncer({
wiki: $tw.wiki, wiki: $tw.wiki,
syncadaptor: $tw.syncadaptor, syncadaptor: $tw.syncadaptor,
logging: $tw.wiki.getTiddlerText('$:/config/SyncLogging', "yes") === "yes" logging: $tw.wiki.getTiddlerText("$:/config/SyncLogging", "yes") === "yes"
}); });
} }
// Setup the saver handler // Setup the saver handler

View File

@@ -96,15 +96,15 @@ exports.startup = function() {
$tw.rootWidget.addEventListener("tm-close-window",function(event) { $tw.rootWidget.addEventListener("tm-close-window",function(event) {
var windowID = event.param, var windowID = event.param,
win = $tw.windows[windowID]; win = $tw.windows[windowID];
if(win) { if(win) {
win.close(); win.close();
} }
}); });
var closeAllWindows = function() { var closeAllWindows = function() {
$tw.utils.each($tw.windows,function(win) { $tw.utils.each($tw.windows,function(win) {
win.close(); win.close();
}); });
} };
$tw.rootWidget.addEventListener("tm-close-all-windows",closeAllWindows); $tw.rootWidget.addEventListener("tm-close-all-windows",closeAllWindows);
// Close open windows when unloading main window // Close open windows when unloading main window
$tw.addUnloadTask(closeAllWindows); $tw.addUnloadTask(closeAllWindows);

View File

@@ -16,7 +16,6 @@ var ClassicStoryView = function(listWidget) {
}; };
ClassicStoryView.prototype.navigateTo = function(historyInfo) { ClassicStoryView.prototype.navigateTo = function(historyInfo) {
var duration = $tw.utils.getAnimationDuration()
var listElementIndex = this.listWidget.findListItem(0,historyInfo.title); var listElementIndex = this.listWidget.findListItem(0,historyInfo.title);
if(listElementIndex === undefined) { if(listElementIndex === undefined) {
return; return;

Some files were not shown because too many files have changed in this diff Show More