tiddlywiki 5.1.23 → 5.2.2

package/core/modules/widgets/list.js

@@ -19,11 +19,6 @@ The list widget creates list element sub-widgets that reach back into the list w
 */
 
 var ListWidget = function(parseTreeNode,options) {
-	// Initialise the storyviews if they've not been done already
-	if(!this.storyViews) {
-		ListWidget.prototype.storyViews = {};
-		$tw.modules.applyMethods("storyview",this.storyViews);
-	}
 	// Main initialisation inherited from widget.js
 	this.initialise(parseTreeNode,options);
 };
@@ -37,6 +32,11 @@ ListWidget.prototype = new Widget();
 Render this widget into the DOM
 */
 ListWidget.prototype.render = function(parent,nextSibling) {
+	// Initialise the storyviews if they've not been done already
+	if(!this.storyViews) {
+		ListWidget.prototype.storyViews = {};
+		$tw.modules.applyMethods("storyview",this.storyViews);
+	}
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
@@ -51,6 +51,9 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 	} else {
 		this.storyview = null;
 	}
+	if(this.storyview && this.storyview.renderEnd) {
+		this.storyview.renderEnd();
+	}
 };
 
 /*
@@ -61,6 +64,7 @@ ListWidget.prototype.execute = function() {
 	this.template = this.getAttribute("template");
 	this.editTemplate = this.getAttribute("editTemplate");
 	this.variableName = this.getAttribute("variable","currentTiddler");
+	this.counterName = this.getAttribute("counter");
 	this.storyViewName = this.getAttribute("storyview");
 	this.historyTitle = this.getAttribute("history");
 	// Compose the list elements
@@ -72,7 +76,7 @@ ListWidget.prototype.execute = function() {
 		members = this.getEmptyMessage();
 	} else {
 		$tw.utils.each(this.list,function(title,index) {
-			members.push(self.makeItemTemplate(title));
+			members.push(self.makeItemTemplate(title,index));
 		});
 	}
 	// Construct the child widgets
@@ -105,7 +109,7 @@ ListWidget.prototype.getEmptyMessage = function() {
 /*
 Compose the template for a list item
 */
