From 68e15c10641e2eda1e64cf29954786a07326a920 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sun, 30 Aug 2015 19:11:14 +0100 Subject: [PATCH] Move rename tiddler handling into navigator widget For consistency with the other tiddler manipulation primitives. --- core/modules/startup/bulkops.js | 28 ---------------------------- core/modules/widgets/navigator.js | 11 ++++++++++- 2 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 core/modules/startup/bulkops.js diff --git a/core/modules/startup/bulkops.js b/core/modules/startup/bulkops.js deleted file mode 100644 index d70afadaa..000000000 --- a/core/modules/startup/bulkops.js +++ /dev/null @@ -1,28 +0,0 @@ -/*\ -title: $:/core/modules/startup/bulkops.js -type: application/javascript -module-type: startup - -Support for bulk tiddler operations - -\*/ -(function(){ - -/*jslint node: true, browser: true */ -/*global $tw: false */ -"use strict"; - -// Export name and synchronous status -exports.name = "bulkops"; -exports.platforms = ["browser"]; -exports.after = ["startup"]; -exports.synchronous = true; - -exports.startup = function() { - $tw.rootWidget.addEventListener("tm-rename-tiddler",function(event) { - var paramObject = event.paramObject || {}; - $tw.wiki.renameTiddler(paramObject.from,paramObject.to); - }); -}; - -})(); diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js index 0706e5191..082500a45 100755 --- a/core/modules/widgets/navigator.js +++ b/core/modules/widgets/navigator.js @@ -33,7 +33,8 @@ var NavigatorWidget = function(parseTreeNode,options) { {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-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"}, + {type: "tm-rename-tiddler", handler: "handleRenameTiddlerEvent"} ]); }; @@ -609,6 +610,14 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) { }); }; +NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) { + var self = this, + paramObject = event.paramObject || {}, + from = paramObject.from || event.tiddlerTitle, + to = paramObject.to; + $tw.wiki.renameTiddler(from,to); +}; + exports.navigator = NavigatorWidget; })();