tiddlywiki 5.1.21 → 5.2.1

package/core/modules/utils/logger.js

@@ -22,15 +22,42 @@ function Logger(componentName,options) {
 	this.componentName = componentName || "";
 	this.colour = options.colour || "white";
 	this.enable = "enable" in options ? options.enable : true;
+	this.save = "save" in options ? options.save : true;
+	this.saveLimit = options.saveLimit || 100 * 1024;
+	this.saveBufferLogger = this;
+	this.buffer = "";
+	this.alertCount = 0;
 }
 
+Logger.prototype.setSaveBuffer = function(logger) {
+	this.saveBufferLogger = logger;
+};
+
 /*
 Log a message
 */
 Logger.prototype.log = function(/* args */) {
-	if(this.enable && console !== undefined && console.log !== undefined) {
-		return Function.apply.call(console.log, console, [$tw.utils.terminalColour(this.colour),this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)).concat($tw.utils.terminalColour()));
-	}
+	var self = this;
+	if(this.enable) {
+		if(this.saveBufferLogger.save) {
+			this.saveBufferLogger.buffer += $tw.utils.formatDateString(new Date(),"YYYY MM DD 0hh:0mm:0ss.0XXX") + ":";
+			$tw.utils.each(Array.prototype.slice.call(arguments,0),function(arg,index) {
+				self.saveBufferLogger.buffer += " " + arg;
+			});
+			this.saveBufferLogger.buffer += "\n";
+			this.saveBufferLogger.buffer = this.saveBufferLogger.buffer.slice(-this.saveBufferLogger.saveLimit);
+		}
+		if(console !== undefined && console.log !== undefined) {
+			return Function.apply.call(console.log, console, [$tw.utils.terminalColour(this.colour),this.componentName + ":"].concat(Array.prototype.slice.call(arguments,0)).concat($tw.utils.terminalColour()));
+		}
+	} 
+};
+
+/*
+Read the message buffer
+*/
+Logger.prototype.getBuffer = function() {
+	return this.saveBufferLogger.buffer;
 };
 
 /*
@@ -70,6 +97,7 @@ Logger.prototype.alert = function(/* args */) {
 					component: this.componentName
 				};
 				existingCount = 0;
+				this.alertCount += 1;
 			}
 			alertFields.modified = new Date();
 			if(++existingCount > 1) {
@@ -83,7 +111,23 @@ Logger.prototype.alert = function(/* args */) {
 		} else {
 			// Print an orange message to the console if not in the browser
 			console.error("\x1b[1;33m" + text + "\x1b[0m");
-		}		
+		}
+	}
+};
+
+/*
+Clear outstanding alerts
+*/
+Logger.prototype.clearAlerts = function() {
+	var self = this;
+	if($tw.browser && this.alertCount > 0) {
+		$tw.utils.each($tw.wiki.getTiddlersWithTag(ALERT_TAG),function(title) {
+			var tiddler = $tw.wiki.getTiddler(title);
+			if(tiddler.fields.component === self.componentName) {
+				$tw.wiki.deleteTiddler(title);
+			}
+		});
+		this.alertCount = 0;
 	}
 };
 

package/core/modules/utils/performance.js

