mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-30 05:19:57 +00:00
Code Issues Releases Wiki Activity

Fix problem with JavaScript module tiddlers that are named as system tiddlers

Browse Source 
Reported by @boycook
This commit is contained in:
Jeremy Ruston 2013-07-03 18:36:51 +01:00
parent 53a23cae5c
commit f28684d249
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot/boot.js
View File

@ -551,7 +551,10 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
if(!moduleInfo.exports) { if(!moduleInfo.exports) {
try { try {
// Check the type of the definition // Check the type of the definition
if(typeof moduleInfo.definition === "string") { // String if(typeof moduleInfo.definition === "function") { // Function
moduleInfo.exports = {};
moduleInfo.definition(moduleInfo,moduleInfo.exports,sandbox.require);
} else if(typeof moduleInfo.definition === "string") { // String
moduleInfo.exports = $tw.utils.evalSandboxed(moduleInfo.definition,sandbox,tiddler.fields.title); moduleInfo.exports = $tw.utils.evalSandboxed(moduleInfo.definition,sandbox,tiddler.fields.title);
} else { // Object } else { // Object
moduleInfo.exports = moduleInfo.definition; moduleInfo.exports = moduleInfo.definition;