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

Minor style cleanups

Browse Source
This commit is contained in:
Jeremy Ruston 2012-11-16 17:44:47 +00:00
parent 42b4f20113
commit b48dec6932
1 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
core/boot.js
View File

@ -109,6 +109,19 @@ $tw.utils.hop = function(object,property) {
return Object.prototype.hasOwnProperty.call(object,property); return Object.prototype.hasOwnProperty.call(object,property);
}; };
/*
Iterate through all the own properties of an object. Callback is invoked with (element,title,object)
*/
$tw.utils.each = function(object,callback) {
if(object) {
for(var f in object) {
if($tw.utils.hop(object,f)) {
callback(object[f],f,object);
}
}
}
}
/* /*
Determine if a value is an array Determine if a value is an array
*/ */
@ -371,13 +384,9 @@ Apply a callback to each module of a particular type
*/ */
$tw.modules.forEachModuleOfType = function(moduleType,callback) { $tw.modules.forEachModuleOfType = function(moduleType,callback) {
var modules = $tw.modules.types[moduleType]; var modules = $tw.modules.types[moduleType];
if(modules) { $tw.utils.each(modules,function(element,title,object) {
for(var title in modules) { callback(title,$tw.modules.execute(title));
if($tw.utils.hop(modules,title)) { });
callback(title,$tw.modules.execute(title));
}
}
}
}; };
/* /*
@ -395,13 +404,11 @@ $tw.modules.getModulesByTypeAsHashmap = function(moduleType,nameField) {
/* /*
Apply the exports of the modules of a particular type to a target object Apply the exports of the modules of a particular type to a target object
*/ */
$tw.modules.applyMethods = function(moduleType,object) { $tw.modules.applyMethods = function(moduleType,targetObject) {
$tw.modules.forEachModuleOfType(moduleType,function(title,module) { $tw.modules.forEachModuleOfType(moduleType,function(title,module) {
for(var field in module) { $tw.utils.each(module,function(element,title,object) {
if($tw.utils.hop(module,field)) { targetObject[title] = module[title];
object[field] = module[field]; });
}
}
}); });
}; };
@ -501,55 +508,51 @@ Extract constituent tiddlers from bundle tiddlers so that we can easily access t
*/ */
$tw.Wiki.prototype.unpackBundleTiddlers = function() { $tw.Wiki.prototype.unpackBundleTiddlers = function() {
// Collect up all the plugin tiddlers // Collect up all the plugin tiddlers
for(var title in this.tiddlers) { var self = this;
var tiddler = this.tiddlers[title]; $tw.utils.each(this.tiddlers,function(tiddler,title,object) {
if(tiddler.fields.type === "application/json" && tiddler.hasField("bundle")) { if(tiddler.fields.type === "application/json" && tiddler.hasField("bundle")) {
// Save the bundle information // Save the bundle information
var bundleInfo = this.bundles[title] = JSON.parse(tiddler.fields.text); var bundleInfo = self.bundles[title] = JSON.parse(tiddler.fields.text);
// Extract the constituent tiddlers // Extract the constituent tiddlers
for(var t in bundleInfo.tiddlers) { for(var t in bundleInfo.tiddlers) {
var constituentTiddler = bundleInfo.tiddlers[t], var constituentTiddler = bundleInfo.tiddlers[t],
constituentTitle = bundleInfo.title + "/" + t; constituentTitle = bundleInfo.title + "/" + t;
// Don't overwrite tiddlers that already exist // Don't overwrite tiddlers that already exist
if(!(constituentTitle in this.bundledTiddlers)) { if(!$tw.utils.hop(self.bundledTiddlers,constituentTitle)) {
// Save the tiddler object // Save the tiddler object
this.bundledTiddlers[constituentTitle] = new $tw.Tiddler(constituentTiddler,{title: constituentTitle}); self.bundledTiddlers[constituentTitle] = new $tw.Tiddler(constituentTiddler,{title: constituentTitle});
} }
} }
} }
} });
}; };
/* /*
Define all modules stored in ordinary tiddlers Define all modules stored in ordinary tiddlers
*/ */
$tw.Wiki.prototype.defineTiddlerModules = function() { $tw.Wiki.prototype.defineTiddlerModules = function() {
for(var title in this.tiddlers) { $tw.utils.each(this.tiddlers,function(tiddler,title,object) {
if($tw.utils.hop(this.tiddlers,title)) { if(tiddler.fields.type === "application/javascript" && tiddler.hasField("module-type")) {
var tiddler = this.getTiddler(title); // Define the module
if(tiddler.fields.type === "application/javascript" && tiddler.hasField("module-type")) { $tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],tiddler.fields.text);
// Define the module
$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],tiddler.fields.text);
}
} }
} });
}; };
/* /*
Register all the module tiddlers that have a module type Register all the module tiddlers that have a module type
*/ */
$tw.Wiki.prototype.defineBundledModules = function() { $tw.Wiki.prototype.defineBundledModules = function() {
for(var title in this.bundledTiddlers) { var self = this;
if($tw.utils.hop(this.bundledTiddlers,title)) { $tw.utils.each(this.bundledTiddlers,function(element,title,object) {
var tiddler = this.getTiddler(title); var tiddler = self.getTiddler(title);
if(!$tw.utils.hop(this.tiddlers,title)) { if(!$tw.utils.hop(self.tiddlers,title)) { // Don't define the module if it is overidden by an ordinary tiddler
if(tiddler.fields.type === "application/javascript" && tiddler.hasField("module-type")) { if(tiddler.fields.type === "application/javascript" && tiddler.hasField("module-type")) {
// Define the module // Define the module
$tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],tiddler.fields.text); $tw.modules.define(tiddler.fields.title,tiddler.fields["module-type"],tiddler.fields.text);
}
} }
} }
} });
}; };
$tw.Wiki.prototype.getTiddler = function(title) { $tw.Wiki.prototype.getTiddler = function(title) {
@ -684,9 +687,7 @@ $tw.boot.decryptEncryptedTiddlers = function(callback) {
if(decrypted) { if(decrypted) {
var json = JSON.parse(decrypted); var json = JSON.parse(decrypted);
for(var title in json) { for(var title in json) {
if($tw.utils.hop(json,title)) { $tw.preloadTiddler(json[title]);
$tw.preloadTiddler(json[title]);
}
} }
encryptedTiddlers.splice(t,1); encryptedTiddlers.splice(t,1);
} }