Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent click handler trigger when dragging the link and ignore drops on the element that triggered the dragging

Browse Source
This commit is contained in:
Athou
2013-06-02 19:37:35 +02:00
parent 555f35407b
commit 3c5dfc2d89
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/js/directives.js
View File

@@ -364,6 +364,8 @@ module.directive('draggable', function() {
restrict : 'A', restrict : 'A',
link : function(scope, element, attrs) { link : function(scope, element, attrs) {
element.draggable({ element.draggable({
revert: 'invalid',
helper: 'clone',
axis: 'y' axis: 'y'
}).data('source', scope.$eval(attrs.draggable)); }).data('source', scope.$eval(attrs.draggable));
} }
@@ -385,6 +387,10 @@ module.directive('droppable', [ 'CategoryService', 'FeedService', function(Categ
var source = draggable.data('source'); var source = draggable.data('source');
var target = scope.$eval(attrs.droppable); var target = scope.$eval(attrs.droppable);
if (angular.equals(source, target)) {
return;
}
var data = { var data = {
id: source.id, id: source.id,
name: source.name name: source.name