Skip to content

Commit eb1d7e6

Browse files
committed
fix(move): restore .angular-dragdrop-hide class on drop
1 parent 50b7e23 commit eb1d7e6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/angular-dragdrop.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
183183
var zIndex = $fromEl.css('z-index'),
184184
fromPos = $fromEl[dropSettings.containment || 'offset'](),
185185
displayProperty = $toEl.css('display'), // sometimes `display` is other than `block`
186-
hadNgHideCls = $toEl.hasClass('ng-hide');
186+
hadNgHideCls = $toEl.hasClass('ng-hide'),
187+
hadDNDHideCls = $toEl.hasClass('angular-dragdrop-hide');
187188

188189
if (toPos === null && $toEl.length > 0) {
189190
if (($toEl.attr('jqyoui-draggable') || $toEl.attr('data-jqyoui-draggable')) !== undefined && $toEl.ngattr('ng-model') !== undefined && $toEl.is(':visible') && dropSettings && dropSettings.multiple) {
@@ -197,6 +198,7 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
197198
// Angular v1.2 uses ng-hide to hide an element
198199
// so we've to remove it in order to grab its position
199200
if (hadNgHideCls) $toEl.removeClass('ng-hide');
201+
if (hadDNDHideCls) $toEl.removeClass('angular-dragdrop-hide');
200202
toPos = $toEl.css({'visibility': 'hidden', 'display': 'block'})[dropSettings.containment || 'offset']();
201203
$toEl.css({'visibility': '','display': displayProperty});
202204
}
@@ -210,6 +212,7 @@ var jqyoui = angular.module('ngDragDrop', []).service('ngDragDropService', ['$ti
210212
// hide the element (while swapping) if it was hidden already
211213
// because we remove the display:none in this.invokeDrop()
212214
if (hadNgHideCls) $toEl.addClass('ng-hide');
215+
if (hadDNDHideCls) $toEl.addClass('angular-dragdrop-hide');
213216
$fromEl.css('z-index', zIndex);
214217
if (callback) callback();
215218
});

0 commit comments

Comments
 (0)