tiddlywiki 5.3.5 → 5.3.7

package/core/modules/server/routes/delete-tiddler.js

@@ -6,10 +6,6 @@ module-type: route
 DELETE /recipes/default/tiddlers/:title
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "DELETE";
@@ -24,5 +20,3 @@ exports.handler = function(request,response,state) {
 	});
 	response.end();
 };
-
-}());

package/core/modules/server/routes/get-favicon.js

@@ -6,10 +6,6 @@ module-type: route
 GET /favicon.ico
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "GET";
@@ -20,5 +16,3 @@ exports.handler = function(request,response,state) {
 	var buffer = state.wiki.getTiddlerText("$:/favicon.ico","");
 	state.sendResponse(200,{"Content-Type": "image/x-icon"},buffer,"base64");
 };
-
-}());

package/core/modules/server/routes/get-file.js

@@ -6,10 +6,6 @@ module-type: route
 GET /files/:filepath
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "GET";
@@ -44,5 +40,3 @@ exports.handler = function(request,response,state) {
 		state.sendResponse(404,{"Content-Type": "text/plain"},"File '" + suppliedFilename + "' not found");
 	}
 };
-
-}());

package/core/modules/server/routes/get-index.js

@@ -6,10 +6,6 @@ module-type: route
 GET /
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "GET";
@@ -23,5 +19,3 @@ exports.handler = function(request,response,state) {
 	};
 	state.sendResponse(200,responseHeaders,text);
 };
-
-}());

package/core/modules/server/routes/get-login-basic.js

@@ -6,10 +6,6 @@ module-type: route
 GET /login-basic -- force a Basic Authentication challenge
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "GET";
@@ -25,12 +21,10 @@ exports.handler = function(request,response,state) {
 		response.end();
 	} else {
 		// Redirect to the root wiki if login worked
-		var location = ($tw.syncadaptor && $tw.syncadaptor.host)? $tw.syncadaptor.host: "/";
+		var location = ($tw.syncadaptor && $tw.syncadaptor.host)? $tw.syncadaptor.host: `${state.pathPrefix}/`;
 		response.writeHead(302,{
 			Location: location
 		});
 		response.end();
 	}
 };
-
-}());

package/core/modules/server/routes/get-status.js

@@ -6,10 +6,6 @@ module-type: route
 GET /status
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "GET";
@@ -29,5 +25,3 @@ exports.handler = function(request,response,state) {
 	});
 	state.sendResponse(200,{"Content-Type": "application/json"},text,"utf8");
 };
-
-}());

package/core/modules/server/routes/get-tiddler-html.js

@@ -6,10 +6,6 @@ module-type: route
 GET /:title
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "GET";
@@ -40,5 +36,3 @@ exports.handler = function(request,response,state) {
 		response.end();
 	}
 };
-
-}());

package/core/modules/server/routes/get-tiddler.js

@@ -6,10 +6,6 @@ module-type: route
 GET /recipes/default/tiddlers/:title
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "GET";
@@ -42,5 +38,3 @@ exports.handler = function(request,response,state) {
 		response.end();
 	}
 };
-
-}());

package/core/modules/server/routes/get-tiddlers-json.js

@@ -6,10 +6,6 @@ module-type: route
 GET /recipes/default/tiddlers.json?filter=<filter>
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var DEFAULT_FILTER = "[all[tiddlers]!is[system]sort[title]]";
@@ -46,5 +42,3 @@ exports.handler = function(request,response,state) {
 	var text = JSON.stringify(tiddlers);
 	state.sendResponse(200,{"Content-Type": "application/json"},text,"utf8");
 };
-
-}());

package/core/modules/server/routes/put-tiddler.js

@@ -6,10 +6,6 @@ module-type: route
 PUT /recipes/default/tiddlers/:title
 
 \*/
-(function() {
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.method = "PUT";
@@ -48,5 +44,3 @@ exports.handler = function(request,response,state) {
 	});
 	response.end();
 };