@@ -21,7 +21,7 @@ function Performance(enabled) {
 
 Performance.prototype.showGreeting = function() {
 	if($tw.browser) {
-		this.logger.log("Execute $tw.perf.log(); to see filter execution timings");		
+		this.logger.log("Execute $tw.perf.log(); to see filter execution timings");
 	}
 };
 

package/core/modules/utils/transliterate.js

@@ -199,6 +199,8 @@ exports.transliterationPairs = {
 	"Nj":"N",
 	"Ñ":"N",
 	"NJ":"NJ",
+	"ð":"d",
+	"Ð":"D",
 	"Ó":"O",
 	"Ŏ":"O",
 	"Ǒ":"O",
@@ -265,6 +267,8 @@ exports.transliterationPairs = {
 	"Ɽ":"R",
 	"Ꜿ":"C",
 	"Ǝ":"E",
+	"ß":"ss",
+	"ẞ":"SS",
 	"Ś":"S",
 	"Ṥ":"S",
 	"Š":"S",
@@ -275,6 +279,8 @@ exports.transliterationPairs = {
 	"Ṡ":"S",
 	"Ṣ":"S",
 	"Ṩ":"S",
+	"þ": "th",
+	"Þ": "TH",
 	"Ť":"T",
 	"Ţ":"T",
 	"Ṱ":"T",
@@ -907,7 +913,8 @@ exports.transliterationPairs = {
 	"т":"t",
 	"ь":"'",
 	"б":"b",
-	"ю":"yu"
+	"ю":"yu",
+	"…":"..."
 };
 
 exports.transliterate = function(str) {

package/core/modules/utils/utils.js

@@ -53,6 +53,19 @@ exports.warning = function(text) {
 	exports.log(text,"brown/orange");
 };
 
+/*
+Log a table of name: value pairs
+*/
+exports.logTable = function(data) {
+	if(console.table) {
+		console.table(data);
+	} else {
+		$tw.utils.each(data,function(value,name) {
+			console.log(name + ": " + value);
+		});
+	}
+}
+
 /*
 Return the integer represented by the str (string).
 Return the dflt (default) parameter if str is not a base-10 number.
@@ -94,6 +107,36 @@ exports.trim = function(str) {
 	}
 };
 
+exports.trimPrefix = function(str,unwanted) {
+	if(typeof str === "string" && typeof unwanted === "string") {
+		if(unwanted === "") {
+			return str.replace(/^\s\s*/, '');
+		} else {
+			// Safely regexp-escape the unwanted text
+			unwanted = unwanted.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+			var regex = new RegExp('^(' + unwanted + ')+');
+			return str.replace(regex, '');
+		}
+	} else {
+		return str;
+	}
+};
+
+exports.trimSuffix = function(str,unwanted) {
+	if(typeof str === "string" && typeof unwanted === "string") {
+		if(unwanted === "") {
+			return str.replace(/\s\s*$/, '');
+		} else {
+			// Safely regexp-escape the unwanted text
+			unwanted = unwanted.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+			var regex = new RegExp('(' + unwanted + ')+$');
+			return str.replace(regex, '');
+		}
+	} else {
+		return str;
+	}
+};
+
 /*
 Convert a string to sentence case (ie capitalise first letter)
 */
@@ -107,7 +150,7 @@ Convert a string to title case (ie capitalise each initial letter)
 exports.toTitleCase = function(str) {
 	return (str || "").replace(/(^|\s)\S/g, function(c) {return c.toUpperCase();});
 }
-	
+
 /*
 Find the line break preceding a given position in a string
 Returns position immediately after that line break, or the start of the string
@@ -180,6 +223,7 @@ exports.removeArrayEntries = function(array,value) {
 			array.splice(p,1);
 		}
 	}
+	return array;
 };
 
 /*
@@ -251,6 +295,47 @@ exports.slowInSlowOut = function(t) {
 	return (1 - ((Math.cos(t * Math.PI) + 1) / 2));
 };
 
+exports.formatTitleString = function(template,options) {
+	var base = options.base || "",
+		separator = options.separator || "",
+		counter = options.counter || "";
+	var result = "",
+		t = template,
+		matches = [
+			[/^\$basename\$/i, function() {
+				return base;
+			}],
+			[/^\$count:(\d+)\$/i, function(match) {
+				return $tw.utils.pad(counter,match[1]);
+			}],
+			[/^\$separator\$/i, function() {
+				return separator;
+			}],
+			[/^\$count\$/i, function() {
+				return counter + "";
+			}]
+		];
+	while(t.length){
+		var matchString = "";
+		$tw.utils.each(matches, function(m) {
+			var match = m[0].exec(t);
+			if(match) {
+				matchString = m[1].call(null,match);
+				t = t.substr(match[0].length);
+				return false;
+			}
+		});
+		if(matchString) {
+			result += matchString;
+		} else {
+			result += t.charAt(0);
+			t = t.substr(1);
+		}
+	}
+	result = result.replace(/\\(.)/g,"$1");
+	return result;
+};
+
 exports.formatDateString = function(date,template) {
 	var result = "",
 		t = template,
@@ -259,7 +344,7 @@ exports.formatDateString = function(date,template) {
 				return $tw.utils.pad($tw.utils.getHours12(date));
 			}],
 			[/^wYYYY/, function() {
-				return $tw.utils.getYearForWeekNo(date);
+				return $tw.utils.pad($tw.utils.getYearForWeekNo(date),4);
 			}],
 			[/^hh12/, function() {
 				return $tw.utils.getHours12(date);
@@ -268,7 +353,14 @@ exports.formatDateString = function(date,template) {
 				return date.getDate() + $tw.utils.getDaySuffix(date);
 			}],
 			[/^YYYY/, function() {
-				return date.getFullYear();
+				return $tw.utils.pad(date.getFullYear(),4);
+			}],
+			[/^aYYYY/, function() {
+				return $tw.utils.pad(Math.abs(date.getFullYear()),4);
+			}],
+			[/^\{era:([^,\|}]*)\|([^}\|]*)\|([^}]*)\}/, function(match) {
+				var year = date.getFullYear();
+				return year === 0 ? match[2] : (year < 0 ? match[1] : match[3]);
 			}],
 			[/^0hh/, function() {
 				return $tw.utils.pad(date.getHours());
@@ -280,7 +372,7 @@ exports.formatDateString = function(date,template) {
 				return $tw.utils.pad(date.getSeconds());
 			}],
 			[/^0XXX/, function() {
-				return $tw.utils.pad(date.getMilliseconds());
+				return $tw.utils.pad(date.getMilliseconds(),3);
 			}],
 			[/^0DD/, function() {
 				return $tw.utils.pad(date.getDate());
@@ -291,6 +383,15 @@ exports.formatDateString = function(date,template) {
 			[/^0WW/, function() {
 				return $tw.utils.pad($tw.utils.getWeek(date));
 			}],
+			[/^0ddddd/, function() {
+				return $tw.utils.pad(Math.floor((date - new Date(date.getFullYear(), 0, 0)) / 1000 / 60 / 60 / 24),3);
+			}],
+			[/^ddddd/, function() {
+				return Math.floor((date - new Date(date.getFullYear(), 0, 0)) / 1000 / 60 / 60 / 24);
+			}],
+			[/^dddd/, function() {
+				return [7,1,2,3,4,5,6][date.getDay()];
+			}],
 			[/^ddd/, function() {
 				return $tw.language.getString("Date/Short/Day/" + date.getDay());
 			}],
@@ -357,7 +458,7 @@ exports.formatDateString = function(date,template) {
 		$tw.utils.each(matches, function(m) {
 			var match = m[0].exec(t);
 			if(match) {
-				matchString = m[1].call();
+				matchString = m[1].call(null,match);
 				t = t.substr(match[0].length);
 				return false;
 			}
@@ -465,6 +566,15 @@ exports.htmlEncode = function(s) {
 	}
 };
 
+// Converts like htmlEncode, but forgets the double quote for brevity
+exports.htmlTextEncode = function(s) {
+	if(s) {
+		return s.toString().replace(/&/mg,"&amp;").replace(/</mg,"&lt;").replace(/>/mg,"&gt;");
+	} else {
+		return "";
+	}
+};
+
 // Converts all HTML entities to their character equivalents
 exports.entityDecode = function(s) {
 	var converter = String.fromCodePoint || String.fromCharCode,
@@ -514,7 +624,7 @@ exports.escape = function(ch) {
 
 // Turns a string into a legal JavaScript string
 // Copied from peg.js, thanks to David Majda
-exports.stringify = function(s) {
+exports.stringify = function(s, rawUnicode) {
 	/*
 	* ECMA-262, 5th ed., 7.8.4: All characters may appear literally in a string
 	* literal except for the closing quote character, backslash, carriage return,
@@ -523,19 +633,21 @@ exports.stringify = function(s) {
 	*
 	* For portability, we also escape all non-ASCII characters.
 	*/
+	var regex = rawUnicode ? /[\x00-\x1f]/g : /[\x00-\x1f\x80-\uFFFF]/g;
 	return (s || "")
 		.replace(/\\/g, '\\\\')            // backslash
 		.replace(/"/g, '\\"')              // double quote character
 		.replace(/'/g, "\\'")              // single quote character
 		.replace(/\r/g, '\\r')             // carriage return
 		.replace(/\n/g, '\\n')             // line feed
-		.replace(/[\x00-\x1f\x80-\uFFFF]/g, exports.escape); // non-ASCII characters
+		.replace(regex, exports.escape);   // non-ASCII characters
 };
 
 // Turns a string into a legal JSON string
 // Derived from peg.js, thanks to David Majda
-exports.jsonStringify = function(s) {
+exports.jsonStringify = function(s, rawUnicode) {
 	// See http://www.json.org/
+	var regex = rawUnicode ? /[\x00-\x1f]/g : /[\x00-\x1f\x80-\uFFFF]/g;
 	return (s || "")
 		.replace(/\\/g, '\\\\')            // backslash
 		.replace(/"/g, '\\"')              // double quote character
@@ -544,7 +656,7 @@ exports.jsonStringify = function(s) {
 		.replace(/\x08/g, '\\b')           // backspace
 		.replace(/\x0c/g, '\\f')           // formfeed
 		.replace(/\t/g, '\\t')             // tab
-		.replace(/[\x00-\x1f\x80-\uFFFF]/g,function(s) {
+		.replace(regex,function(s) {
 			return '\\u' + $tw.utils.pad(s.charCodeAt(0).toString(16).toUpperCase(),4);
 		}); // non-ASCII characters
 };
@@ -566,7 +678,7 @@ exports.nextTick = function(fn) {
 /*global window: false */
 	if(typeof process === "undefined") {
 		// Apparently it would be faster to use postMessage - http://dbaron.org/log/20100309-faster-timeouts
-		window.setTimeout(fn,4);
+		window.setTimeout(fn,0);
 	} else {
 		process.nextTick(fn);
 	}
@@ -638,9 +750,8 @@ exports.isValidFieldName = function(name) {
 	if(!name || typeof name !== "string") {
 		return false;
 	}
-	name = name.toLowerCase().trim();
-	var fieldValidatorRegEx = /^[a-z0-9\-\._]+$/mg;
-	return fieldValidatorRegEx.test(name);
+	// Since v5.2.x, there are no restrictions on characters in field names
+	return name;
 };
 
 /*
@@ -728,16 +839,20 @@ exports.timer = function(base) {
 /*
 Convert text and content type to a data URI
 */
-exports.makeDataUri = function(text,type) {
+exports.makeDataUri = function(text,type,_canonical_uri) {
 	type = type || "text/vnd.tiddlywiki";
 	var typeInfo = $tw.config.contentTypeInfo[type] || $tw.config.contentTypeInfo["text/plain"],
 		isBase64 = typeInfo.encoding === "base64",
 		parts = [];
-	parts.push("data:");
-	parts.push(type);
-	parts.push(isBase64 ? ";base64" : "");
-	parts.push(",");
-	parts.push(isBase64 ? text : encodeURIComponent(text));
+	if(_canonical_uri) {
+		parts.push(_canonical_uri);
+	} else {
+		parts.push("data:");
+		parts.push(type);
+		parts.push(isBase64 ? ";base64" : "");
+		parts.push(",");
+		parts.push(isBase64 ? text : encodeURIComponent(text));
+	}
 	return parts.join("");
 };
 
@@ -779,4 +894,88 @@ exports.strEndsWith = function(str,ending,position) {
 	}
 };
 
+/*
+Return system information useful for debugging
+*/
+exports.getSystemInfo = function(str,ending,position) {
+	var results = [],
+		save = function(desc,value) {
+			results.push(desc + ": " + value);
+		};
+	if($tw.browser) {
+		save("User Agent",navigator.userAgent);
+		save("Online Status",window.navigator.onLine);
+	}
+	if($tw.node) {
+		save("Node Version",process.version);
+	}
+	return results.join("\n");
+};
+
+exports.parseNumber = function(str) {
+	return parseFloat(str) || 0;
+};
+
+exports.parseInt = function(str) {
+	return parseInt(str,10) || 0;
+};
+
+exports.stringifyNumber = function(num) {
+	return num + "";
+};
+
+exports.makeCompareFunction = function(type,options) {
+	options = options || {};
+	// set isCaseSensitive to true if not defined in options
+	var isCaseSensitive = (options.isCaseSensitive === false) ? false : true,
+		gt = options.invert ? -1 : +1,
+		lt = options.invert ? +1 : -1,
+		compare = function(a,b) {
+			if(a > b) {
+				return gt ;
+			} else if(a < b) {
+				return lt;
+			} else {
+				return 0;
+			}
+		},
+		types = {
+			"number": function(a,b) {
+				return compare($tw.utils.parseNumber(a),$tw.utils.parseNumber(b));
+			},
+			"integer": function(a,b) {
+				return compare($tw.utils.parseInt(a),$tw.utils.parseInt(b));
+			},
+			"string": function(a,b) {
+				if(!isCaseSensitive) {
+					a = a.toLowerCase();
+					b = b.toLowerCase();
+				}
+				return compare("" + a,"" + b);
+			},
+			"date": function(a,b) {
+				var dateA = $tw.utils.parseDate(a),
+					dateB = $tw.utils.parseDate(b);
+				if(!isFinite(dateA)) {
+					dateA = new Date(0);
+				}
+				if(!isFinite(dateB)) {
+					dateB = new Date(0);
+				}
+				return compare(dateA,dateB);
+			},
+			"version": function(a,b) {
+				return $tw.utils.compareVersions(a,b);
+			},
+			"alphanumeric": function(a,b) {
+				if(!isCaseSensitive) {
+					a = a.toLowerCase();
+					b = b.toLowerCase();
+				}
+				return options.invert ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
+			}
+		};
+	return (types[type] || types[options.defaultType] || types.number);
+};
+
 })();

package/core/modules/widgets/action-confirm.js

@@ -0,0 +1,78 @@
+/*\
+
+title: $:/core/modules/widgets/action-confirm.js
+type: application/javascript
+module-type: widget
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var ConfirmWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+ConfirmWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+ConfirmWidget.prototype.render = function(parent,nextSibling) {
+	this.computeAttributes();
+	this.execute();
+	this.parentDomNode = parent;
+	this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+ConfirmWidget.prototype.execute = function() {
+	this.message = this.getAttribute("$message",$tw.language.getString("ConfirmAction"));
+	this.prompt = (this.getAttribute("$prompt","yes") == "no" ? false : true);
+	this.makeChildWidgets();
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+ConfirmWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	if(changedAttributes["$message"] || changedAttributes["$prompt"]) {
+		this.refreshSelf();
+		return true;
+	}
+	return this.refreshChildren(changedTiddlers);
+};
+
+/*
+Invoke the action associated with this widget
+*/
+ConfirmWidget.prototype.invokeAction = function(triggeringWidget,event) {
+	var invokeActions = true,
+		handled = true,
+	    	win = event && event.event && event.event.view ? event.event.view : window;
+	if(this.prompt) {
+		invokeActions = win.confirm(this.message);
+	}
+	if(invokeActions) {
+		handled = this.invokeActions(triggeringWidget,event);
+	}
+	return handled;
+};
+
+ConfirmWidget.prototype.allowActionPropagation = function() {
+	return false;
+};
+
+exports["action-confirm"] = ConfirmWidget;
+
+})();

package/core/modules/widgets/action-createtiddler.js

@@ -9,7 +9,7 @@ Action widget to create a new tiddler with a unique name and specified fields.
 (function(){
 
 /*jslint node: true, browser: true */
-/*global $tw: false */
+/*global $tw:false, require:false, exports:false */
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
@@ -27,8 +27,11 @@ CreateTiddlerWidget.prototype = new Widget();
 Render this widget into the DOM
 */
 CreateTiddlerWidget.prototype.render = function(parent,nextSibling) {
+	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
+	// Render children
+	this.renderChildren(parent,nextSibling);
 };
 
 /*
@@ -36,9 +39,16 @@ Compute the internal state of the widget
 */
 CreateTiddlerWidget.prototype.execute = function() {
 	this.actionBaseTitle = this.getAttribute("$basetitle");
+	this.hasBase = !!this.actionBaseTitle;
 	this.actionSaveTitle = this.getAttribute("$savetitle");
 	this.actionSaveDraftTitle = this.getAttribute("$savedrafttitle");
 	this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
+	//Following params are new since 5.1.22
+	this.actionTemplate = this.getAttribute("$template");
+	this.useTemplate = !!this.actionTemplate;
+	this.actionOverwrite = this.getAttribute("$overwrite","no");
+	// Construct the child widgets
+	this.makeChildWidgets();
 };
 
 /*
@@ -57,7 +67,7 @@ CreateTiddlerWidget.prototype.refresh = function(changedTiddlers) {
 Invoke the action associated with this widget
 */
 CreateTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) {
-	var title = this.wiki.generateNewTitle(this.actionBaseTitle),
+	var title = this.wiki.getTiddlerText("$:/language/DefaultNewTiddlerTitle"), // Get the initial new-tiddler title
 		fields = {},
 		creationFields,
 		modificationFields;
@@ -70,13 +80,31 @@ CreateTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) {
 		creationFields = this.wiki.getCreationFields();
 		modificationFields = this.wiki.getModificationFields();
 	}
-	var tiddler = this.wiki.addTiddler(new $tw.Tiddler(creationFields,fields,modificationFields,{title: title}));
+	if(this.hasBase && this.actionOverwrite === "no") {
+		title = this.wiki.generateNewTitle(this.actionBaseTitle);
+	} else if (this.hasBase && this.actionOverwrite === "yes") {
+		title = this.actionBaseTitle
+	}
+	// NO $basetitle BUT $template parameter is available
+	// the title MUST be unique, otherwise the template would be overwritten
+	if (!this.hasBase && this.useTemplate) {
+		title = this.wiki.generateNewTitle(this.actionTemplate);
+	} else if (!this.hasBase && !this.useTemplate) {
+		// If no $basetitle and no $template then use initial title
+		title = this.wiki.generateNewTitle(title);
+	}
+	var templateTiddler = this.wiki.getTiddler(this.actionTemplate) || {};
+	this.wiki.addTiddler(new $tw.Tiddler(templateTiddler.fields,creationFields,fields,modificationFields,{title: title}));
+	var draftTitle = this.wiki.generateDraftTitle(title);
 	if(this.actionSaveTitle) {
 		this.wiki.setTextReference(this.actionSaveTitle,title,this.getVariable("currentTiddler"));
 	}
 	if(this.actionSaveDraftTitle) {
-		this.wiki.setTextReference(this.actionSaveDraftTitle,this.wiki.generateDraftTitle(title),this.getVariable("currentTiddler"));
+		this.wiki.setTextReference(this.actionSaveDraftTitle,draftTitle,this.getVariable("currentTiddler"));
 	}
+	this.setVariable("createTiddler-title",title);
+	this.setVariable("createTiddler-draftTitle",draftTitle);
+	this.refreshChildren();
 	return true; // Action was invoked
 };
 

package/core/modules/widgets/action-deletefield.js

@@ -73,7 +73,7 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
 			}
 		});
 		if(hasChanged) {
-			this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,removeFields,this.wiki.getModificationFields()));			
+			this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,removeFields,this.wiki.getModificationFields()));
 		}
 	}
 	return true; // Action was invoked