Refine node vs. browser behaviour

Now we’re using TiddlyWiki as the core of TiddlyDesktop we need more
granular control of the platform specific code.

core/modules/startup/load-modules.js

@@ -19,7 +19,7 @@ exports.synchronous = true;
 exports.startup = function() {
 	// Load modules
 	$tw.modules.applyMethods("utils",$tw.utils);
-	if($tw.node && !$tw.browser) {
+	if($tw.node) {
 		$tw.modules.applyMethods("utils-node",$tw.utils);
 	}
 	$tw.modules.applyMethods("global",$tw);

core/modules/utils/utils.js

@@ -524,29 +524,22 @@ exports.isValidFieldName = function(name) {
 Extract the version number from the meta tag or from the boot file
 */
 
-if($tw.browser) {
-
 // Browser version
 exports.extractVersionInfo = function() {
-	var metatags = document.getElementsByTagName("meta");
-	for(var t=0; t<metatags.length; t++) {
-		var m = metatags[t];
-		if(m.name === "tiddlywiki-version") {
-			return m.content;
+	if($tw.packageInfo) {
+		return $tw.packageInfo.version;
+	} else {
+		var metatags = document.getElementsByTagName("meta");
+		for(var t=0; t<metatags.length; t++) {
+			var m = metatags[t];
+			if(m.name === "tiddlywiki-version") {
+				return m.content;
+			}
 		}
 	}
 	return null;
 };
 
-} else {
-
-// Server version
-exports.extractVersionInfo = function() {
-	return $tw.packageInfo.version;
-};
-
-}
-
 /*
 Get the animation duration in ms
 */

plugins/tiddlywiki/filesystem/filesystemadaptor.js

@@ -13,8 +13,8 @@ A sync adaptor module for synchronising with the local filesystem via node.js AP
 "use strict";
 
 // Get a reference to the file system
-var fs = !$tw.browser ? require("fs") : null,
-	path = !$tw.browser ? require("path") : null;
+var fs = $tw.node ? require("fs") : null,
+	path = $tw.node ? require("path") : null;
 
 function FileSystemAdaptor(options) {
 	var self = this;