mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-10-31 07:32:59 +00:00
Code Issues Releases Wiki Activity

Better handling of dropeffect

Browse Source
This commit is contained in:
Jermolene
2017-03-28 15:09:36 +01:00
parent f3cab3753e
commit 1e106a8f3d
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/utils/dom/dragndrop.js
View File

@@ -61,7 +61,7 @@ exports.makeDraggable = function(options) {
// Set the data transfer properties // Set the data transfer properties
var dataTransfer = event.dataTransfer; var dataTransfer = event.dataTransfer;
// Set up the image // Set up the image
dataTransfer.effectAllowed = "copy"; dataTransfer.effectAllowed = "all";
if(dataTransfer.setDragImage) { if(dataTransfer.setDragImage) {
if(dragImageType === "pill") { if(dragImageType === "pill") {
dataTransfer.setDragImage(dragImage.firstChild,-16,-16); dataTransfer.setDragImage(dragImage.firstChild,-16,-16);

29
core/modules/widgets/droppable.js
View File

@@ -33,9 +33,15 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
// Compute attributes and execute state // Compute attributes and execute state
this.computeAttributes(); this.computeAttributes();
this.execute(); this.execute();
// Create element var tag = this.parseTreeNode.isBlock ? "div" : "span";
var domNode = this.document.createElement("div"); if(this.droppableTag && $tw.config.htmlUnsafeElements.indexOf(this.droppableTag) === -1) {
domNode.className = "tc-droppable"; tag = this.droppableTag;
}
// Create element and assign classes
var domNode = this.document.createElement(tag),
classes = (this["class"] || "").split(" ");
classes.push("tc-droppable");
domNode.className = classes.join(" ");
// Add event handlers // Add event handlers
$tw.utils.addEventListeners(domNode,[ $tw.utils.addEventListeners(domNode,[
{name: "dragenter", handlerObject: this, handlerMethod: "handleDragEnterEvent"}, {name: "dragenter", handlerObject: this, handlerMethod: "handleDragEnterEvent"},
@@ -87,7 +93,8 @@ DroppableWidget.prototype.handleDragOverEvent = function(event) {
} }
// Tell the browser that we're still interested in the drop // Tell the browser that we're still interested in the drop
event.preventDefault(); event.preventDefault();
event.dataTransfer.dropEffect = "copy"; // Explicitly show this is a copy // Set the drop effect
event.dataTransfer.dropEffect = this.droppableEffect;
return false; return false;
}; };
@@ -120,8 +127,8 @@ DroppableWidget.prototype.handleDropEvent = function(event) {
}; };
DroppableWidget.prototype.performActions = function(title,event) { DroppableWidget.prototype.performActions = function(title,event) {
if(this.dropzoneActions) { if(this.droppableActions) {
this.invokeActionString(this.dropzoneActions,this,event,{actionTiddler: title}); this.invokeActionString(this.draggableActions,this,event,{actionTiddler: title});
} }
}; };
@@ -129,7 +136,10 @@ DroppableWidget.prototype.performActions = function(title,event) {
Compute the internal state of the widget Compute the internal state of the widget
*/ */
DroppableWidget.prototype.execute = function() { DroppableWidget.prototype.execute = function() {
this.dropzoneActions = this.getAttribute("actions"); this.droppableActions = this.getAttribute("actions");
this.droppableEffect = this.getAttribute("effect","copy");
this.droppableTag = this.getAttribute("tag");
this.droppableClass = this.getAttribute("class");
// Make child widgets // Make child widgets
this.makeChildWidgets(); this.makeChildWidgets();
}; };
@@ -138,6 +148,11 @@ DroppableWidget.prototype.execute = function() {
Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
*/ */
DroppableWidget.prototype.refresh = function(changedTiddlers) { DroppableWidget.prototype.refresh = function(changedTiddlers) {
var changedAttributes = this.computeAttributes();
if(changedAttributes["class"] || changedAttributes.tag) {
this.refreshSelf();
return true;
}
return this.refreshChildren(changedTiddlers); return this.refreshChildren(changedTiddlers);
}; };