mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-30 09:13:16 +00:00
Code Issues Releases Wiki Activity

Refine node vs. browser behaviour

Browse Source 
Now we’re using TiddlyWiki as the core of TiddlyDesktop we need more
granular control of the platform specific code.
This commit is contained in:
Jermolene 2014-12-18 19:52:15 +00:00
parent b1c5d7694e
commit d2c4920ba4
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/startup/load-modules.js
View File

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

15
core/modules/utils/utils.js
View File

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

4
plugins/tiddlywiki/filesystem/filesystemadaptor.js
View File

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