-ListWidget.prototype.makeItemTemplate = function(title) {
+ListWidget.prototype.makeItemTemplate = function(title,index) {
 	// Check if the tiddler is a draft
 	var tiddler = this.wiki.getTiddler(title),
 		isDraft = tiddler && tiddler.hasField("draft.of"),
@@ -128,7 +132,14 @@ ListWidget.prototype.makeItemTemplate = function(title) {
 		}
 	}
 	// Return the list item
-	return {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree};
+	var parseTreeNode = {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree};
+	if(this.counterName) {
+		parseTreeNode.counter = (index + 1).toString();
+		parseTreeNode.counterName = this.counterName;
+		parseTreeNode.isFirst = index === 0;
+		parseTreeNode.isLast = index === this.list.length - 1;
+	}
+	return parseTreeNode;
 };
 
 /*
@@ -142,7 +153,7 @@ ListWidget.prototype.refresh = function(changedTiddlers) {
 		this.storyview.refreshStart(changedTiddlers,changedAttributes);
 	}
 	// Completely refresh if any of our attributes have changed
-	if(changedAttributes.filter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
+	if(changedAttributes.filter || changedAttributes.variable || changedAttributes.counter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
 		this.refreshSelf();
 		result = true;
 	} else {
@@ -211,23 +222,46 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 			this.removeChildDomNodes();
 			this.children = [];
 		}
-		// Cycle through the list, inserting and removing list items as needed
-		var hasRefreshed = false;
-		for(var t=0; t<this.list.length; t++) {
-			var index = this.findListItem(t,this.list[t]);
-			if(index === undefined) {
-				// The list item must be inserted
-				this.insertListItem(t,this.list[t]);
-				hasRefreshed = true;
-			} else {
-				// There are intervening list items that must be removed
-				for(var n=index-1; n>=t; n--) {
-					this.removeListItem(n);
+		// If we are providing an counter variable then we must refresh the items, otherwise we can rearrange them
+		var hasRefreshed = false,t;
+		if(this.counterName) {
+			// Cycle through the list and remove and re-insert the first item that has changed, and all the remaining items
+			for(t=0; t<this.list.length; t++) {
+				if(hasRefreshed || !this.children[t] || this.children[t].parseTreeNode.itemTitle !== this.list[t]) {
+					if(this.children[t]) {
+						this.removeListItem(t);
+					}
+					this.insertListItem(t,this.list[t]);
 					hasRefreshed = true;
+				} else {
+					// Refresh the item we're reusing
+					var refreshed = this.children[t].refresh(changedTiddlers);
+					hasRefreshed = hasRefreshed || refreshed;
+				}
+			}
+			// If there are items to remove and we have not refreshed then recreate the item that will now be at the last position
+			if(!hasRefreshed && this.children.length > this.list.length) {
+				this.removeListItem(this.list.length-1);
+				this.insertListItem(this.list.length-1,this.list[this.list.length-1]);
+			}
+		} else {
+			// Cycle through the list, inserting and removing list items as needed
+			for(t=0; t<this.list.length; t++) {
+				var index = this.findListItem(t,this.list[t]);
+				if(index === undefined) {
+					// The list item must be inserted
+					this.insertListItem(t,this.list[t]);
+					hasRefreshed = true;
+				} else {
+					// There are intervening list items that must be removed
+					for(var n=index-1; n>=t; n--) {
+						this.removeListItem(n);
+						hasRefreshed = true;
+					}
+					// Refresh the item we're reusing
+					var refreshed = this.children[t].refresh(changedTiddlers);
+					hasRefreshed = hasRefreshed || refreshed;
 				}
-				// Refresh the item we're reusing
-				var refreshed = this.children[t].refresh(changedTiddlers);
-				hasRefreshed = hasRefreshed || refreshed;
 			}
 		}
 		// Remove any left over items
@@ -257,7 +291,7 @@ Insert a new list item at the specified index
 */
 ListWidget.prototype.insertListItem = function(index,title) {
 	// Create, insert and render the new child widgets
-	var widget = this.makeChildWidget(this.makeItemTemplate(title));
+	var widget = this.makeChildWidget(this.makeItemTemplate(title,index));
 	widget.parentDomNode = this.parentDomNode; // Hack to enable findNextSiblingDomNode() to work
 	this.children.splice(index,0,widget);
 	var nextSibling = widget.findNextSiblingDomNode();
@@ -311,6 +345,11 @@ Compute the internal state of the widget
 ListItemWidget.prototype.execute = function() {
 	// Set the current list item title
 	this.setVariable(this.parseTreeNode.variableName,this.parseTreeNode.itemTitle);
+	if(this.parseTreeNode.counterName) {
+		this.setVariable(this.parseTreeNode.counterName,this.parseTreeNode.counter);
+		this.setVariable(this.parseTreeNode.counterName + "-first",this.parseTreeNode.isFirst ? "yes" : "no");
+		this.setVariable(this.parseTreeNode.counterName + "-last",this.parseTreeNode.isLast ? "yes" : "no");
+	}
 	// Construct the child widgets
 	this.makeChildWidgets();
 };
@@ -324,4 +363,4 @@ ListItemWidget.prototype.refresh = function(changedTiddlers) {
 
 exports.listitem = ListItemWidget;
 
-})();
+})();

package/core/modules/widgets/log.js