-
-}());

package/core/modules/server/server.js

@@ -6,10 +6,7 @@ module-type: library
 Serve tiddlers over http
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 if($tw.node) {
@@ -374,5 +371,3 @@ Server.prototype.listen = function(port,host,prefix) {
 };
 
 exports.Server = Server;
-
-})();

package/core/modules/startup/browser-messaging.js

@@ -6,10 +6,7 @@ module-type: startup
 Browser message handling
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -181,5 +178,3 @@ exports.startup = function() {
 		}
 	},false);
 };
-
-})();

package/core/modules/startup/commands.js

@@ -6,10 +6,7 @@ module-type: startup
 Command processing
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -33,5 +30,3 @@ exports.startup = function(callback) {
 	);
 	commander.execute();
 };
-
-})();

package/core/modules/startup/favicon.js

@@ -6,10 +6,7 @@ module-type: startup
 Favicon handling
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -39,5 +36,3 @@ function setFavicon() {
 		faviconLink.setAttribute("href",$tw.utils.makeDataUri(tiddler.fields.text,tiddler.fields.type,tiddler.fields._canonical_uri));
 	}
 }
-
-})();

package/core/modules/startup/info.js

@@ -6,10 +6,7 @@ module-type: startup
 Initialise $:/info tiddlers via $:/temp/info-plugin pseudo-plugin
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -54,5 +51,3 @@ exports.startup = function() {
 	$tw.wiki.registerPluginTiddlers("info",[TITLE_INFO_PLUGIN]);
 	$tw.wiki.unpackPluginTiddlers();
 };
-
-})();

package/core/modules/startup/load-modules.js

@@ -6,10 +6,7 @@ module-type: startup
 Load core modules
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -36,5 +33,3 @@ exports.startup = function() {
 	$tw.wiki.initParsers();
 	$tw.Commander.initCommands();
 };
-
-})();

package/core/modules/startup/password.js

@@ -6,10 +6,7 @@ module-type: startup
 Password handling
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -49,5 +46,3 @@ exports.startup = function() {
 		}
 	});
 };
-
-})();

package/core/modules/startup/plugins.js

@@ -6,10 +6,7 @@ module-type: startup
 Startup logic concerned with managing plugins
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -75,11 +72,10 @@ exports.startup = function() {
 				$tw.wiki.unpackPluginTiddlers();
 				// Queue change events for the changed shadow tiddlers
 				$tw.utils.each(Object.keys(changedShadowTiddlers),function(title) {
-					$tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title]);
+					$tw.wiki.enqueueTiddlerEvent(title,changedShadowTiddlers[title], true);
 				});
 			}
 		}
 	});
 };
 
-})();

package/core/modules/startup/render.js

@@ -6,10 +6,7 @@ module-type: startup
 Title, stylesheet and page rendering
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -120,5 +117,3 @@ exports.startup = function() {
 	// Run any post-render startup actions
 	$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/PostRender");
 };
-
-})();

package/core/modules/startup/rootwidget.js

@@ -6,10 +6,7 @@ module-type: startup
 Setup the root widget and the core root widget handlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -52,7 +49,9 @@ exports.startup = function() {
 			basicAuthUsername: params["basic-auth-username"],
 			basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
 			basicAuthPassword: params["basic-auth-password"],
-			basicAuthPasswordFromStore: params["basic-auth-password-from-store"]
+			basicAuthPasswordFromStore: params["basic-auth-password-from-store"],
+			bearerAuthToken: params["bearer-auth-token"],
+			bearerAuthTokenFromStore: params["bearer-auth-token-from-store"]
 		});
 	});
 	$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
@@ -125,5 +124,3 @@ exports.startup = function() {
 		});
 	}
 };
-
-})();

package/core/modules/startup/startup.js

