tiddlywiki 5.3.2 → 5.3.4

package/plugins/tiddlywiki/geospatial/widgets/geobaselayer.js

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

package/plugins/tiddlywiki/geospatial/widgets/geolayer.js

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

package/plugins/tiddlywiki/geospatial/widgets/geomap.js

@@ -0,0 +1,301 @@
+/*\
+title: $:/plugins/tiddlywiki/geospatial/geomap.js
+type: application/javascript
+module-type: widget
+
+Leaflet map widget
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var GeomapWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+GeomapWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+GeomapWidget.prototype.render = function(parent,nextSibling) {
+	// Housekeeping
+	this.parentDomNode = parent;
+	this.computeAttributes();
+	this.execute();
+	// Render the children into a hidden DOM node
+	var parser = {
+		tree: [{
+			type: "widget",
+			attributes: {},
+			orderedAttributes: [],
+			children: this.parseTreeNode.children || []
+		}]
+	};
+	this.contentRoot = this.wiki.makeWidget(parser,{
+		document: $tw.fakeDocument,
+		parentWidget: this
+	});
+	this.contentContainer = $tw.fakeDocument.createElement("div");
+	this.contentRoot.render(this.contentContainer,null);
+	// Render a wrapper for the map
+	this.domNode = this.document.createElement("div");
+	this.domNode.style.width = "100%";
+	this.domNode.style.height = "600px";
+	// Insert it into the DOM
+	parent.insertBefore(this.domNode,nextSibling);
+	this.domNodes.push(this.domNode);
+	// Render the map
+	if($tw.browser && !this.domNode.isTiddlyWikiFakeDom) {
+		this.renderMap();
+		this.refreshMap();
+	}
+};
+
+GeomapWidget.prototype.renderMap = function() {
+	var self = this;
+	// Create the map
+	this.map = $tw.Leaflet.map(this.domNode);
+	// No layers rendered
+	this.renderedLayers = [];
+	this.baseLayers = [];
+	// Disable Leaflet attribution
+	this.map.attributionControl.setPrefix("");
+	// Add scale
+	$tw.Leaflet.control.scale().addTo(this.map);
+	// Listen for pan and zoom events and update the state tiddler
+	this.map.on("moveend zoomend",function(event) {
+		if(self.geomapStateTitle) {
+			var c = self.map.getCenter(),
+				lat = "" + c.lat,
+				long = "" + c.lng,
+				zoom = "" + self.map.getZoom(),
+				tiddler = self.wiki.getTiddler(self.geomapStateTitle);
+			// Only write the tiddler if the values have changed
+			if(!tiddler || tiddler.fields.lat !== lat || tiddler.fields.long !== long || tiddler.fields.zoom !== zoom) {
+				self.wiki.addTiddler(new $tw.Tiddler({
+					title: self.geomapStateTitle,
+					lat: lat,
+					long: long,
+					zoom: zoom
+				}));
+			}
+		}
+	});
+};
+
+GeomapWidget.prototype.refreshMap = function() {
+	var self = this;
+	// Remove any previously rendered layers
+	$tw.utils.each(this.renderedLayers,function(layer) {
+		self.map.removeLayer(layer.layer);
+	});
+	this.renderedLayers = []; // Array of {name:,layer:}
+	$tw.utils.each(this.renderedBaseLayers,function(baseLayer) {
+		self.map.removeLayer(baseLayer.layer);
+	});
+	this.renderedBaseLayers = []; // Array of {name:,layer:}
+	// Create default icon
+	var iconProportions = 365/560,
+		iconHeight = 50;
+	var myIcon = new $tw.Leaflet.Icon({
+		iconUrl: $tw.utils.makeDataUri(this.wiki.getTiddlerText("$:/plugins/tiddlywiki/geospatial/images/markers/pin"),"image/svg+xml"),
+		iconSize:     [iconHeight * iconProportions, iconHeight], // Size of the icon
+		iconAnchor:   [(iconHeight * iconProportions) / 2, iconHeight], // Position of the anchor within the icon
+		popupAnchor:  [0, -iconHeight] // Position of the popup anchor relative to the icon anchor
+	});
+	// Counter for autogenerated names
+	var untitledCount = 1;
+	// Process embedded geobaselayer widgets
+	function loadBaseLayer(layerInfo) {
+		if(layerInfo.title) {
+			var tiddler = self.wiki.getTiddler(layerInfo.title);
+			if(tiddler) {
+				layerInfo.name = layerInfo.name || tiddler.fields["caption"];
+				layerInfo.tilesUrl = layerInfo.tilesUrl || tiddler.fields["tiles-url"];
+				layerInfo.maxZoom = layerInfo.maxZoom || tiddler.fields["max-zoom"];
+				layerInfo.attribution = layerInfo.attribution || tiddler.fields.text;	
+			}
+		}
+		var baseLayer = $tw.Leaflet.tileLayer(layerInfo.tilesUrl, {
+			maxZoom: layerInfo.maxZoom,
+			attribution: layerInfo.attribution
+		});
+		if(self.renderedBaseLayers.length === 0) {
+			baseLayer.addTo(self.map)
+		}
+		var name = layerInfo.name || ("Untitled " + untitledCount++);
+		self.renderedBaseLayers.push({name: name, layer: baseLayer});
+	}
+	this.findChildrenDataWidgets(this.contentRoot.children,"geobaselayer",function(widget) {
+		loadBaseLayer({
+			name: widget.getAttribute("name"),
+			title: widget.getAttribute("title"),
+			tilesUrl: widget.getAttribute("tiles-url"),
+			maxZoom: widget.getAttribute("max-zoom"),
+			attribution: widget.getAttribute("attribution"),
+		});
+	});
+	// Create the default base map if none was specified
+	if(this.renderedBaseLayers.length === 0) {
+		// Render in reverse order so that the first tagged base layer will be rendered last, and hence take priority
+		var baseLayerTitles = this.wiki.filterTiddlers("[all[tiddlers+shadows]tag[$:/tags/GeoBaseLayer]]");
+		$tw.utils.each(baseLayerTitles,function(title) {
+			loadBaseLayer({title: title});
+		});
+	}
+	if(this.renderedBaseLayers.length === 0) {
+		loadBaseLayer({title: "$:/plugins/tiddlywiki/geospatial/baselayers/openstreetmap"});
+	}
+	// Make a marker cluster
+	var markers = $tw.Leaflet.markerClusterGroup({
+		maxClusterRadius: 40
+	});
+	this.map.addLayer(markers);
+	// Process embedded geolayer widgets
+	this.findChildrenDataWidgets(this.contentRoot.children,"geolayer",function(widget) {
+		var jsonText = widget.getAttribute("json"),
+			geoJson = [];
+		if(jsonText) {
+			// Layer is defined by JSON blob
+			geoJson = $tw.utils.parseJSONSafe(jsonText,[]);
+		} else if(widget.hasAttribute("lat") && widget.hasAttribute("long")) {
+			// Layer is defined by lat long fields
+			var lat = $tw.utils.parseNumber(widget.getAttribute("lat","0")),
+				long = $tw.utils.parseNumber(widget.getAttribute("long","0")),
+				alt = $tw.utils.parseNumber(widget.getAttribute("alt","0"));
+			geoJson = {
+				"type": "FeatureCollection",
+				"features": [
+					{
+						"type": "Feature",
+						"geometry": {
+							"type": "Point",
+							"coordinates": [long,lat,alt]
+						}
+					}
+				]
+			};
+		}
+		var draggable = widget.getAttribute("draggable","no") === "yes",
+			layer = $tw.Leaflet.geoJSON(geoJson,{
+				style: function(geoJsonFeature) {
+					return {
+						color: widget.getAttribute("color","yellow")
+					}
+				},
+				pointToLayer: function(geoJsonPoint,latlng) {
+					var marker = $tw.Leaflet.marker(latlng,{icon: myIcon,draggable: draggable});
+					marker.addTo(markers);
+					marker.on("moveend",function(event) {
+						var latlng = event.sourceTarget.getLatLng();
+						self.invokeActionString(widget.getAttribute("updateActions"),null,event,{
+							lat: latlng.lat,
+							long: latlng.lng
+						});
+					});
+					return marker;
+				},
+				onEachFeature: function(feature,layer) {
+					if(feature.properties) {
+						layer.bindPopup(JSON.stringify(feature.properties,null,4));
+					}
+				}
+			}).addTo(self.map);
+		var name = widget.getAttribute("name") || ("Untitled " + untitledCount++);
+		self.renderedLayers.push({name: name, layer: layer});
+	});
+	// Setup the layer control
+	if(this.layerControl) {
+		this.map.removeControl(this.layerControl);
+	}
+	var baseLayers = {};
+	$tw.utils.each(this.renderedBaseLayers,function(layer) {
+		baseLayers[layer.name] = layer.layer;
+	});
+	var overlayLayers = {};
+	$tw.utils.each(this.renderedLayers,function(layer) {
+		overlayLayers[layer.name] = layer.layer;
+	});
+	this.layerControl = $tw.Leaflet.control.layers(baseLayers,overlayLayers,{
+		collapsed: this.geomapLayersPanel !== "open"
+	}).addTo(this.map);
+	// Restore the saved map position and zoom level
+	if(!this.setMapView()) {
+		// If there was no saved position then look at the startPosition attribute
+		switch(this.geomapStartPosition) {
+			case "bounds":
+				var bounds = null;
+				$tw.utils.each(this.renderedLayers,function(layer) {
+					var featureBounds = layer.layer.getBounds();
+					if(bounds) {
+						bounds.extend(featureBounds);
+					} else {
+						bounds = featureBounds;
+					}
+				});
+				if(bounds) {
+					this.map.fitBounds(bounds);
+				} else {
+					this.map.fitWorld();
+				}
+				break;
+			default:
+				this.map.fitWorld();
+				break;
+		}
+	}
+};
+
+/*
+Set the map center and zoom level from the values in the state tiddler. Returns true if the map view was successfully set
+*/
+GeomapWidget.prototype.setMapView = function() {
+	var stateTiddler = this.geomapStateTitle && this.wiki.getTiddler(this.geomapStateTitle);
+	if(stateTiddler) {
+		this.map.setView([$tw.utils.parseNumber(stateTiddler.fields.lat,0),$tw.utils.parseNumber(stateTiddler.fields.long,0)], $tw.utils.parseNumber(stateTiddler.fields.zoom,0));
+		return true;
+	}
+	return false;
+};
+
+/*
+Compute the internal state of the widget
+*/
+GeomapWidget.prototype.execute = function() {
+	this.geomapStateTitle = this.getAttribute("state");
+	this.geomapStartPosition = this.getAttribute("startPosition");
+	this.geomapLayersPanel = this.getAttribute("layersPanel");
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+GeomapWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	// Refresh child nodes, and rerender map if there have been any changes
+	var result = this.contentRoot.refresh(changedTiddlers);
+	if(result) {
+		this.refreshMap();
+	} else {
+		// If we're not doing a full refresh, reset the position if the state tiddler has changed
+		if(changedAttributes.state || changedTiddlers[this.geomapStateTitle]) {
+			this.geomapStateTitle = this.getAttribute("state");
+			this.setMapView();
+		}
+	}
+	return result;
+};
+
+exports.geomap = GeomapWidget;
+
+})();
+