@@ -23,7 +23,7 @@ exports.constructor = function(parseTreeNode,options) {
 exports.prototype = {};
 
 exports.prototype.render = function(event) {
-	Object.getPrototypeOf(Object.getPrototypeOf(this)).render.call(this,event);	
+	Object.getPrototypeOf(Object.getPrototypeOf(this)).render.call(this,event);
 	Object.getPrototypeOf(Object.getPrototypeOf(this)).log.call(this);
 }
 

package/core/modules/widgets/macrocall.js

@@ -44,7 +44,7 @@ MacroCallWidget.prototype.execute = function() {
 	var params = this.parseTreeNode.params ? this.parseTreeNode.params.slice(0) : [];
 	$tw.utils.each(this.attributes,function(attribute,name) {
 		if(name.charAt(0) !== "$") {
-			params.push({name: name, value: attribute});			
+			params.push({name: name, value: attribute});
 		}
 	});
 	// Get the macro value

package/core/modules/widgets/messagecatcher.js

@@ -0,0 +1,110 @@
+/*\
+title: $:/core/modules/widgets/messagecatcher.js
+type: application/javascript
+module-type: widget
+
+Message catcher widget
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var MessageCatcherWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+MessageCatcherWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+MessageCatcherWidget.prototype.render = function(parent,nextSibling) {
+	var self = this;
+	// Remember parent
+	this.parentDomNode = parent;
+	// Compute attributes and execute state
+	this.computeAttributes();
+	this.execute();
+	// Helper to add an event handler
+	var addEventHandler = function(type,actions) {
+		if(type && actions) {
+			var isActionStringExecuting = false;
+			self.addEventListener(
+				type,
+				function(event) {
+					// Don't trap the event if it came from one of our action handlers
+					if(isActionStringExecuting) {
+						return true;
+					}
+					// Collect all the event properties into variables
+					var collectProps = function(obj,prefix) {
+						prefix = prefix || "";
+						var props = {},
+							names = [];
+						$tw.utils.each(obj,function(value,name) {
+							if(["string","boolean","number"].indexOf(typeof value) !== -1) {
+								names.push(name);
+								props[prefix + "-" + name] = value.toString();
+							}
+						});
+						props["list-" + prefix] = $tw.utils.stringifyList(names);
+						return props;
+					};
+					var variables = $tw.utils.extend(
+						{},
+						collectProps(event.paramObject,"event-paramObject"),
+						collectProps(event,"event"),
+						{
+							modifier: $tw.keyboardManager.getEventModifierKeyDescriptor(event)
+						});
+					isActionStringExecuting = true;
+					self.invokeActionString(actions,self,event,variables);
+					isActionStringExecuting = false;
+					return false;
+				}
+			);
+		}
+	}
+	// Add the main event handler
+	addEventHandler(this.getAttribute("type"),this.getAttribute("actions"));
+	// Add any other event handlers
+	$tw.utils.each(this.attributes,function(value,key) {
+		if(key.charAt(0) === "$") {
+			addEventHandler(key.slice(1),value);
+		}
+	});
+	// Render children
+	this.renderChildren(parent,null);
+};
+
+/*
+Compute the internal state of the widget
+*/
+MessageCatcherWidget.prototype.execute = function() {
+	// Make child widgets
+	this.makeChildWidgets();
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+MessageCatcherWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	if($tw.utils.count(changedAttributes) > 0) {
+		this.refreshSelf();
+		return true;
+	}
+	return this.refreshChildren(changedTiddlers);
+};
+
+exports.messagecatcher = MessageCatcherWidget;
+
+})();

package/core/modules/widgets/navigator.js

@@ -18,6 +18,17 @@ var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var NavigatorWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+NavigatorWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+NavigatorWidget.prototype.render = function(parent,nextSibling) {
 	this.addEventListeners([
 		{type: "tm-navigate", handler: "handleNavigateEvent"},
 		{type: "tm-edit-tiddler", handler: "handleEditTiddlerEvent"},
@@ -33,20 +44,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-rename-tiddler", handler: "handleRenameTiddlerEvent"}
+		{type: "tm-unfold-all-tiddlers", handler: "handleUnfoldAllTiddlersEvent"}
 	]);
-};
-
-/*
-Inherit from the base widget class
-*/
-NavigatorWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-NavigatorWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
@@ -95,7 +94,7 @@ NavigatorWidget.prototype.saveStoryList = function(storyList) {
 			{title: this.storyTitle},
 			storyTiddler,
 			{list: storyList}
-		));		
+		));
 	}
 };
 