@@ -6,10 +6,7 @@ module-type: startup
 Miscellaneous startup logic for both the client and server.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -67,14 +64,6 @@ exports.startup = function() {
 		wiki: $tw.wiki,
 		document: $tw.browser ? document : $tw.fakeDocument
 	});
-	// Execute any startup actions
-	$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction");
-	if($tw.browser) {
-		$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Browser");
-	}
-	if($tw.node) {
-		$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Node");
-	}
 	// Kick off the language manager and switcher
 	$tw.language = new $tw.Language();
 	$tw.languageSwitcher = new $tw.PluginSwitcher({
@@ -88,8 +77,10 @@ exports.startup = function() {
 			if($tw.browser) {
 				var pluginTiddler = $tw.wiki.getTiddler(plugins[0]);
 				if(pluginTiddler) {
+					document.documentElement.setAttribute("lang",pluginTiddler.getFieldString("name"));
 					document.documentElement.setAttribute("dir",pluginTiddler.getFieldString("text-direction") || "auto");
 				} else {
+					document.documentElement.setAttribute("lang","en-GB");
 					document.documentElement.removeAttribute("dir");
 				}
 			}
@@ -115,6 +106,14 @@ exports.startup = function() {
 			handlerMethod: "handleKeydownEvent"
 		}]);
 	}
+	// Execute any startup actions
+	$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction");
+	if($tw.browser) {
+		$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Browser");
+	}
+	if($tw.node) {
+		$tw.rootWidget.invokeActionsByTag("$:/tags/StartupAction/Node");
+	}
 	// Clear outstanding tiddler store change events to avoid an unnecessary refresh cycle at startup
 	$tw.wiki.clearTiddlerEventQueue();
 	// Find a working syncadaptor
@@ -146,5 +145,3 @@ exports.startup = function() {
 		$tw.anim = new $tw.utils.Animator();
 	}
 };
-
-})();

package/core/modules/startup/story.js

@@ -6,10 +6,7 @@ module-type: startup
 Load core modules
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -234,5 +231,3 @@ function updateLocationHash(options) {
 		}
 	}
 }
-
-})();

package/core/modules/startup/windows.js

@@ -6,10 +6,7 @@ module-type: startup
 Setup root widget handlers for the messages concerned with opening external browser windows
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 // Export name and synchronous status
@@ -110,5 +107,3 @@ exports.startup = function() {
 	// Close open windows when unloading main window
 	$tw.addUnloadTask(closeAllWindows);
 };
-
-})();

package/core/modules/story.js

@@ -6,10 +6,7 @@ module-type: global
 Lightweight object for managing interactions with the story and history lists.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -133,6 +130,3 @@ Story.prototype.storyNewTiddler = function(targetTitle) {
 };
 
 exports.Story = Story;
-
-
-})();

package/core/modules/storyviews/classic.js

@@ -6,10 +6,7 @@ module-type: storyview
 Views the story as a linear sequence
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/#easeInOutCubic
@@ -30,12 +27,8 @@ ClassicStoryView.prototype.navigateTo = function(historyInfo) {
 	if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 		return;
 	}
-	if(duration) {
-		// Scroll the node into view
-		this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
-	} else {
-		targetElement.scrollIntoView();
-	}
+	// Scroll the node into view
+	this.listWidget.dispatchEvent({type: "tm-scroll", target: targetElement});
 };
 
 ClassicStoryView.prototype.insert = function(widget) {
@@ -82,6 +75,10 @@ ClassicStoryView.prototype.remove = function(widget) {
 			removeElement = function() {
 				widget.removeChildDomNodes();
 			};
+		// Blur the focus if it is within the descendents of the node we are removing
+		if($tw.utils.domContains(targetElement,targetElement.ownerDocument.activeElement)) {
+			targetElement.ownerDocument.activeElement.blur();
+		}
 		// Abandon if the list entry isn't a DOM element (it might be a text node)
 		if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) {
 			removeElement();
@@ -117,5 +114,3 @@ ClassicStoryView.prototype.remove = function(widget) {
 };
 
 exports.classic = ClassicStoryView;
-
-})();

