From 9c74afdd1a7751265407888995dcb3dc8276126b Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sat, 30 Aug 2014 21:32:55 +0100
Subject: [PATCH] JSHint obeisance for plugins folder

Also add a jshintignore file to skip the various imported modules
---
 .jshintignore                                 |  7 ++
 plugins/tiddlywiki/browser-sniff/browser.js   |  2 +-
 .../browser-sniff/{bowser => files}/bowser.js |  0
 .../{bowser => files}/tiddlywiki.files        |  0
 plugins/tiddlywiki/cecily/cecily.js           |  2 +-
 .../tiddlywiki/codemirror/edit-codemirror.js  |  4 +-
 .../{lib => files}/addon/dialog/dialog.css    |  0
 .../{lib => files}/addon/dialog/dialog.js     |  0
 .../addon/edit/matchbrackets.js               |  0
 .../addon/search/searchcursor.js              |  0
 .../codemirror/{lib => files}/codemirror.css  |  0
 .../codemirror/{lib => files}/codemirror.js   |  0
 .../codemirror/{lib => files}/keymap/emacs.js |  0
 .../codemirror/{lib => files}/keymap/extra.js |  0
 .../{lib => files}/keymap/sublime.js          |  0
 .../codemirror/{lib => files}/keymap/vim.js   |  0
 .../mode/javascript/javascript.js             |  0
 .../{lib => files}/tiddlywiki.files           |  0
 plugins/tiddlywiki/d3/barwidget.js            | 68 +++++++++----------
 .../filesystem/filesystemadaptor.js           | 29 ++++----
 .../{jasmine-1.3.1 => files}/MIT.LICENSE      |  0
 .../{jasmine-1.3.1 => files}/jasmine-html.js  |  0
 .../{jasmine-1.3.1 => files}/jasmine.css      |  0
 .../{jasmine-1.3.1 => files}/jasmine.js       |  0
 .../{jasmine-1.3.1 => files}/reporter.js      |  0
 .../{jasmine-1.3.1 => files}/tiddlywiki.files |  0
 plugins/tiddlywiki/jasmine/jasmine-plugin.js  |  2 +-
 .../tiddlywiki/nodewebkitsaver/nodewebkit.js  |  2 +-
 .../tiddlywiki/tiddlyweb/tiddlywebadaptor.js  |  4 +-
 29 files changed, 63 insertions(+), 57 deletions(-)
 create mode 100644 .jshintignore
 rename plugins/tiddlywiki/browser-sniff/{bowser => files}/bowser.js (100%)
 rename plugins/tiddlywiki/browser-sniff/{bowser => files}/tiddlywiki.files (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/addon/dialog/dialog.css (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/addon/dialog/dialog.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/addon/edit/matchbrackets.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/addon/search/searchcursor.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/codemirror.css (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/codemirror.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/keymap/emacs.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/keymap/extra.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/keymap/sublime.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/keymap/vim.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/mode/javascript/javascript.js (100%)
 rename plugins/tiddlywiki/codemirror/{lib => files}/tiddlywiki.files (100%)
 rename plugins/tiddlywiki/jasmine/{jasmine-1.3.1 => files}/MIT.LICENSE (100%)
 rename plugins/tiddlywiki/jasmine/{jasmine-1.3.1 => files}/jasmine-html.js (100%)
 rename plugins/tiddlywiki/jasmine/{jasmine-1.3.1 => files}/jasmine.css (100%)
 rename plugins/tiddlywiki/jasmine/{jasmine-1.3.1 => files}/jasmine.js (100%)
 rename plugins/tiddlywiki/jasmine/{jasmine-1.3.1 => files}/reporter.js (100%)
 rename plugins/tiddlywiki/jasmine/{jasmine-1.3.1 => files}/tiddlywiki.files (100%)

diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000000000..cca917270
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,7 @@
+plugins/tiddlywiki/browser-sniff/files
+plugins/tiddlywiki/codemirror/files/
+plugins/tiddlywiki/d3/files/
+plugins/tiddlywiki/highlight/files/
+plugins/tiddlywiki/jasmine/files/
+plugins/tiddlywiki/markdown/files/
+plugins/tiddlywiki/markdown/files/
diff --git a/plugins/tiddlywiki/browser-sniff/browser.js b/plugins/tiddlywiki/browser-sniff/browser.js
index 28a80fc66..2ca0b4840 100644
--- a/plugins/tiddlywiki/browser-sniff/browser.js
+++ b/plugins/tiddlywiki/browser-sniff/browser.js
@@ -13,7 +13,7 @@ Initialise $:/info/browser tiddlers
 "use strict";
 
 exports.getInfoTiddlerFields = function() {
-	var mapBoolean = function(value) {return value ? "yes" : "no"},
+	var mapBoolean = function(value) {return value ? "yes" : "no";},
 		infoTiddlerFields = [];
 	// Basics
 	if($tw.browser) {
diff --git a/plugins/tiddlywiki/browser-sniff/bowser/bowser.js b/plugins/tiddlywiki/browser-sniff/files/bowser.js
similarity index 100%
rename from plugins/tiddlywiki/browser-sniff/bowser/bowser.js
rename to plugins/tiddlywiki/browser-sniff/files/bowser.js
diff --git a/plugins/tiddlywiki/browser-sniff/bowser/tiddlywiki.files b/plugins/tiddlywiki/browser-sniff/files/tiddlywiki.files
similarity index 100%
rename from plugins/tiddlywiki/browser-sniff/bowser/tiddlywiki.files
rename to plugins/tiddlywiki/browser-sniff/files/tiddlywiki.files
diff --git a/plugins/tiddlywiki/cecily/cecily.js b/plugins/tiddlywiki/cecily/cecily.js
index 5efd4a4af..e7646f726 100644
--- a/plugins/tiddlywiki/cecily/cecily.js
+++ b/plugins/tiddlywiki/cecily/cecily.js
@@ -113,7 +113,7 @@ CecilyStoryView.prototype.lookupTiddlerInMap = function(title,domNode) {
 	if(tiddler) {
 		var draftOf = tiddler.fields["draft.of"];
 		if(draftOf && this.map.positions[draftOf]) {
-			return this.map.positions[draftOf]
+			return this.map.positions[draftOf];
 		}
 	}
 	// Try looking the target tiddler up in the map
diff --git a/plugins/tiddlywiki/codemirror/edit-codemirror.js b/plugins/tiddlywiki/codemirror/edit-codemirror.js
index 121792649..a47560d35 100644
--- a/plugins/tiddlywiki/codemirror/edit-codemirror.js
+++ b/plugins/tiddlywiki/codemirror/edit-codemirror.js
@@ -25,14 +25,14 @@ Config options "$:/config/CodeMirror" e.g. to allow vim key bindings
 /*global $tw: false */
 "use strict";
 
-var CODEMIRROR_OPTIONS = "$:/config/CodeMirror"
+var CODEMIRROR_OPTIONS = "$:/config/CodeMirror";
 
 // Install CodeMirror
 if($tw.browser && !window.CodeMirror) {
 	window.CodeMirror = require("$:/plugins/tiddlywiki/codemirror/lib/codemirror.js");
 	// Install required CodeMirror plugins
 	var configOptions = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{}),
-		req = configOptions["require"];
+		req = configOptions.require;
 	if(req) {
 		if($tw.utils.isArray(req)) {
 			for(var index=0; index<req.length; index++) {
diff --git a/plugins/tiddlywiki/codemirror/lib/addon/dialog/dialog.css b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.css
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/addon/dialog/dialog.css
rename to plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.css
diff --git a/plugins/tiddlywiki/codemirror/lib/addon/dialog/dialog.js b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/addon/dialog/dialog.js
rename to plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js
diff --git a/plugins/tiddlywiki/codemirror/lib/addon/edit/matchbrackets.js b/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/addon/edit/matchbrackets.js
rename to plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js
diff --git a/plugins/tiddlywiki/codemirror/lib/addon/search/searchcursor.js b/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/addon/search/searchcursor.js
rename to plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js
diff --git a/plugins/tiddlywiki/codemirror/lib/codemirror.css b/plugins/tiddlywiki/codemirror/files/codemirror.css
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/codemirror.css
rename to plugins/tiddlywiki/codemirror/files/codemirror.css
diff --git a/plugins/tiddlywiki/codemirror/lib/codemirror.js b/plugins/tiddlywiki/codemirror/files/codemirror.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/codemirror.js
rename to plugins/tiddlywiki/codemirror/files/codemirror.js
diff --git a/plugins/tiddlywiki/codemirror/lib/keymap/emacs.js b/plugins/tiddlywiki/codemirror/files/keymap/emacs.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/keymap/emacs.js
rename to plugins/tiddlywiki/codemirror/files/keymap/emacs.js
diff --git a/plugins/tiddlywiki/codemirror/lib/keymap/extra.js b/plugins/tiddlywiki/codemirror/files/keymap/extra.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/keymap/extra.js
rename to plugins/tiddlywiki/codemirror/files/keymap/extra.js
diff --git a/plugins/tiddlywiki/codemirror/lib/keymap/sublime.js b/plugins/tiddlywiki/codemirror/files/keymap/sublime.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/keymap/sublime.js
rename to plugins/tiddlywiki/codemirror/files/keymap/sublime.js
diff --git a/plugins/tiddlywiki/codemirror/lib/keymap/vim.js b/plugins/tiddlywiki/codemirror/files/keymap/vim.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/keymap/vim.js
rename to plugins/tiddlywiki/codemirror/files/keymap/vim.js
diff --git a/plugins/tiddlywiki/codemirror/lib/mode/javascript/javascript.js b/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/mode/javascript/javascript.js
rename to plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js
diff --git a/plugins/tiddlywiki/codemirror/lib/tiddlywiki.files b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files
similarity index 100%
rename from plugins/tiddlywiki/codemirror/lib/tiddlywiki.files
rename to plugins/tiddlywiki/codemirror/files/tiddlywiki.files
diff --git a/plugins/tiddlywiki/d3/barwidget.js b/plugins/tiddlywiki/d3/barwidget.js
index 997bc06f3..18ada16c9 100644
--- a/plugins/tiddlywiki/d3/barwidget.js
+++ b/plugins/tiddlywiki/d3/barwidget.js
@@ -57,7 +57,7 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 		n = 4; // number of layers
 		m = 58; // number of samples per layer
 		stack = d3.layout.stack();
-		layers = stack(d3.range(n).map(function() { return bumpLayer(m, .1); }));
+		layers = stack(d3.range(n).map(function() { return bumpLayer(m, 0.1); }));
 	}
 	// Calculate the maximum data values
 	var yGroupMax = d3.max(layers, function(layer) { return d3.max(layer, function(d) { return d.y; }); }),
@@ -69,7 +69,7 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 	// x-scale
 	var x = d3.scale.ordinal()
 		.domain(d3.range(m))
-		.rangeRoundBands([0, width], .08);
+		.rangeRoundBands([0, width], 0.08);
 	// y-scale
 	var y = d3.scale.linear()
 		.domain([0, yStackMax])
@@ -96,13 +96,13 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 	// Create the layers
 	var layer = mainGroup.selectAll(".layer")
 		.data(layers)
-	  .enter().append("g")
+	.enter().append("g")
 		.attr("class", "layer")
 		.style("fill", function(d, i) { return color(i); });
 	// Create the rectangles in each layer
 	var rect = layer.selectAll("rect")
 		.data(function(d) { return d; })
-	  .enter().append("rect")
+	.enter().append("rect")
 		.attr("x", function(d) { return x(d.x); })
 		.attr("y", height)
 		.attr("width", x.rangeBand())
@@ -131,44 +131,44 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 	};
 
 	function transitionGrouped() {
-	  y.domain([0, yGroupMax]);
-	  rect.transition()
-		  .duration(500)
-		  .delay(function(d, i) { return i * 10; })
-		  .attr("x", function(d, i, j) { return x(d.x) + x.rangeBand() / n * j; })
-		  .attr("width", x.rangeBand() / n)
-		.transition()
-		  .attr("y", function(d) { return y(d.y); })
-		  .attr("height", function(d) { return height - y(d.y); });
+		y.domain([0, yGroupMax]);
+		rect.transition()
+			.duration(500)
+			.delay(function(d, i) { return i * 10; })
+			.attr("x", function(d, i, j) { return x(d.x) + x.rangeBand() / n * j; })
+			.attr("width", x.rangeBand() / n)
+			.transition()
+			.attr("y", function(d) { return y(d.y); })
+			.attr("height", function(d) { return height - y(d.y); });
 	}
 
 	function transitionStacked() {
-	  y.domain([0, yStackMax]);
-	  rect.transition()
-		  .duration(500)
-		  .delay(function(d, i) { return i * 10; })
-		  .attr("y", function(d) { return y(d.y0 + d.y); })
-		  .attr("height", function(d) { return y(d.y0) - y(d.y0 + d.y); })
-		.transition()
-		  .attr("x", function(d) { return x(d.x); })
-		  .attr("width", x.rangeBand());
+		y.domain([0, yStackMax]);
+		rect.transition()
+			.duration(500)
+			.delay(function(d, i) { return i * 10; })
+			.attr("y", function(d) { return y(d.y0 + d.y); })
+			.attr("height", function(d) { return y(d.y0) - y(d.y0 + d.y); })
+			.transition()
+			.attr("x", function(d) { return x(d.x); })
+			.attr("width", x.rangeBand());
 	}
 
 	// Inspired by Lee Byron's test data generator.
 	function bumpLayer(n, o) {
-	  function bump(a) {
-		var x = 1 / (.1 + Math.random()),
-			y = 2 * Math.random() - .5,
-			z = 10 / (.1 + Math.random());
-		for (var i = 0; i < n; i++) {
-		  var w = (i / n - y) * z;
-		  a[i] += x * Math.exp(-w * w);
+		function bump(a) {
+			var x = 1 / (0.1 + Math.random()),
+				y = 2 * Math.random() - 0.5,
+				z = 10 / (0.1 + Math.random());
+			for (var i = 0; i < n; i++) {
+			var w = (i / n - y) * z;
+			a[i] += x * Math.exp(-w * w);
+			}
 		}
-	  }
-	  var a = [], i;
-	  for (i = 0; i < n; ++i) a[i] = o + o * Math.random();
-	  for (i = 0; i < 5; ++i) bump(a);
-	  return a.map(function(d, i) { return {x: i, y: Math.max(0, d)}; });
+		var a = [], i;
+		for (i = 0; i < n; ++i) a[i] = o + o * Math.random();
+		for (i = 0; i < 5; ++i) bump(a);
+		return a.map(function(d, i) { return {x: i, y: Math.max(0, d)}; });
 	}
 };
 
diff --git a/plugins/tiddlywiki/filesystem/filesystemadaptor.js b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
index eff03be1b..18cb4cba2 100644
--- a/plugins/tiddlywiki/filesystem/filesystemadaptor.js
+++ b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
@@ -24,20 +24,19 @@ function FileSystemAdaptor(options) {
 	this.logger = new $tw.utils.Logger("FileSystem");
 	this.setwatcher = function(filename, title) {
 		return undefined;
-		return this.watchers[filename] = this.watchers[filename] ||
-			fs.watch(filename, {persistent: false}, function(e) {
-				self.logger.log("Error:",e,filename);
-				if(e === "change") {
-					var tiddlers = $tw.loadTiddlersFromFile(filename).tiddlers;
-					for(var t in tiddlers) {
-						if(tiddlers[t].title) {
-							self.wiki.addTiddler(tiddlers[t]);
-						}
-					}
-				}
-			});
-	}
-
+		//return this.watchers[filename] = this.watchers[filename] ||
+		//	fs.watch(filename, {persistent: false}, function(e) {
+		//		self.logger.log("Error:",e,filename);
+		//		if(e === "change") {
+		//			var tiddlers = $tw.loadTiddlersFromFile(filename).tiddlers;
+		//			for(var t in tiddlers) {
+		//				if(tiddlers[t].title) {
+		//					self.wiki.addTiddler(tiddlers[t]);
+		//				}
+		//			}
+		//		}
+		//	});
+	};
 	for(var f in $tw.boot.files) {
 		var fileInfo = $tw.boot.files[f];
 		this.setwatcher(fileInfo.filepath, f);
@@ -108,7 +107,7 @@ Given a tiddler title and an array of existing filenames, generate a new legal f
 */
 FileSystemAdaptor.prototype.generateTiddlerFilename = function(title,extension,existingFilenames) {
 	// First remove any of the characters that are illegal in Windows filenames
-	var baseFilename = title.replace(/\<|\>|\:|\"|\/|\\|\||\?|\*|\^/g,"_");
+	var baseFilename = title.replace(/<|>|\:|\"|\/|\\|\||\?|\*|\^/g,"_");
 	// Truncate the filename if it is too long
 	if(baseFilename.length > 200) {
 		baseFilename = baseFilename.substr(0,200) + extension;
diff --git a/plugins/tiddlywiki/jasmine/jasmine-1.3.1/MIT.LICENSE b/plugins/tiddlywiki/jasmine/files/MIT.LICENSE
similarity index 100%
rename from plugins/tiddlywiki/jasmine/jasmine-1.3.1/MIT.LICENSE
rename to plugins/tiddlywiki/jasmine/files/MIT.LICENSE
diff --git a/plugins/tiddlywiki/jasmine/jasmine-1.3.1/jasmine-html.js b/plugins/tiddlywiki/jasmine/files/jasmine-html.js
similarity index 100%
rename from plugins/tiddlywiki/jasmine/jasmine-1.3.1/jasmine-html.js
rename to plugins/tiddlywiki/jasmine/files/jasmine-html.js
diff --git a/plugins/tiddlywiki/jasmine/jasmine-1.3.1/jasmine.css b/plugins/tiddlywiki/jasmine/files/jasmine.css
similarity index 100%
rename from plugins/tiddlywiki/jasmine/jasmine-1.3.1/jasmine.css
rename to plugins/tiddlywiki/jasmine/files/jasmine.css
diff --git a/plugins/tiddlywiki/jasmine/jasmine-1.3.1/jasmine.js b/plugins/tiddlywiki/jasmine/files/jasmine.js
similarity index 100%
rename from plugins/tiddlywiki/jasmine/jasmine-1.3.1/jasmine.js
rename to plugins/tiddlywiki/jasmine/files/jasmine.js
diff --git a/plugins/tiddlywiki/jasmine/jasmine-1.3.1/reporter.js b/plugins/tiddlywiki/jasmine/files/reporter.js
similarity index 100%
rename from plugins/tiddlywiki/jasmine/jasmine-1.3.1/reporter.js
rename to plugins/tiddlywiki/jasmine/files/reporter.js
diff --git a/plugins/tiddlywiki/jasmine/jasmine-1.3.1/tiddlywiki.files b/plugins/tiddlywiki/jasmine/files/tiddlywiki.files
similarity index 100%
rename from plugins/tiddlywiki/jasmine/jasmine-1.3.1/tiddlywiki.files
rename to plugins/tiddlywiki/jasmine/files/tiddlywiki.files
diff --git a/plugins/tiddlywiki/jasmine/jasmine-plugin.js b/plugins/tiddlywiki/jasmine/jasmine-plugin.js
index 1ed39e186..07e19ffda 100644
--- a/plugins/tiddlywiki/jasmine/jasmine-plugin.js
+++ b/plugins/tiddlywiki/jasmine/jasmine-plugin.js
@@ -51,7 +51,7 @@ exports.startup = function() {
 		// The HTMLReporter links itself into the jasmine object automatically, but we have to manually add the node reporter
 		jasmine.jasmine.TerminalVerboseReporter = reporterExports.jasmineNode.TerminalVerboseReporter;
 		jasmine.jasmine.TerminalReporter = reporterExports.jasmineNode.TerminalReporter;
-	    jasmineEnv.addReporter(new jasmine.jasmine.TerminalVerboseReporter({
+		jasmineEnv.addReporter(new jasmine.jasmine.TerminalVerboseReporter({
 			print: require("util").print,
 			color: true,
 			includeStackTrace: true
diff --git a/plugins/tiddlywiki/nodewebkitsaver/nodewebkit.js b/plugins/tiddlywiki/nodewebkitsaver/nodewebkit.js
index 81680f667..ae36dea1f 100644
--- a/plugins/tiddlywiki/nodewebkitsaver/nodewebkit.js
+++ b/plugins/tiddlywiki/nodewebkitsaver/nodewebkit.js
@@ -48,7 +48,7 @@ Static method that returns true if this saver is capable of working
 */
 exports.canSave = function(wiki) {
 	// Check if we're running under node-webkit
-	return (typeof process == "object")
+	return (typeof process == "object");
 };
 
 /*
diff --git a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
index e87db5b0b..69d92119d 100644
--- a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
+++ b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
@@ -37,7 +37,7 @@ TiddlyWebAdaptor.prototype.getHost = function() {
 
 TiddlyWebAdaptor.prototype.getTiddlerInfo = function(tiddler) {
 	return {
-		bag: tiddler.fields["bag"]
+		bag: tiddler.fields.bag
 	};
 };
 
@@ -248,7 +248,7 @@ TiddlyWebAdaptor.prototype.convertTiddlerToTiddlyWebFormat = function(tiddler) {
 	// Default the content type and convert the type "text/x-tiddlywiki" into null
 	if(result.type === "text/x-tiddlywiki") {
 		result.type = null;
-	};
+	}
 	result.type = result.type || "text/vnd.tiddlywiki";
 	return JSON.stringify(result,null,$tw.config.preferences.jsonSpaces);
 };