Skip to content

Commit ed7b769

Browse files
Jeffrey BlayneyJeffrey Blayney
Jeffrey Blayney
authored and
Jeffrey Blayney
committed
Updated Code per user @bradrich's changes recommended here:
codef0rmer#283
1 parent 1db7b76 commit ed7b769

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

src/angular-dragdrop.js

+6-16
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
4343
callback = objExtract.callback,
4444
constructor = objExtract.constructor,
4545
args = [event, ui].concat(objExtract.args);
46-
46+
4747
// call either $scoped method i.e. $scope.dropCallback or constructor's method i.e. this.dropCallback.
4848
// Removing scope.$apply call that was performance intensive (especially onDrag) and does not require it
4949
// always. So call it within the callback if needed.
5050
return (scope[callback] || scope[constructor][callback]).apply(scope[callback] ? scope : scope[constructor], args);
51-
51+
5252
function extract(callbackName) {
5353
var atStartBracket = callbackName.indexOf('(') !== -1 ? callbackName.indexOf('(') : callbackName.length,
5454
atEndBracket = callbackName.lastIndexOf(')') !== -1 ? callbackName.lastIndexOf(')') : callbackName.length,
@@ -195,7 +195,7 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
195195
toPos.top+= $toEl.outerHeight(true);
196196
}
197197
} else {
198-
// Angular v1.2 uses ng-hide to hide an element
198+
// Angular v1.2 uses ng-hide to hide an element
199199
// so we've to remove it in order to grab its position
200200
if (hadNgHideCls) $toEl.removeClass('ng-hide');
201201
if (hadDNDHideCls) $toEl.removeClass('angular-dragdrop-hide');
@@ -328,12 +328,7 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
328328
}
329329
});
330330
} else {
331-
element.draggable({disabled: true});
332-
}
333-
334-
if (killWatcher && angular.isDefined(newValue) && (angular.equals(attrs.drag, 'true') || angular.equals(attrs.drag, 'false'))) {
335-
killWatcher();
336-
killWatcher = null;
331+
dragSettings = scope.$eval(element.attr('jqyoui-draggable') || element.attr('data-jqyoui-draggable')) || {}; jqyouiOptions = scope.$eval(attrs.jqyouiOptions) || {}; element .draggable({disabled: true}) .draggable(jqyouiOptions);
337332
}
338333
};
339334

@@ -392,18 +387,13 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
392387
}
393388
});
394389
} else {
395-
element.droppable({disabled: true});
396-
}
397-
398-
if (killWatcher && angular.isDefined(newValue) && (angular.equals(attrs.drop, 'true') || angular.equals(attrs.drop, 'false'))) {
399-
killWatcher();
400-
killWatcher = null;
390+
dropSettings = scope.$eval($(element).attr('jqyoui-droppable') || $(element).attr('data-jqyoui-droppable')) || {}; jqyouiOptions = scope.$eval(attrs.jqyouiOptions) || {}; element .droppable({disabled: true}) .droppable(jqyouiOptions);
401391
}
402392
};
403393

404394
killWatcher = scope.$watch(function() { return scope.$eval(attrs.drop); }, updateDroppable);
405395
updateDroppable();
406-
396+
407397
element.on('$destroy', function() {
408398
element.droppable({disabled: true}).droppable('destroy');
409399
});

0 commit comments

Comments
 (0)