From 37a6ff8521262ff133c080610cb2212e9c19f123 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Sat, 19 Feb 2022 09:20:32 +0000 Subject: [PATCH] Move tm-rename-tiddler handling from navigator widget into startup module This reverses an August 2015 change in 68e15c10641e2eda1e64cf29954786a07326a920; the original rationale was wrong: there is nothing related to the navigator widget in the implementation of the tm-rename-tiddler message --- core/modules/startup/rootwidget.js | 10 ++++++++++ core/modules/widgets/navigator.js | 13 +------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/core/modules/startup/rootwidget.js b/core/modules/startup/rootwidget.js index 721f84d5d..8c2f9158d 100644 --- a/core/modules/startup/rootwidget.js +++ b/core/modules/startup/rootwidget.js @@ -51,6 +51,16 @@ exports.startup = function() { element.focus(event.paramObject); } }); + // Install the tm-rename-tiddler message + $tw.rootWidget.addEventListener("tm-rename-tiddler",function(event) { + var options = {}, + paramObject = event.paramObject || {}, + from = paramObject.from || event.tiddlerTitle, + to = paramObject.to; + options.dontRenameInTags = (paramObject.renameInTags === "false" || paramObject.renameInTags === "no") ? true : false; + options.dontRenameInLists = (paramObject.renameInLists === "false" || paramObject.renameInLists === "no") ? true : false; + $tw.wiki.renameTiddler(from,to,options); + }); // Install the scroller $tw.pageScroller = new $tw.utils.PageScroller(); $tw.rootWidget.addEventListener("tm-scroll",function(event) { diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js index e67b2fa15..4007e64d9 100755 --- a/core/modules/widgets/navigator.js +++ b/core/modules/widgets/navigator.js @@ -44,8 +44,7 @@ NavigatorWidget.prototype.render = function(parent,nextSibling) { {type: "tm-fold-tiddler", handler: "handleFoldTiddlerEvent"}, {type: "tm-fold-other-tiddlers", handler: "handleFoldOtherTiddlersEvent"}, {type: "tm-fold-all-tiddlers", handler: "handleFoldAllTiddlersEvent"}, - {type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"}, - {type: "tm-rename-tiddler", handler: "handleRenameTiddlerEvent"} + {type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"} ]); this.parentDomNode = parent; this.computeAttributes(); @@ -636,16 +635,6 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) { }); }; -NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) { - var options = {}, - paramObject = event.paramObject || {}, - from = paramObject.from || event.tiddlerTitle, - to = paramObject.to; - options.dontRenameInTags = (paramObject.renameInTags === "false" || paramObject.renameInTags === "no") ? true : false; - options.dontRenameInLists = (paramObject.renameInLists === "false" || paramObject.renameInLists === "no") ? true : false; - this.wiki.renameTiddler(from,to,options); -}; - exports.navigator = NavigatorWidget; })();