From 066a4d9fbc42cbba66956cfe94a0aa4791a365aa Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Tue, 17 Dec 2013 13:32:15 +0000
Subject: [PATCH] Coding style and layout tweaks

---
 core/modules/widgets/dropzone.js | 15 +++++++++++----
 core/modules/widgets/link.js     | 13 +++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/core/modules/widgets/dropzone.js b/core/modules/widgets/dropzone.js
index 1e35b4533..7c7ff4e62 100644
--- a/core/modules/widgets/dropzone.js
+++ b/core/modules/widgets/dropzone.js
@@ -100,12 +100,19 @@ DropZoneWidget.prototype.handleDropEvent  = function(event) {
 };
 
 DropZoneWidget.prototype.importData = function(dataTransfer) {
+	// Try each provided data type in turn
 	for(var t=0; t<this.importDataTypes.length; t++) {
+		// Get the data
 		var dataType = this.importDataTypes[t];
 		try {
 			var data = dataTransfer.getData(dataType.type);
-		} catch(e) { if(e.description !== "Invalid argument.") throw e; }	// deal with formats that IE doesn't support
-		if(data !== "" && data != null) {
+		} catch(e) {
+			if(e.description !== "Invalid argument.") {
+				throw e; // Deal with formats that IE doesn't support
+			}
+		}
+		// Import the tiddlers in the data
+		if(data !== "" && data !== null) {
 			var tiddlerFields = dataType.convertToFields(data);
 			if(!tiddlerFields.title) {
 				tiddlerFields.title = this.wiki.generateNewTitle("Untitled");
@@ -121,12 +128,12 @@ DropZoneWidget.prototype.importDataTypes = [
 		return JSON.parse(data);
 	}},
 	{type: "URL", convertToFields: function(data) {
-		// check for tiddler data URI
+		// Check for tiddler data URI
 		var match = decodeURI(data).match(/^data\:text\/vnd\.tiddler,(.*)/i);
 		if(match) {
 			return JSON.parse(match[1]);
 		} else {
-			return {	// as URL string
+			return { // As URL string
 				text: data
 			};
 		}
diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js
index 47dbda61b..c6ec60d28 100755
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@@ -124,17 +124,22 @@ LinkWidget.prototype.handleDragStartEvent = function(event) {
 		this.dragImage.appendChild(cover);
 		// Set the data transfer properties
 		var dataTransfer = event.dataTransfer;
+		// First the image
 		dataTransfer.effectAllowed = "copy";
 		if(dataTransfer.setDragImage) {
 			dataTransfer.setDragImage(this.dragImage.firstChild,-16,-16);
 		}
+		// Then the data
 		dataTransfer.clearData();
+		var jsonData = this.wiki.getTiddlerAsJson(this.to),
+			textData = this.wiki.getTiddlerText(this.to,"");
+		// IE doesn't like these content types
 		if(!(/msie|trident/i.test(navigator.userAgent))) {
-			dataTransfer.setData("text/vnd.tiddler",this.wiki.getTiddlerAsJson(this.to));
-			dataTransfer.setData("text/plain",this.wiki.getTiddlerText(this.to,""));
+			dataTransfer.setData("text/vnd.tiddler",jsonData);
+			dataTransfer.setData("text/plain",textData);
 		}
-		dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURI(this.wiki.getTiddlerAsJson(this.to)));
-		dataTransfer.setData("Text",this.wiki.getTiddlerText(this.to,""));
+		dataTransfer.setData("URL","data:text/vnd.tiddler," + encodeURI(jsonData));
+		dataTransfer.setData("Text",textData);
 		event.stopPropagation();
 	} else {
 		event.preventDefault();