mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-05-02 07:24:10 +00:00
Code Issues Releases Wiki Activity

More efficient checks if a tiddler is a plugin

Browse Source
This commit is contained in:
Jeremy Ruston 2025-02-18 17:30:11 +00:00
parent 3a60e0eb17
commit afabe5b714
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
boot/boot.js
View File

@ -1068,6 +1068,10 @@ $tw.Tiddler.prototype.hasField = function(field) {
return $tw.utils.hop(this.fields,field); return $tw.utils.hop(this.fields,field);
}; };
$tw.Tiddler.prototype.isPlugin = function() {
return this.fields.type === "application/json" && this.hasField("plugin-type") && !this.hasField("draft.of");
};
/* /*
Compare two tiddlers for equality Compare two tiddlers for equality
tiddler: the tiddler to compare tiddler: the tiddler to compare
@ -1407,7 +1411,7 @@ $tw.Wiki = function(options) {
$tw.utils.each(titles || getTiddlerTitles(),function(title) { $tw.utils.each(titles || getTiddlerTitles(),function(title) {
var tiddler = tiddlerStore[title]; var tiddler = tiddlerStore[title];
if(tiddler) { if(tiddler) {
if(tiddler.fields.type === "application/json" && tiddler.hasField("plugin-type") && tiddler.fields.text) { if(tiddler.isPlugin() && tiddler.fields.text) {
var contents = $tw.utils.parseJSONSafe(tiddler.fields.text); var contents = $tw.utils.parseJSONSafe(tiddler.fields.text);
pluginContents[tiddler.fields.title] = contents; pluginContents[tiddler.fields.title] = contents;
results.modifiedPlugins.push(tiddler.fields.title); results.modifiedPlugins.push(tiddler.fields.title);
@ -1445,7 +1449,7 @@ $tw.Wiki = function(options) {
if(!tiddler) { if(!tiddler) {
tiddler = self.getTiddler(title); tiddler = self.getTiddler(title);
} }
if(tiddler && tiddler.fields.type === "application/json" && tiddler.fields["plugin-type"] && (!pluginType || tiddler.fields["plugin-type"] === pluginType)) { if(tiddler && tiddler.isPlugin() && (!pluginType || tiddler.fields["plugin-type"] === pluginType)) {
var disablingTiddler = self.getTiddler("$:/config/Plugins/Disabled/" + title); var disablingTiddler = self.getTiddler("$:/config/Plugins/Disabled/" + title);
if(title === "$:/core" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") { if(title === "$:/core" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
self.unregisterPluginTiddlers(null,[title]); // Unregister the plugin if it's already registered self.unregisterPluginTiddlers(null,[title]); // Unregister the plugin if it's already registered
@ -1462,16 +1466,16 @@ $tw.Wiki = function(options) {
} }
} }
function checkSubTiddler(parentPluginTitle,title) { function checkSubTiddler(parentPluginTitle,title) {
var tiddler = new $tw.Tiddler(pluginContents[parentPluginTitle].tiddlers[title]); var tiddlerFields = pluginContents[parentPluginTitle].tiddlers[title];
if(tiddler && tiddler.fields.type === "application/json" && tiddler.fields["plugin-type"] && (!pluginType || tiddler.fields["plugin-type"] === pluginType)) { if(tiddlerFields.type === "application/json" && tiddlerFields["plugin-type"] && !tiddlerFields["draft.of"] && (!pluginType || tiddlerFields["plugin-type"] === pluginType)) {
var disablingTiddler = self.getTiddler("$:/config/Plugins/Disabled/" + title); var tiddler = new $tw.Tiddler(tiddlerFields,{title: title}),
disablingTiddler = self.getTiddler("$:/config/Plugins/Disabled/" + title);
if(title === "$:/core" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") { if(title === "$:/core" || !disablingTiddler || (disablingTiddler.fields.text || "").trim() !== "yes") {
self.unregisterPluginTiddlers(null,[title]); // Unregister the plugin if it's already registered self.unregisterPluginTiddlers(null,[title]); // Unregister the plugin if it's already registered
pluginTiddlersInfo.push({tiddler: tiddler,parentPluginTitle: parentPluginTitle}); pluginTiddlersInfo.push({tiddler: tiddler,parentPluginTitle: parentPluginTitle});
registeredTitles.push(tiddler.fields.title); registeredTitles.push(tiddler.fields.title);
} }
} }
} }
}; };

4
core/modules/tiddler.js
View File

@ -16,10 +16,6 @@ exports.hasTag = function(tag) {
return this.fields.tags && this.fields.tags.indexOf(tag) !== -1; return this.fields.tags && this.fields.tags.indexOf(tag) !== -1;
}; };
exports.isPlugin = function() {
return this.fields.type === "application/json" && this.hasField("plugin-type");
};
exports.isDraft = function() { exports.isDraft = function() {
return this.hasField("draft.of"); return this.hasField("draft.of");
}; };