Merge branch 'master' into plugin-stability-badges

plugins/tiddlywiki/innerwiki/anchor.js

@@ -0,0 +1,17 @@
+/*\
+title: $:/plugins/tiddlywiki/innerwiki/anchor.js
+type: application/javascript
+module-type: widget
+
+Anchor widget to represent an innerwiki graphical anchor. Clone of the data widget
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.anchor = require("$:/core/modules/widgets/data.js").data;
+
+})();

plugins/tiddlywiki/innerwiki/data.js

@@ -1,58 +0,0 @@
-/*\
-title: $:/plugins/tiddlywiki/innerwiki/data.js
-type: application/javascript
-module-type: widget
-
-Widget to represent a single item of data
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var DataWidget = function(parseTreeNode,options) {
-	this.dataWidgetTag = parseTreeNode.type;
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-DataWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-DataWidget.prototype.render = function(parent,nextSibling) {
-	this.parentDomNode = parent;
-	this.computeAttributes();
-	this.execute();
-	this.renderChildren(parent,nextSibling);
-};
-
-/*
-Compute the internal state of the widget
-*/
-DataWidget.prototype.execute = function() {
-	// Construct the child widgets
-	this.makeChildWidgets();
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-DataWidget.prototype.refresh = function(changedTiddlers) {
-	// Refresh our attributes
-	var changedAttributes = this.computeAttributes();
-	// Refresh our children
-	return this.refreshChildren(changedTiddlers);
-};
-
-exports.data = DataWidget;
-exports.anchor = DataWidget;
-
-})();

plugins/tiddlywiki/innerwiki/innerwiki.js

@@ -15,7 +15,7 @@ Widget to display an innerwiki in an iframe
 var DEFAULT_INNERWIKI_TEMPLATE = "$:/plugins/tiddlywiki/innerwiki/template";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget,
-	DataWidget = require("$:/plugins/tiddlywiki/innerwiki/data.js").data,
+	DataWidget = require("$:/core/modules/widgets/data.js").data,
 	dm = $tw.utils.domMaker;
 
 var InnerWikiWidget = function(parseTreeNode,options) {
@@ -143,7 +143,7 @@ Create the anchors
 */
 InnerWikiWidget.prototype.createAnchors = function() {
 	var self = this;
-	this.findDataWidgets(this.children,"anchor",function(widget) {
+	this.findChildrenDataWidgets(this.children,"anchor",function(widget) {
 		var anchorWidth = 40,
 			anchorHeight = 40,
 			getAnchorCoordinate = function(name) {
@@ -233,76 +233,16 @@ InnerWikiWidget.prototype.createInnerHTML = function() {
 		IMPLANT_PREFIX = "<" + "script>\n$tw.preloadTiddlerArray(",
 		IMPLANT_SUFFIX = ");\n</" + "script>\n",
 		parts = html.split(SPLIT_MARKER),
-		tiddlers = this.readTiddlerDataWidgets(this.children);
+		tiddlers = [];
+	this.findChildrenDataWidgets(this.children,"data",function(widget) {
+		Array.prototype.push.apply(tiddlers,widget.readDataTiddlerValues());
+	});
 	if(parts.length === 2) {
 		html = parts[0] + IMPLANT_PREFIX + JSON.stringify(tiddlers) + IMPLANT_SUFFIX + SPLIT_MARKER + parts[1];
 	}
 	return html;
 };
 
-/*
-Find child data widgets
-*/
-InnerWikiWidget.prototype.findDataWidgets = function(children,tag,callback) {
-	var self = this;
-	$tw.utils.each(children,function(child) {
-		if(child.dataWidgetTag === tag) {
-			callback(child);
-		}
-		if(child.children) {
-			self.findDataWidgets(child.children,tag,callback);
-		}
-	});
-};
-
-/*
-Find the child data widgets
-*/
-InnerWikiWidget.prototype.readTiddlerDataWidgets = function(children) {
-	var self = this,
-		results = [];
-	this.findDataWidgets(children,"data",function(widget) {
-		Array.prototype.push.apply(results,self.readTiddlerDataWidget(widget));
-	});
-	return results;
-};
-
-/*
-Read the value(s) from a data widget
-*/
-InnerWikiWidget.prototype.readTiddlerDataWidget = function(dataWidget) {
-	// Start with a blank object
-	var item = Object.create(null);
-	// Read any attributes not prefixed with $
-	$tw.utils.each(dataWidget.attributes,function(value,name) {
-		if(name.charAt(0) !== "$") {
-			item[name] = value;			
-		}
-	});
-	// Deal with $tiddler or $filter attributes
-	var titles;
-	if(dataWidget.hasAttribute("$tiddler")) {
-		titles = [dataWidget.getAttribute("$tiddler")];
-	} else if(dataWidget.hasAttribute("$filter")) {
-		titles = this.wiki.filterTiddlers(dataWidget.getAttribute("$filter"));
-	}
-	if(titles) {
-		var self = this;
-		var results = [];
-		$tw.utils.each(titles,function(title,index) {
-			var tiddler = self.wiki.getTiddler(title),
-				fields;
-			if(tiddler) {
-				fields = tiddler.getFieldStrings();
-			}
-			results.push($tw.utils.extend({},fields,item));
-		})
-		return results;
-	} else {
-		return [item];		
-	}
-};
-
 /*
 Compute the internal state of the widget
 */

plugins/tiddlywiki/jasmine/run-wiki-based-tests.js

@@ -12,7 +12,7 @@ Tests the wiki based tests
 /*global $tw: false */
 "use strict";
 
-var TEST_WIKI_TIDDLER_FILTER = "[type[text/vnd.tiddlywiki-multiple]tag[$:/tags/wiki-test-spec]]";
+var TEST_WIKI_TIDDLER_FILTER = "[all[tiddlers+shadows]type[text/vnd.tiddlywiki-multiple]tag[$:/tags/wiki-test-spec]]";
 
 var widget = require("$:/core/modules/widgets/widget.js");
 
@@ -24,7 +24,11 @@ describe("Wiki-based tests", function() {
 		var tiddler = $tw.wiki.getTiddler(title);
 		it(tiddler.fields.title + ": " + tiddler.fields.description, function() {
 			// Add our tiddlers
-			var wiki = new $tw.Wiki();
+			var wiki = new $tw.Wiki(),
+				coreTiddler = $tw.wiki.getTiddler("$:/core");
+			if(coreTiddler) {
+				wiki.addTiddler(coreTiddler);
+			}
 			wiki.addTiddlers(readMultipleTiddlersTiddler(title));
 			// Complain if we don't have the ouput and expected results
 			if(!wiki.tiddlerExists("Output")) {