package/plugins/tiddlywiki/github-fork-ribbon/plugin.info

@@ -3,5 +3,6 @@
 	"name": "GitHub Fork Ribbon",
 	"description": "GitHub-inspired corner ribbon",
 	"author": "Simon Whitaker",
-	"list": "readme usage"
+	"list": "readme usage",
+	"stability": "STABILITY_0_DEPRECATED"
 }

package/plugins/tiddlywiki/github-fork-ribbon/readme.tid

@@ -4,8 +4,6 @@ This plugin provides a diagonal ribbon across the corner of the window. It resem
 
 The ribbon can be positioned over any corner, and can incorporate user defined text, colours and a link.
 
-The CSS stylesheet is adapted from work by Simon Whitaker:
+The CSS stylesheet is adapted from work by [[Simon Whitaker|https://github.com/simonwhitaker/github-fork-ribbon-css/]]
 
-https://github.com/simonwhitaker/github-fork-ribbon-css/
-
-[[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]
+[[Plugin source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/github-fork-ribbon]]

package/plugins/tiddlywiki/github-fork-ribbon/styles.tid

@@ -1,5 +1,4 @@
 title: $:/plugins/tiddlywiki/github-fork-ribbon/styles
-tags: [[$:/tags/Stylesheet]]
 
 /* Left will inherit from right (so we don't need to duplicate code */
 .github-fork-ribbon {
@@ -10,7 +9,7 @@ tags: [[$:/tags/Stylesheet]]
   padding: 2px 0;
 
   /* Set the base colour */
-  background-color: #a00;
+  background-color: <<color>>;
 
   /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */
   background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.00)), to(rgba(0, 0, 0, 0.15)));
@@ -25,7 +24,7 @@ tags: [[$:/tags/Stylesheet]]
   -webkit-box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
   box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5);
 
