diff --git a/core/modules/widgets/dropzone.js b/core/modules/widgets/dropzone.js index 5c800f75a..1e35b4533 100644 --- a/core/modules/widgets/dropzone.js +++ b/core/modules/widgets/dropzone.js @@ -117,6 +117,9 @@ DropZoneWidget.prototype.importData = function(dataTransfer) { }; DropZoneWidget.prototype.importDataTypes = [ + {type: "text/vnd.tiddler", convertToFields: function(data) { + return JSON.parse(data); + }}, {type: "URL", convertToFields: function(data) { // check for tiddler data URI var match = decodeURI(data).match(/^data\:text\/vnd\.tiddler,(.*)/i); @@ -128,15 +131,12 @@ DropZoneWidget.prototype.importDataTypes = [ }; } }}, - {type: "Text", convertToFields: function(data) { + {type: "text/plain", convertToFields: function(data) { return { text: data }; }}, - {type: "text/vnd.tiddler", convertToFields: function(data) { - return JSON.parse(data); - }}, - {type: "text/plain", convertToFields: function(data) { + {type: "Text", convertToFields: function(data) { return { text: data }; diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js index ff5338ce0..47dbda61b 100755 --- a/core/modules/widgets/link.js +++ b/core/modules/widgets/link.js @@ -129,8 +129,10 @@ LinkWidget.prototype.handleDragStartEvent = function(event) { dataTransfer.setDragImage(this.dragImage.firstChild,-16,-16); } dataTransfer.clearData(); - dataTransfer.setData("text/vnd.tiddler",this.wiki.getTiddlerAsJson(this.to)); - dataTransfer.setData("text/plain",this.wiki.getTiddlerText(this.to,"")); + 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("URL","data:text/vnd.tiddler," + encodeURI(this.wiki.getTiddlerAsJson(this.to))); dataTransfer.setData("Text",this.wiki.getTiddlerText(this.to,"")); event.stopPropagation();