@@ -105,7 +104,7 @@ NavigatorWidget.prototype.removeTitleFromStory = function(storyList,title) {
 		while(p !== -1) {
 			storyList.splice(p,1);
 			p = storyList.indexOf(title);
-		}		
+		}
 	}
 };
 
@@ -122,7 +121,7 @@ NavigatorWidget.prototype.replaceFirstTitleInStory = function(storyList,oldTitle
 			} while(pos !== -1);
 		} else {
 			storyList.splice(0,0,newTitle);
-		}		
+		}
 	}
 };
 
@@ -160,6 +159,7 @@ NavigatorWidget.prototype.handleNavigateEvent = function(event) {
 
 // Close a specified tiddler
 NavigatorWidget.prototype.handleCloseTiddlerEvent = function(event) {
+	event = $tw.hooks.invokeHook("th-closing-tiddler",event);
 	var title = event.param || event.tiddlerTitle,
 		storyList = this.getStoryList();
 	// Look for tiddlers with this title to close
@@ -183,7 +183,8 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) {
 
 // Place a tiddler in edit mode
 NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
-	var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event);
+	var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event),
+	    win = event.event && event.event.view ? event.event.view : window;
 	if(!editTiddler) {
 		return false;
 	}
@@ -192,7 +193,7 @@ NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
 		return self.wiki.isShadowTiddler(title) && !self.wiki.tiddlerExists(title);
 	}
 	function confirmEditShadow(title) {
-		return confirm($tw.language.getString(
+		return win.confirm($tw.language.getString(
 			"ConfirmEditShadowTiddler",
 			{variables:
 				{title: title}
@@ -225,7 +226,8 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		storyList = this.getStoryList(),
 		originalTitle = tiddler ? tiddler.fields["draft.of"] : "",
 		originalTiddler = originalTitle ? this.wiki.getTiddler(originalTitle) : undefined,
-		confirmationTitle;
+		confirmationTitle,
+	    	win = event.event && event.event.view ? event.event.view : window;
 	if(!tiddler) {
 		return false;
 	}
@@ -238,7 +240,7 @@ NavigatorWidget.prototype.handleDeleteTiddlerEvent = function(event) {
 		confirmationTitle = title;
 	}
 	// Seek confirmation
-	if((this.wiki.getTiddler(originalTitle) || (tiddler.fields.text || "") !== "") && !confirm($tw.language.getString(
+	if((this.wiki.getTiddler(originalTitle) || (tiddler.fields.text || "") !== "") && !win.confirm($tw.language.getString(
 				"ConfirmDeleteTiddler",
 				{variables:
 					{title: confirmationTitle}
@@ -304,7 +306,8 @@ NavigatorWidget.prototype.generateDraftTitle = function(title) {
 NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 	var title = event.param || event.tiddlerTitle,
 		tiddler = this.wiki.getTiddler(title),
-		storyList = this.getStoryList();
+		storyList = this.getStoryList(),
+	    	win = event.event && event.event.view ? event.event.view : window;
 	// Replace the original tiddler with the draft
 	if(tiddler) {
 		var draftTitle = (tiddler.fields["draft.title"] || "").trim(),
@@ -313,7 +316,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 			var isRename = draftOf !== draftTitle,
 				isConfirmed = true;
 			if(isRename && this.wiki.tiddlerExists(draftTitle)) {
-				isConfirmed = confirm($tw.language.getString(
+				isConfirmed = win.confirm($tw.language.getString(
 					"ConfirmOverwriteTiddler",
 					{variables:
 						{title: draftTitle}
@@ -362,6 +365,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 // Take a tiddler out of edit mode without saving the changes
 NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
 	event = $tw.hooks.invokeHook("th-cancelling-tiddler", event);
+	var win = event.event && event.event.view ? event.event.view : window;
 	// Flip the specified tiddler from draft back to the original
 	var draftTitle = event.param || event.tiddlerTitle,
 		draftTiddler = this.wiki.getTiddler(draftTitle),
@@ -372,7 +376,7 @@ NavigatorWidget.prototype.handleCancelTiddlerEvent = function(event) {
 			originalTiddler = this.wiki.getTiddler(originalTitle),
 			storyList = this.getStoryList();
 		if(this.wiki.isDraftModified(draftTitle)) {
-			isConfirmed = confirm($tw.language.getString(
+			isConfirmed = win.confirm($tw.language.getString(
 				"ConfirmCancelTiddler",
 				{variables:
 					{title: draftTitle}
@@ -494,11 +498,7 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 // Import JSON tiddlers into a pending import tiddler
 NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	// Get the tiddlers
-	var tiddlers = [];
-	try {
-		tiddlers = JSON.parse(event.param);
-	} catch(e) {
-	}
+	var tiddlers = $tw.utils.parseJSONSafe(event.param,[]);
 	// Get the current $:/Import tiddler
 	var importTitle = event.importTitle ? event.importTitle : IMPORT_TITLE,
 		importTiddler = this.wiki.getTiddler(importTitle),
@@ -522,10 +522,15 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	});
 	// Give the active upgrader modules a chance to process the incoming tiddlers
 	var messages = this.wiki.invokeUpgraders(incomingTiddlers,importData.tiddlers);
+	// Deselect any disabled, but _not_ suppressed tiddlers
+	var systemMessage = $tw.language.getString("Import/Upgrader/Tiddler/Unselected");
 	$tw.utils.each(messages,function(message,title) {
 		newFields["message-" + title] = message;
+		if (message.indexOf(systemMessage) !== -1) {
+			newFields["selection-" + title] = "unchecked";
+		}
 	});
-	// Deselect any suppressed tiddlers
+	// Deselect suppressed tiddlers ... they have been removed and can't be selected anymore
 	$tw.utils.each(importData.tiddlers,function(tiddler,title) {
 		if($tw.utils.count(tiddler) === 0) {
 			newFields["selection-" + title] = "unchecked";
@@ -557,10 +562,12 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 	var self = this,
 		importTiddler = this.wiki.getTiddler(event.param),
-		importData = this.wiki.getTiddlerDataCached(event.param,{tiddlers: {}}),
+		importData,
 		importReport = [];
-	// Add the tiddlers to the store
 	importReport.push($tw.language.getString("Import/Imported/Hint") + "\n");
+	// If you need to modify the import tiddler payload then consider th-importing-tiddler instead
+	importTiddler = $tw.hooks.invokeHook("th-before-importing",importTiddler);
+	importData = this.wiki.getTiddlerDataCached(event.param,{tiddlers: {}}),
 	$tw.utils.each(importData.tiddlers,function(tiddlerFields) {
 		var title = tiddlerFields.title;
 		if(title && importTiddler && importTiddler.fields["selection-" + title] !== "unchecked") {
@@ -569,7 +576,10 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 			} else {
 				var tiddler = new $tw.Tiddler(tiddlerFields);
 			}
+			// th-importing-tiddler doesn't allow user interaction by default
+			// If you want to use the default UI then use: $:/core/modules/upgraders/ instead
 			tiddler = $tw.hooks.invokeHook("th-importing-tiddler",tiddler);
+			// Add the tiddlers to the store
 			self.wiki.addTiddler(tiddler);
 			importReport.push("# [[" + tiddler.fields.title + "]]");
 		}
@@ -621,16 +631,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;
 
 })();

package/core/modules/widgets/radio.js

@@ -41,7 +41,7 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
 	this.inputDomNode = this.document.createElement("input");
 	this.inputDomNode.setAttribute("type","radio");
 	if(isChecked) {
-		this.inputDomNode.setAttribute("checked","true");
+		this.inputDomNode.checked = true;
 	}
 	if(this.isDisabled === "yes") {
 		this.inputDomNode.setAttribute("disabled",true);
@@ -62,10 +62,14 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
 RadioWidget.prototype.getValue = function() {
 	var value,
 		tiddler = this.wiki.getTiddler(this.radioTitle);
-	if (this.radioIndex) {
-		value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex);
+	if(tiddler) {
+		if(this.radioIndex) {
+			value = this.wiki.extractTiddlerDataItem(this.radioTitle,this.radioIndex,this.radioDefault);
+		} else {
+			value = tiddler.getFieldString(this.radioField,this.radioDefault);
+		}
 	} else {
-		value = tiddler && tiddler.getFieldString(this.radioField);
+		value = this.radioDefault;
 	}
 	return value;
 };
@@ -101,6 +105,7 @@ RadioWidget.prototype.execute = function() {
 	this.radioIndex = this.getAttribute("index");
 	this.radioValue = this.getAttribute("value");
 	this.radioClass = this.getAttribute("class","");
+	this.radioDefault = this.getAttribute("default");
 	this.isDisabled = this.getAttribute("disabled","no");
 	this.radioActions = this.getAttribute("actions","");
 	// Make the child widgets
@@ -112,9 +117,13 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 RadioWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(($tw.utils.count(changedAttributes) > 0) || changedTiddlers[this.radioTitle]) {
+	if(($tw.utils.count(changedAttributes) > 0)) {
 		this.refreshSelf();
 		return true;
+	} else if(changedTiddlers[this.radioTitle]) {
+		this.inputDomNode.checked = this.getValue() === this.radioValue;
+		$tw.utils.toggleClass(this.labelDomNode,"tc-radio-selected",this.inputDomNode.checked);
+		return this.refreshChildren(changedTiddlers);
 	} else {
 		return this.refreshChildren(changedTiddlers);
 	}

package/core/modules/widgets/raw.js

@@ -32,7 +32,7 @@ RawWidget.prototype.render = function(parent,nextSibling) {
 	var div = this.document.createElement("div");
 	div.innerHTML=this.parseTreeNode.html;
 	parent.insertBefore(div,nextSibling);
-	this.domNodes.push(div);	
+	this.domNodes.push(div);
 };
 
 /*

package/core/modules/widgets/reveal.js

@@ -72,7 +72,7 @@ RevealWidget.prototype.positionPopup = function(domNode) {
 		case "belowright":
 			left = this.popup.left + this.popup.width;
 			top = this.popup.top + this.popup.height;
-			break;			
+			break;
 		case "right":
 			left = this.popup.left + this.popup.width;
 			top = this.popup.top;
@@ -84,7 +84,7 @@ RevealWidget.prototype.positionPopup = function(domNode) {
 		case "aboveleft":
 			left = this.popup.left - domNode.offsetWidth;
 			top = this.popup.top - domNode.offsetHeight;
-			break;			
+			break;
 		default: // Below
 			left = this.popup.left;
 			top = this.popup.top + this.popup.height;
@@ -226,7 +226,7 @@ RevealWidget.prototype.refresh = function(changedTiddlers) {
 				this.refreshSelf();
 				return true;
 			}
-		} else if(this.type === "popup" && this.updatePopupPosition && (changedTiddlers[this.state] || changedTiddlers[this.stateTitle])) {
+		} else if(this.type === "popup" && this.isOpen && this.updatePopupPosition && (changedTiddlers[this.state] || changedTiddlers[this.stateTitle])) {
 			this.positionPopup(this.domNode);
 		}
 		if(changedAttributes.style) {
@@ -234,7 +234,7 @@ RevealWidget.prototype.refresh = function(changedTiddlers) {
 		}
 		if(changedAttributes["class"]) {
 			this.assignDomNodeClasses();
-		}		
+		}
 		return this.refreshChildren(changedTiddlers);
 	}
 };