package/core/modules/storyviews/pop.js

@@ -6,10 +6,7 @@ module-type: storyview
 Animates list insertions and removals
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var PopStoryView = function(listWidget) {
@@ -99,5 +96,3 @@ PopStoryView.prototype.remove = function(widget) {
 };
 
 exports.pop = PopStoryView;
-
-})();

package/core/modules/storyviews/zoomin.js

@@ -6,10 +6,7 @@ module-type: storyview
 Zooms between individual tiddlers
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var easing = "cubic-bezier(0.645, 0.045, 0.355, 1)"; // From http://easings.net/#easeInOutCubic
@@ -226,5 +223,3 @@ ZoominListView.prototype.logTextNodeRoot = function(node) {
 };
 
 exports.zoomin = ZoominListView;
-
-})();

package/core/modules/syncer.js

@@ -6,10 +6,7 @@ module-type: global
 The syncer tracks changes to the store and synchronises them to a remote data store represented as a "sync adaptor"
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -703,5 +700,3 @@ SyncFromServerTask.prototype.run = function(callback) {
 };
 
 exports.Syncer = Syncer;
-
-})();

package/core/modules/tiddler.js

@@ -6,10 +6,7 @@ module-type: tiddlermethod
 Extension methods for the $tw.Tiddler object (constructor and methods required at boot time are in boot/boot.js)
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 exports.hasTag = function(tag) {
@@ -40,10 +37,10 @@ exports.getFieldString = function(field,defaultValue) {
 };
 
 /*
-Get the value of a field as a list
+Get the value of a field as an array / list
 */
 exports.getFieldList = function(field) {
-	var value = this.fields[field];
+	var value = this.getFieldString(field,null);
 	// Check for a missing field
 	if(value === undefined || value === null) {
 		return [];
@@ -99,5 +96,3 @@ exports.getFieldDay = function(field) {
 	this.cache.day[field] = day;
 	return day;
 };
-
-})();

package/core/modules/upgraders/plugins.js

@@ -6,10 +6,7 @@ module-type: upgrader
 Upgrader module that checks that plugins are newer than any already installed version
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var UPGRADE_LIBRARY_TITLE = "$:/UpgradeLibrary";
@@ -75,5 +72,3 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 	});
 	return messages;
 };
-
-})();

package/core/modules/upgraders/system.js

@@ -6,13 +6,10 @@ module-type: upgrader
 Upgrader module that suppresses certain system tiddlers that shouldn't be imported
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
-var DONT_IMPORT_LIST = ["$:/Import"],
+var DONT_IMPORT_LIST = ["$:/Import", "$:/build"],
 	UNSELECT_PREFIX_LIST = ["$:/temp/","$:/state/","$:/StoryList","$:/HistoryList"],
 	WARN_IMPORT_PREFIX_LIST = ["$:/core/modules/"];
 
@@ -47,5 +44,3 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 	}
 	return messages;
 };
-
-})();

package/core/modules/upgraders/themetweaks.js

@@ -15,10 +15,7 @@ Now, each tweak is stored in its own separate tiddler.
 This upgrader copies any values from the old format to the new. The old data tiddlers are not deleted in case they have been used to store additional indexes.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 var MAPPINGS = {
@@ -61,5 +58,3 @@ exports.upgrade = function(wiki,titles,tiddlers) {
 	});
 	return messages;
 };
-
-})();

package/core/modules/utils/crypto.js

@@ -6,10 +6,7 @@ module-type: utils
 Utility functions related to crypto.
 
 \*/
-(function(){
 
-/*jslint node: true, browser: true */
-/*global $tw: false */
 "use strict";
 
 /*
@@ -90,5 +87,3 @@ exports.decryptStoreAreaInteractive = function(encryptedStoreArea,callback,optio
 		});
 	}
 };
-
-})();