-  z-index: 999;
+  z-index: 700;
   pointer-events: auto;
 }
 
@@ -61,8 +60,8 @@ tags: [[$:/tags/Stylesheet]]
   height: 150px;
   position: absolute;
   overflow: hidden;
-  top: 0;
-  z-index: 999;
+  top: <<top>>;
+  z-index: 700;
   pointer-events: none;
 }
 
@@ -71,25 +70,25 @@ tags: [[$:/tags/Stylesheet]]
 }
 
 .github-fork-ribbon-wrapper.left {
-  left: 0;
+  left: <<left>>;
 }
 
 .github-fork-ribbon-wrapper.right {
-  right: 0;
+  right: <<right>>;
 }
 
 .github-fork-ribbon-wrapper.left-bottom {
   position: fixed;
   top: inherit;
-  bottom: 0;
-  left: 0;
+  bottom: <<bottom>>;
+  left: <<left>>;
 }
 
 .github-fork-ribbon-wrapper.right-bottom {
   position: fixed;
   top: inherit;
-  bottom: 0;
-  right: 0;
+  bottom: <<bottom>>;
+  right: <<right>>;
 }
 
 .github-fork-ribbon-wrapper.right .github-fork-ribbon {

package/plugins/tiddlywiki/github-fork-ribbon/template.tid

@@ -0,0 +1,26 @@
+title: $:/plugins/tiddlywiki/github-fork-ribbon/template
+
+<!-- Parameters:
+position: "right", "left", "right-bottom" and "left-bottom" 
+url: link target
+text: ribbon text
+color: defaults to "#aa0000" - dark red
+top: offset from the top in px - eg: "30px"
+bottom: offset from the bottom in px - No ;
+left: offset from left in px - No ;
+right: offset from right in px - No ;
+fixed: "fixed" .. If ribbon is at the top, it can be "fixed". Bottom is always fixed
+-->
+\parameters (position:"right", url:"https://github.com/Jermolene/TiddlyWiki5", text:"Fork me on ~GitHub" color:"#aa0000" top:"0" bottom:"0" left:"0" right:"0" fixed:"")
+
+<style>
+{{$:/plugins/tiddlywiki/github-fork-ribbon/styles}}
+</style>
+
+<div class={{{ github-fork-ribbon-wrapper [<position>] [<fixed>] +[join[ ]] }}}>
+	<div class="github-fork-ribbon">
+		<a href=<<url>>>
+			<<text>>
+		</a>
+	</div>
+</div>

package/plugins/tiddlywiki/github-fork-ribbon/usage.tid

@@ -1,26 +1,81 @@
 title: $:/plugins/tiddlywiki/github-fork-ribbon/usage
 
-Copy appropriate chunks on a new tiddler and tag it `$:/tags/PageControls`. Name of the new tiddler does not matter. Only the tag matters.
-
-```
-<!-- TOP RIGHT RIBBON: START COPYING HERE -->
-<div class="github-fork-ribbon-wrapper right"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
-</div>
-<!-- TOP RIGHT RIBBON: END COPYING HERE -->
-
-<!-- TOP LEFT RIBBON: START COPYING HERE -->
-<div class="github-fork-ribbon-wrapper left"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
-</div>
-<!-- TOP LEFT RIBBON: END COPYING HERE -->
-
-
-<!-- BOTTOM RIGHT RIBBON: START COPYING HERE -->
-<div class="github-fork-ribbon-wrapper right-bottom"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
-</div>
-<!-- BOTTOM RIGHT RIBBON: END COPYING HERE -->
-
-<!-- BOTTOM LEFT RIBBON: START COPYING HERE -->
-<div class="github-fork-ribbon-wrapper left-bottom"><div class="github-fork-ribbon"><a href="https://github.com/simonwhitaker/github-fork-ribbon-css">Fork me on ~GitHub</a></div>
-</div>
-<!-- BOTTOM LEFT RIBBON: END COPYING HERE -->
-```
+\procedure ribbonCode()
+\whitespace trim
+<$transclude $tiddler="$:/plugins/tiddlywiki/github-fork-ribbon/template" top="30px" fixed=fixed color="green"/>
+\end
+
+\procedure ribbonCreateActions()
+<% if [[$:/github-ribbon]!is[tiddler]] %>
+	<$action-setfield $tiddler="$:/github-ribbon" $field="text" $value=<<ribbonCode>>
+		tags="$:/tags/PageTemplate" 
+		code-body="yes" />
+<% endif %>
+<$action-navigate $to="$:/github-ribbon" />
+\end
+
+\procedure createRibbon()
+<$button actions=<<ribbonCreateActions>> >
+<%if [[$:/github-ribbon]!is[tiddler]] %>
+Create
+<% else %>
+Show
+<% endif %> ~$:/github-ribbon
+</$button>
+\end
+
+\procedure ribbonToggleTagActions()
+<$action-listops $tiddler="$:/github-ribbon" $field="tags" $subfilter="+[toggle[$:/tags/PageTemplate]]" />
+\end
+
+\procedure ribbonToggleTag() <$button actions=<<ribbonToggleTagActions>> >Toggle Tag</$button>
+
+
+`$:/plugins/tiddlywiki/github-fork-ribbon/template` is a template tiddler, that can be used with a transclusion and parameters.
+
+!! Usage
+
+* Create a new tiddler eg: $:/github-ribbon
+* Tag it `$:/tags/PageTemplate`
+* Copy the code below
+
+<pre><$text text=<<ribbonCode>>/></pre>
+
+<<createRibbon>> <<ribbonToggleTag>>
+
+!! Parameters
+
+; position
+: "right" (default), "left", "right-bottom" and "left-bottom"
+
+; url
+: Target URL, default: https://github.com/Jermolene/TiddlyWiki5
+
+; text
+: Ribbon text. default: `Fork me on ~GitHub`
+
+; color
+: Ribbon background color: default: `#aa0000`
+
+; top
+: Offset from the top if postion is top. default: `0` eg: `30px`, if the menu-toolbar plugin is installed
+
+; bottom
+: Offset from the bottom in px
+
+; left
+: Offset from the left in px
+
+; right
+: Offset from the right in px
+
+; fixed
+: If position is ''top'', the ribbon will scroll out of the viewport by default
+: If the parameter `fixed="fixed"` it will be fixed
+
+!! Remove the Ribbon
+
+* Disable the plugin
+* ''Remove the tag'' from $:/github-ribbon tiddler
+* Delete the $:/github-ribbon tiddler
+* <<ribbonToggleTag>>

package/plugins/tiddlywiki/googleanalytics/plugin.info

@@ -3,5 +3,6 @@
 	"name": "Google Analytics",
 	"description": "Website visitor statistics from Google",
 	"contributor": "Sylvain Comte",
-	"list": "readme settings usage"
+	"list": "readme settings usage",
+	"stability": "STABILITY_2_STABLE"
 }

package/plugins/tiddlywiki/hammerjs/plugin.info

@@ -3,5 +3,6 @@
 	"name": "HammerJS",
 	"description": "HammerJS touch gesture library",
 	"author": "Jorik Tangelder (Eight Media)",
-	"list": "readme license"
+	"list": "readme license",
+	"stability": "STABILITY_0_DEPRECATED"
 }

package/plugins/tiddlywiki/help/plugin.info

@@ -2,5 +2,6 @@
 	"title": "$:/plugins/tiddlywiki/help",
 	"name": "Help",
 	"description": "Floating help panel",
-	"list": "readme"
+	"list": "readme",
+	"stability": "STABILITY_2_STABLE"
 }

package/plugins/tiddlywiki/highlight/files/tiddlywiki.files

@@ -7,7 +7,6 @@
 				"title": "$:/plugins/tiddlywiki/highlight/highlight.js",
 				"module-type": "library"
 			},
-			"prefix": "var hljs = require(\"$:/plugins/tiddlywiki/highlight/highlight.js\");\n",
 			"suffix": "\nexports.hljs = hljs;\n"
 		},
 		{

package/plugins/tiddlywiki/highlight/plugin.info

@@ -3,5 +3,6 @@
 	"name": "Highlight",
 	"description": "Highlight.js syntax highlighting",
 	"author": "Joao Bolila",
-	"list": "readme usage license"
+	"list": "readme usage license",
+	"stability": "STABILITY_2_STABLE"
 }

package/plugins/tiddlywiki/highlight-legacy/plugin.info

@@ -3,5 +3,6 @@
 	"name": "Highlight (Legacy)",
 	"description": "Highlight.js syntax highlighting for legacy browsers",
 	"author": "Joao Bolila",
-	"list": "readme usage license"
+	"list": "readme usage license",
+	"stability": "STABILITY_3_LEGACY"
 }

package/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;
+
+})();